net/vmxnet3: fix RSS setting on v4

Message ID 1566405415-89876-1-git-send-email-eserra@vmware.com
State New
Delegated to: Ferruh Yigit
Headers show
Series
  • net/vmxnet3: fix RSS setting on v4
Related show

Checks

Context Check Description
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS
ci/iol-Compile-Testing success Compile Testing PASS
ci/Intel-compilation fail Compilation issues
ci/checkpatch warning coding style issues

Commit Message

Eduard Serra Miralles Aug. 21, 2019, 4:37 p.m.
When calling to setup RSS on v4 API, ESX will expect
IPv4/6 TCP RSS to be set/requested mandatorily.

This patch will:
- Set IPv4/6 TCP RSS when these have not been set. A warning
message is thrown to make sure we warn the application we are
setting IPv4/6 TCP RSS when not set.
- An additional check has been added to dodge RSS configuration
altogether unless MQ_RSS has been requested, similar to v3.

The alternative (returning error) was considered, the intent
is to ease the task of setting up and running vmxnet3 in situations
where it's supposted to be most strightforward (testpmd, pktgen).

Signed-off-by: Eduard Serra <eserra@vmware.com>
---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 3 ++-
 drivers/net/vmxnet3/vmxnet3_ethdev.h | 4 ++++
 drivers/net/vmxnet3/vmxnet3_rxtx.c   | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

Comments

Yong Wang Sept. 13, 2019, 6:44 p.m. | #1
-----Original Message-----
From: Eduard Serra Miralles <eserra@vmware.com>
Date: Wednesday, August 21, 2019 at 9:37 AM
To: Yong Wang <yongwang@vmware.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>
Subject: [PATCH] net/vmxnet3: fix RSS setting on v4

    When calling to setup RSS on v4 API, ESX will expect
    IPv4/6 TCP RSS to be set/requested mandatorily.
    
    This patch will:
    - Set IPv4/6 TCP RSS when these have not been set. A warning
    message is thrown to make sure we warn the application we are
    setting IPv4/6 TCP RSS when not set.

Why we are enforcing TCP RSS?  I would think it's up to the user to decide what to request based on their specific needs and we should support RSS even when it does not request TCP RSS.

    - An additional check has been added to dodge RSS configuration
    altogether unless MQ_RSS has been requested, similar to v3.
    
    The alternative (returning error) was considered, the intent
    is to ease the task of setting up and running vmxnet3 in situations
    where it's supposted to be most strightforward (testpmd, pktgen).
    
    Signed-off-by: Eduard Serra <eserra@vmware.com>
    ---
     drivers/net/vmxnet3/vmxnet3_ethdev.c | 3 ++-
     drivers/net/vmxnet3/vmxnet3_ethdev.h | 4 ++++
     drivers/net/vmxnet3/vmxnet3_rxtx.c   | 8 ++++++++
     3 files changed, 14 insertions(+), 1 deletion(-)
    
    diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
    index 57feb37..0a7047e 100644
    --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
    +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
    @@ -769,7 +769,8 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
     		PMD_INIT_LOG(DEBUG, "Failed to setup memory region\n");
     	}
     
    -	if (VMXNET3_VERSION_GE_4(hw)) {
    +	if (VMXNET3_VERSION_GE_4(hw) &&
    +	    dev->data->dev_conf.rxmode.mq_mode == ETH_MQ_RX_RSS) {
     		/* Check for additional RSS  */
     		ret = vmxnet3_v4_rss_configure(dev);
     		if (ret != VMXNET3_SUCCESS) {
    diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h
    index 8c2b6f8..6e3ce7d 100644
    --- a/drivers/net/vmxnet3/vmxnet3_ethdev.h
    +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h
    @@ -38,6 +38,10 @@
     	ETH_RSS_NONFRAG_IPV4_UDP | \
     	ETH_RSS_NONFRAG_IPV6_UDP)
     
    +#define VMXNET3_MANDATORY_V4_RSS ( \
    +	ETH_RSS_NONFRAG_IPV4_TCP | \
    +	ETH_RSS_NONFRAG_IPV6_TCP)
    +
     /* RSS configuration structure - shared with device through GPA */
     typedef struct VMXNET3_RSSConf {
     	uint16_t   hashType;
    diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
    index 7794d74..dd99684 100644
    --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
    +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
    @@ -1311,6 +1311,14 @@ vmxnet3_v4_rss_configure(struct rte_eth_dev *dev)
     
     	cmdInfo->setRSSFields = 0;
     	port_rss_conf = &dev->data->dev_conf.rx_adv_conf.rss_conf;
    +
    +	if ((port_rss_conf->rss_hf & VMXNET3_MANDATORY_V4_RSS) !=
    +	    VMXNET3_MANDATORY_V4_RSS) {
    +		PMD_INIT_LOG(WARNING, "RSS: IPv4/6 TCP is required for vmxnet3 v4 RSS,"
    +			     "automatically setting it");
    +		port_rss_conf->rss_hf |= VMXNET3_MANDATORY_V4_RSS;
    +	}
    +
     	rss_hf = port_rss_conf->rss_hf &
     		(VMXNET3_V4_RSS_MASK | VMXNET3_RSS_OFFLOAD_ALL);
     
    -- 
    2.7.4
Eduard Serra Miralles Sept. 13, 2019, 8:10 p.m. | #2
I think so too. Apparently however, ESX is mandatorily expecting that underneath. If not set, config will fail.

Patch

diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 57feb37..0a7047e 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -769,7 +769,8 @@  vmxnet3_dev_start(struct rte_eth_dev *dev)
 		PMD_INIT_LOG(DEBUG, "Failed to setup memory region\n");
 	}
 
-	if (VMXNET3_VERSION_GE_4(hw)) {
+	if (VMXNET3_VERSION_GE_4(hw) &&
+	    dev->data->dev_conf.rxmode.mq_mode == ETH_MQ_RX_RSS) {
 		/* Check for additional RSS  */
 		ret = vmxnet3_v4_rss_configure(dev);
 		if (ret != VMXNET3_SUCCESS) {
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h
index 8c2b6f8..6e3ce7d 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.h
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h
@@ -38,6 +38,10 @@ 
 	ETH_RSS_NONFRAG_IPV4_UDP | \
 	ETH_RSS_NONFRAG_IPV6_UDP)
 
+#define VMXNET3_MANDATORY_V4_RSS ( \
+	ETH_RSS_NONFRAG_IPV4_TCP | \
+	ETH_RSS_NONFRAG_IPV6_TCP)
+
 /* RSS configuration structure - shared with device through GPA */
 typedef struct VMXNET3_RSSConf {
 	uint16_t   hashType;
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index 7794d74..dd99684 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -1311,6 +1311,14 @@  vmxnet3_v4_rss_configure(struct rte_eth_dev *dev)
 
 	cmdInfo->setRSSFields = 0;
 	port_rss_conf = &dev->data->dev_conf.rx_adv_conf.rss_conf;
+
+	if ((port_rss_conf->rss_hf & VMXNET3_MANDATORY_V4_RSS) !=
+	    VMXNET3_MANDATORY_V4_RSS) {
+		PMD_INIT_LOG(WARNING, "RSS: IPv4/6 TCP is required for vmxnet3 v4 RSS,"
+			     "automatically setting it");
+		port_rss_conf->rss_hf |= VMXNET3_MANDATORY_V4_RSS;
+	}
+
 	rss_hf = port_rss_conf->rss_hf &
 		(VMXNET3_V4_RSS_MASK | VMXNET3_RSS_OFFLOAD_ALL);