patch 'net/hns3: remove useless code when destroy valid RSS rule' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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 02/28/23. 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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/2f00c06957fc89f7a3a483d118ef5fcef558b847

Thanks.

Kevin

---
>From 2f00c06957fc89f7a3a483d118ef5fcef558b847 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Tue, 31 Jan 2023 21:02:57 +0800
Subject: [PATCH] net/hns3: remove useless code when destroy valid RSS rule

[ upstream commit 546031ba551485c3e3aa57c3698975c2852cbef1 ]

When all rules are flushed the hw::rss_info::conf::func set to
RTE_ETH_HASH_FUNCTION_MAX and hw::rss_info::conf::queue set to NULL
which indicates no flow rules is issued.
See: commit eb158fc756a5 ("net/hns3: fix config when creating RSS rule
after flush").

Actually, the way determining whether there are rules has been changed
by walking the flow RSS list.
See: commit 705a50800334 ("net/hns3: fix RSS filter restore").

In addition, the rte_flow_action_rss from user isn't saved to 'conf' in
hw->rss_info now. So this code can be removed.

Fixes: eb158fc756a5 ("net/hns3: fix config when creating RSS rule after flush")
Fixes: 705a50800334 ("net/hns3: fix RSS filter restore")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3 at huawei.com>
---
 drivers/net/hns3/hns3_flow.c | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index d0d0c7c636..5803406ef7 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1233,17 +1233,6 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp,
 	bool func_is_same;
 
-	/*
-	 * When user flush all RSS rule, RSS func is set invalid with
-	 * RTE_ETH_HASH_FUNCTION_MAX. Then the user create a flow after
-	 * flushed, any validate RSS func is different with it before
-	 * flushed. Others, when user create an action RSS with RSS func
-	 * specified RTE_ETH_HASH_FUNCTION_DEFAULT, the func is the same
-	 * between continuous RSS flow.
-	 */
-	if (comp->func == RTE_ETH_HASH_FUNCTION_MAX)
-		func_is_same = false;
-	else
-		func_is_same = (with->func != RTE_ETH_HASH_FUNCTION_DEFAULT) ?
-				(comp->func == with->func) : true;
+	func_is_same = (with->func != RTE_ETH_HASH_FUNCTION_DEFAULT) ?
+			(comp->func == with->func) : true;
 
 	if (with->key_len == 0 || with->key == NULL)
@@ -1489,5 +1478,4 @@ hns3_config_rss_filter(struct hns3_hw *hw,
 		       const struct hns3_rss_conf *conf, bool add)
 {
-	struct hns3_rss_conf *rss_info;
 	uint64_t flow_types;
 	uint16_t num;
@@ -1516,5 +1504,4 @@ hns3_config_rss_filter(struct hns3_hw *hw,
 	rss_flow_conf.types = flow_types;
 
-	rss_info = &hw->rss_info;
 	if (!add) {
 		if (!conf->valid)
@@ -1527,13 +1514,4 @@ hns3_config_rss_filter(struct hns3_hw *hw,
 		}
 
-		if (rss_flow_conf.queue_num) {
-			/*
-			 * Due the content of queue pointer have been reset to
-			 * 0, the rss_info->conf.queue should be set to NULL
-			 */
-			rss_info->conf.queue = NULL;
-			rss_info->conf.queue_num = 0;
-		}
-
 		return 0;
 	}
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:25.287441603 +0000
+++ 0061-net-hns3-remove-useless-code-when-destroy-valid-RSS-.patch	2023-02-23 14:46:23.810236105 +0000
@@ -1 +1 @@
-From 546031ba551485c3e3aa57c3698975c2852cbef1 Mon Sep 17 00:00:00 2001
+From 2f00c06957fc89f7a3a483d118ef5fcef558b847 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 546031ba551485c3e3aa57c3698975c2852cbef1 ]
+
@@ -21 +22,0 @@
-Cc: stable at dpdk.org
@@ -30 +31 @@
-index 4cca675c53..3809fcc2d7 100644
+index d0d0c7c636..5803406ef7 100644
@@ -33 +34 @@
-@@ -1280,17 +1280,6 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp,
+@@ -1233,17 +1233,6 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp,
@@ -53 +54 @@
-@@ -1534,5 +1523,4 @@ hns3_config_rss_filter(struct hns3_hw *hw,
+@@ -1489,5 +1478,4 @@ hns3_config_rss_filter(struct hns3_hw *hw,
@@ -59 +60 @@
-@@ -1561,5 +1549,4 @@ hns3_config_rss_filter(struct hns3_hw *hw,
+@@ -1516,5 +1504,4 @@ hns3_config_rss_filter(struct hns3_hw *hw,
@@ -65 +66 @@
-@@ -1572,13 +1559,4 @@ hns3_config_rss_filter(struct hns3_hw *hw,
+@@ -1527,13 +1514,4 @@ hns3_config_rss_filter(struct hns3_hw *hw,