patch 'net/hns3: separate setting redirection table' 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 03/20/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/5de7a11e063fdf703e930242617a556d79c2bed7

Thanks.

Kevin

---
>From 5de7a11e063fdf703e930242617a556d79c2bed7 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Fri, 10 Mar 2023 17:35:10 +0800
Subject: [PATCH] net/hns3: separate setting redirection table

[ upstream commit a421cb93462932717f23c5d8342381726e547ba6 ]

The settings of redirection table comes from the ethdev ops (like,
dev_configure and rss_hash_update) and rte_flow API. For the ethdev
ops, driver has to save it to rss_info::rss_indirection_tbl in hns3_hw
structure so as to it can be restored when reset is triggered.
While rte_flow API no need to use this field to save, they has a global
RSS flow list to maintain all rules which can be used to restore the
table during the reset phase.

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3 at huawei.com>
---
 drivers/net/hns3/hns3_flow.c |  2 --
 drivers/net/hns3/hns3_rss.c  | 21 +++++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 582bf383c9..76cfec6b71 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1465,6 +1465,4 @@ hns3_update_indir_table(struct hns3_hw *hw,
 
 	/* Fill in redirection table */
-	memcpy(indir_tbl, hw->rss_info.rss_indirection_tbl,
-	       sizeof(hw->rss_info.rss_indirection_tbl));
 	for (i = 0, j = 0; i < hw->rss_ind_tbl_size; i++, j++) {
 		j %= num;
diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c
index 4d0cbcaa8b..67e33a2765 100644
--- a/drivers/net/hns3/hns3_rss.c
+++ b/drivers/net/hns3/hns3_rss.c
@@ -373,8 +373,4 @@ hns3_set_rss_indir_table(struct hns3_hw *hw, uint16_t *indir, uint16_t size)
 	}
 
-	/* Update redirection table of hw */
-	memcpy(hw->rss_info.rss_indirection_tbl, indir,
-	       sizeof(uint16_t) * size);
-
 	return 0;
 }
@@ -442,6 +438,9 @@ hns3_rss_reset_indir_table(struct hns3_hw *hw)
 
 	ret = hns3_set_rss_indir_table(hw, lut, hw->rss_ind_tbl_size);
-	if (ret)
-		hns3_err(hw, "RSS uninit indir table failed: %d", ret);
+	if (ret != 0)
+		hns3_err(hw, "RSS uninit indir table failed, ret = %d.", ret);
+	else
+		memcpy(hw->rss_info.rss_indirection_tbl, lut,
+		       sizeof(uint16_t) * hw->rss_ind_tbl_size);
 	rte_free(lut);
 
@@ -650,10 +649,10 @@ hns3_dev_rss_reta_update(struct rte_eth_dev *dev,
 		shift = i % RTE_ETH_RETA_GROUP_SIZE;
 		if (reta_conf[idx].reta[shift] >= hw->alloc_rss_size) {
-			rte_spinlock_unlock(&hw->lock);
 			hns3_err(hw, "queue id(%u) set to redirection table "
 				 "exceeds queue number(%u) allocated to a TC",
 				 reta_conf[idx].reta[shift],
 				 hw->alloc_rss_size);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto out;
 		}
 
@@ -664,5 +663,11 @@ hns3_dev_rss_reta_update(struct rte_eth_dev *dev,
 	ret = hns3_set_rss_indir_table(hw, indirection_tbl,
 				       hw->rss_ind_tbl_size);
+	if (ret != 0)
+		goto out;
 
+	memcpy(rss_cfg->rss_indirection_tbl, indirection_tbl,
+	       sizeof(uint16_t) * hw->rss_ind_tbl_size);
+
+out:
 	rte_spinlock_unlock(&hw->lock);
 	return ret;
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-15 14:30:21.605757646 +0000
+++ 0042-net-hns3-separate-setting-redirection-table.patch	2023-03-15 14:30:20.615123805 +0000
@@ -1 +1 @@
-From a421cb93462932717f23c5d8342381726e547ba6 Mon Sep 17 00:00:00 2001
+From 5de7a11e063fdf703e930242617a556d79c2bed7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a421cb93462932717f23c5d8342381726e547ba6 ]
+
@@ -14,2 +15,0 @@
-Cc: stable at dpdk.org
-
@@ -24 +24 @@
-index 2faeb9ca52..d5db09a263 100644
+index 582bf383c9..76cfec6b71 100644
@@ -27 +27 @@
-@@ -1520,6 +1520,4 @@ hns3_update_indir_table(struct hns3_hw *hw,
+@@ -1465,6 +1465,4 @@ hns3_update_indir_table(struct hns3_hw *hw,
@@ -35 +35 @@
-index 401e3adfdf..751033d98f 100644
+index 4d0cbcaa8b..67e33a2765 100644
@@ -38 +38 @@
-@@ -474,8 +474,4 @@ hns3_set_rss_indir_table(struct hns3_hw *hw, uint16_t *indir, uint16_t size)
+@@ -373,8 +373,4 @@ hns3_set_rss_indir_table(struct hns3_hw *hw, uint16_t *indir, uint16_t size)
@@ -47 +47 @@
-@@ -543,6 +539,9 @@ hns3_rss_reset_indir_table(struct hns3_hw *hw)
+@@ -442,6 +438,9 @@ hns3_rss_reset_indir_table(struct hns3_hw *hw)
@@ -59 +59 @@
-@@ -856,10 +855,10 @@ hns3_dev_rss_reta_update(struct rte_eth_dev *dev,
+@@ -650,10 +649,10 @@ hns3_dev_rss_reta_update(struct rte_eth_dev *dev,
@@ -72 +72 @@
-@@ -870,5 +869,11 @@ hns3_dev_rss_reta_update(struct rte_eth_dev *dev,
+@@ -664,5 +663,11 @@ hns3_dev_rss_reta_update(struct rte_eth_dev *dev,