patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Huisong Li <lihuisong@huawei.com>
Cc: Dongdong Liu <liudongdong3@huawei.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'net/hns3: separate setting redirection table' has been queued to stable release 21.11.4
Date: Wed, 15 Mar 2023 14:36:35 +0000	[thread overview]
Message-ID: <20230315143640.677317-42-ktraynor@redhat.com> (raw)
In-Reply-To: <20230315143640.677317-1-ktraynor@redhat.com>

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@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@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@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@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,


  parent reply	other threads:[~2023-03-15 14:37 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-15 14:35 patch 'eal/windows: fix pedantic build' " Kevin Traynor
2023-03-15 14:35 ` patch 'doc: add gpudev to the Doxygen index' " Kevin Traynor
2023-03-15 14:35 ` patch 'doc: fix reference to event timer header' " Kevin Traynor
2023-03-15 14:35 ` patch 'event/cnxk: fix SSO cleanup' " Kevin Traynor
2023-03-15 14:35 ` patch 'test/bbdev: fix crash for non supported HARQ length' " Kevin Traynor
2023-03-15 14:35 ` patch 'test/bbdev: extend HARQ tolerance' " Kevin Traynor
2023-03-15 14:36 ` patch 'test/bbdev: remove check for invalid opaque data' " Kevin Traynor
2023-03-15 14:36 ` patch 'vhost: fix OOB access for invalid vhost ID' " Kevin Traynor
2023-03-15 14:36 ` patch 'net/virtio: deduce IP length for TSO checksum' " Kevin Traynor
2023-03-15 14:36 ` patch 'examples/ipsec-secgw: fix auth IV length' " Kevin Traynor
2023-03-15 14:36 ` patch 'compress/mlx5: fix decompress xform validation' " Kevin Traynor
2023-03-15 14:36 ` patch 'compress/mlx5: fix output Adler-32 checksum offset' " Kevin Traynor
2023-03-15 14:36 ` patch 'compress/mlx5: fix queue setup for partial transformations' " Kevin Traynor
2023-03-15 14:36 ` patch 'app/testpmd: fix Tx preparation in checksum engine' " Kevin Traynor
2023-03-15 14:36 ` patch 'app/testpmd: fix packet count in IEEE 1588 " Kevin Traynor
2023-03-15 14:36 ` patch 'app/testpmd: fix packet transmission in noisy VNF " Kevin Traynor
2023-03-15 14:36 ` patch 'ethdev: fix build with LTO' " Kevin Traynor
2023-03-15 14:36 ` patch 'net/nfp: fix getting RSS configuration' " Kevin Traynor
2023-03-15 14:36 ` patch 'ethdev: remove telemetry Rx mbuf alloc failed field' " Kevin Traynor
2023-03-15 14:36 ` patch 'app/testpmd: fix secondary process packet forwarding' " Kevin Traynor
2023-03-15 14:36 ` patch 'net/ixgbe: fix IPv6 mask in flow director' " Kevin Traynor
2023-03-15 14:36 ` patch 'net/cnxk: fix LBK BPID usage' " Kevin Traynor
2023-03-15 14:36 ` patch 'common/cnxk: add memory clobber to steor and ldeor' " Kevin Traynor
2023-03-15 14:36 ` patch 'kvargs: add API documentation for process callback' " Kevin Traynor
2023-03-15 14:36 ` patch 'compressdev: fix empty devargs parsing' " Kevin Traynor
2023-03-15 14:36 ` patch 'cryptodev: " Kevin Traynor
2023-03-15 14:36 ` patch 'net/hns3: " Kevin Traynor
2023-03-15 14:36 ` patch 'net/virtio: " Kevin Traynor
2023-03-15 14:36 ` patch 'dma/skeleton: " Kevin Traynor
2023-03-15 14:36 ` patch 'raw/skeleton: " Kevin Traynor
2023-03-15 14:36 ` patch 'table: fix action selector group size log2 setting' " Kevin Traynor
2023-03-15 14:36 ` patch 'regex/mlx5: utilize all available queue pairs' " Kevin Traynor
2023-03-15 14:36 ` patch 'regex/mlx5: fix doorbell record' " Kevin Traynor
2023-03-15 14:36 ` patch 'common/sfc_efx/base: add MAE mark reset action' " Kevin Traynor
2023-03-15 14:36 ` patch 'kni: fix possible starvation when mbufs are exhausted' " Kevin Traynor
2023-03-15 14:36 ` patch 'cmdline: make rdline status not private' " Kevin Traynor
2023-03-15 14:36 ` patch 'cmdline: handle EOF as quit' " Kevin Traynor
2023-03-15 14:36 ` patch 'mem: fix heap ID in telemetry' " Kevin Traynor
2023-03-15 14:36 ` patch 'net/hns3: fix possible truncation of hash key when config' " Kevin Traynor
2023-03-15 14:36 ` patch 'net/hns3: fix possible truncation of redirection table' " Kevin Traynor
2023-03-15 14:36 ` patch 'net/hns3: use hardware config to report " Kevin Traynor
2023-03-15 14:36 ` Kevin Traynor [this message]
2023-03-15 14:36 ` patch 'net/hns3: separate setting and clearing RSS rule' " Kevin Traynor
2023-03-15 14:36 ` patch 'net/mlx5: fix Windows build with MinGW GCC 12' " Kevin Traynor
2023-03-15 14:36 ` patch 'app/crypto-perf: fix test file memory leak' " Kevin Traynor
2023-03-15 14:36 ` patch 'app/flow-perf: fix division or module by zero' " Kevin Traynor
2023-03-15 14:36 ` patch 'mailmap: add list of contributors' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230315143640.677317-42-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=lihuisong@huawei.com \
    --cc=liudongdong3@huawei.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).