[dpdk-stable] patch 'net/hns3: fix RSS configuration on empty RSS type' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From ee3db912a5c774334e7992beb804e5e607715101 Mon Sep 17 00:00:00 2001
From: Lijun Ou <oulijun at huawei.com>
Date: Tue, 14 Jul 2020 14:16:09 +0800
Subject: [PATCH] net/hns3: fix RSS configuration on empty RSS type

[ upstream commit 2bc3b95deb4145d42bb4159b70d8a7a0451badde ]

According to the definition of RSS types of action attributes from
testpmd, the driver will not disable RSS but instead requests the
unspecified "best-effort" settings when upper application call
rte_flow_create API function to create flow using empty RSS types.

As a result, here use the default RSS types when RSS types is empty.

Fixes: c37ca66f2b27 ("net/hns3: support RSS")

Signed-off-by: Lijun Ou <oulijun at huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
---
 drivers/net/hns3/hns3_flow.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 7d5ba61c6..0301d6b16 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1484,7 +1484,9 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
 	}
 
 	/* Filter the unsupported flow types */
-	flow_types = rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT;
+	flow_types = conf->conf.types ?
+		     rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT :
+		     hw->rss_info.conf.types;
 	if (flow_types != rss_flow_conf.types)
 		hns3_warn(hw, "modified RSS types based on hardware support, "
 			      "requested:%" PRIx64 " configured:%" PRIx64,
@@ -1492,9 +1494,6 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
 	/* Update the useful flow types */
 	rss_flow_conf.types = flow_types;
 
-	if ((rss_flow_conf.types & ETH_RSS_PROTO_MASK) == 0)
-		return hns3_disable_rss(hw);
-
 	rss_info = &hw->rss_info;
 	if (!add) {
 		if (hns3_action_rss_same(&rss_info->conf, &rss_flow_conf)) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:54.467554297 +0100
+++ 0153-net-hns3-fix-RSS-configuration-on-empty-RSS-type.patch	2020-07-24 12:53:48.519010782 +0100
@@ -1,8 +1,10 @@
-From 2bc3b95deb4145d42bb4159b70d8a7a0451badde Mon Sep 17 00:00:00 2001
+From ee3db912a5c774334e7992beb804e5e607715101 Mon Sep 17 00:00:00 2001
 From: Lijun Ou <oulijun at huawei.com>
 Date: Tue, 14 Jul 2020 14:16:09 +0800
 Subject: [PATCH] net/hns3: fix RSS configuration on empty RSS type
 
+[ upstream commit 2bc3b95deb4145d42bb4159b70d8a7a0451badde ]
+
 According to the definition of RSS types of action attributes from
 testpmd, the driver will not disable RSS but instead requests the
 unspecified "best-effort" settings when upper application call
@@ -11,7 +13,6 @@
 As a result, here use the default RSS types when RSS types is empty.
 
 Fixes: c37ca66f2b27 ("net/hns3: support RSS")
-Cc: stable at dpdk.org
 
 Signed-off-by: Lijun Ou <oulijun at huawei.com>
 Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
@@ -20,10 +21,10 @@
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
-index 1e58ad70f..7ec46aef8 100644
+index 7d5ba61c6..0301d6b16 100644
 --- a/drivers/net/hns3/hns3_flow.c
 +++ b/drivers/net/hns3/hns3_flow.c
-@@ -1486,7 +1486,9 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
+@@ -1484,7 +1484,9 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
  	}
  
  	/* Filter the unsupported flow types */
@@ -34,7 +35,7 @@
  	if (flow_types != rss_flow_conf.types)
  		hns3_warn(hw, "modified RSS types based on hardware support, "
  			      "requested:%" PRIx64 " configured:%" PRIx64,
-@@ -1494,9 +1496,6 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
+@@ -1492,9 +1494,6 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
  	/* Update the useful flow types */
  	rss_flow_conf.types = flow_types;