patch 'net/hns3: use RSS filter list to check duplicated 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/8ba1441f48dc4c1d222f90d0da4df3442ddea03e

Thanks.

Kevin

---
>From 8ba1441f48dc4c1d222f90d0da4df3442ddea03e Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Tue, 31 Jan 2023 21:02:56 +0800
Subject: [PATCH] net/hns3: use RSS filter list to check duplicated rule

[ upstream commit 6afde23d843ecf67453eaf69924bd79873f6f207 ]

All rules from user are saved in RSS filter list, so use RSS
filter list to check duplicated rule.

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

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

diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 78d0bd7e5e..d0d0c7c636 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1254,5 +1254,5 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp,
 
 	return (func_is_same && rss_key_is_same &&
-		comp->types == (with->types & HNS3_ETH_RSS_SUPPORT) &&
+		comp->types == with->types &&
 		comp->level == with->level &&
 		comp->queue_num == with->queue_num &&
@@ -1552,13 +1552,5 @@ hns3_config_rss_filter(struct hns3_hw *hw,
 
 	/* Set hash algorithm and flow types by the user's config */
-	ret = hns3_hw_rss_hash_set(hw, &rss_flow_conf);
-	if (ret)
-		return ret;
-
-	ret = hns3_rss_conf_copy(rss_info, &rss_flow_conf);
-	if (ret)
-		hns3_err(hw, "RSS config init fail(%d)", ret);
-
-	return ret;
+	return hns3_hw_rss_hash_set(hw, &rss_flow_conf);
 }
 
@@ -1633,4 +1625,21 @@ hns3_restore_filter(struct hns3_adapter *hns)
 }
 
+static bool
+hns3_rss_action_is_dup(struct hns3_hw *hw,
+		       const struct rte_flow_action_rss *act)
+{
+	struct hns3_rss_conf_ele *filter;
+
+	TAILQ_FOREACH(filter, &hw->flow_rss_list, entries) {
+		if (!filter->filter_info.valid)
+			continue;
+
+		if (hns3_action_rss_same(&filter->filter_info.conf, act))
+			return true;
+	}
+
+	return false;
+}
+
 static int
 hns3_flow_parse_rss(struct rte_eth_dev *dev,
@@ -1639,9 +1648,7 @@ hns3_flow_parse_rss(struct rte_eth_dev *dev,
 	struct hns3_adapter *hns = dev->data->dev_private;
 	struct hns3_hw *hw = &hns->hw;
-	bool ret;
 
-	ret = hns3_action_rss_same(&hw->rss_info.conf, &conf->conf);
-	if (ret) {
-		hns3_err(hw, "Enter duplicate RSS configuration : %d", ret);
+	if (hns3_rss_action_is_dup(hw, &conf->conf)) {
+		hns3_err(hw, "duplicate RSS configuration");
 		return -EINVAL;
 	}
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:25.264058965 +0000
+++ 0060-net-hns3-use-RSS-filter-list-to-check-duplicated-rul.patch	2023-02-23 14:46:23.808236098 +0000
@@ -1 +1 @@
-From 6afde23d843ecf67453eaf69924bd79873f6f207 Mon Sep 17 00:00:00 2001
+From 8ba1441f48dc4c1d222f90d0da4df3442ddea03e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6afde23d843ecf67453eaf69924bd79873f6f207 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 5711757684..4cca675c53 100644
+index 78d0bd7e5e..d0d0c7c636 100644
@@ -22 +23 @@
-@@ -1301,5 +1301,5 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp,
+@@ -1254,5 +1254,5 @@ hns3_action_rss_same(const struct rte_flow_action_rss *comp,
@@ -29 +30 @@
-@@ -1597,13 +1597,5 @@ hns3_config_rss_filter(struct hns3_hw *hw,
+@@ -1552,13 +1552,5 @@ hns3_config_rss_filter(struct hns3_hw *hw,
@@ -44 +45 @@
-@@ -1677,4 +1669,21 @@ hns3_restore_filter(struct hns3_adapter *hns)
+@@ -1633,4 +1625,21 @@ hns3_restore_filter(struct hns3_adapter *hns)
@@ -66 +67 @@
-@@ -1683,9 +1692,7 @@ hns3_flow_parse_rss(struct rte_eth_dev *dev,
+@@ -1639,9 +1648,7 @@ hns3_flow_parse_rss(struct rte_eth_dev *dev,