patch 'net/ionic: fix RSS query' has been queued to stable release 22.11.5

luca.boccassi at gmail.com luca.boccassi at gmail.com
Thu Mar 7 02:31:33 CET 2024


Hi,

FYI, your patch has been queued to stable release 22.11.5

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/09/24. 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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/64baeefd1fb0c98a09f57d025023d33f5fcfef0c

Thanks.

Luca Boccassi

---
>From 64baeefd1fb0c98a09f57d025023d33f5fcfef0c Mon Sep 17 00:00:00 2001
From: Akshay Dorwat <akshay.dorwat at amd.com>
Date: Tue, 6 Feb 2024 19:13:11 -0800
Subject: [PATCH] net/ionic: fix RSS query

[ upstream commit 1df32bfd0317a3c8aed1e91b51ca2aa8317812e4 ]

The routine that copies out the RSS config can't use memcpy() because
'reta_conf->reta' is an array of uint16_t while 'lif->rss_ind_tbl' is
an array of uint8_t. Instead, copy the values individually.

Fixes: 22e7171bc63b ("net/ionic: support RSS")

Signed-off-by: Akshay Dorwat <akshay.dorwat at amd.com>
Signed-off-by: Andrew Boyer <andrew.boyer at amd.com>
---
 .mailmap                         | 1 +
 drivers/net/ionic/ionic_ethdev.c | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 841097364c..1d72c6c754 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,7 @@ Ajit Khaparde <ajit.khaparde at broadcom.com>
 Akash Saxena <akash.saxena at caviumnetworks.com>
 Akeem G Abodunrin <akeem.g.abodunrin at intel.com>
 Akhil Goyal <gakhil at marvell.com> <akhil.goyal at nxp.com>
+Akshay Dorwat <akshay.dorwat at amd.com>
 Alain Leon <xerebz at gmail.com>
 Alan Carew <alan.carew at intel.com>
 Alan Dewar <alan.dewar at att.com> <adewar at brocade.com>
diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c
index 340fd0cd59..008e50e0b9 100644
--- a/drivers/net/ionic/ionic_ethdev.c
+++ b/drivers/net/ionic/ionic_ethdev.c
@@ -561,7 +561,7 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev,
 	struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
 	struct ionic_adapter *adapter = lif->adapter;
 	struct ionic_identity *ident = &adapter->ident;
-	int i, num;
+	int i, j, num;
 	uint16_t tbl_sz = rte_le_to_cpu_16(ident->lif.eth.rss_ind_tbl_sz);
 
 	IONIC_PRINT_CALL();
@@ -582,9 +582,10 @@ ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev,
 	num = reta_size / RTE_ETH_RETA_GROUP_SIZE;
 
 	for (i = 0; i < num; i++) {
-		memcpy(reta_conf->reta,
-			&lif->rss_ind_tbl[i * RTE_ETH_RETA_GROUP_SIZE],
-			RTE_ETH_RETA_GROUP_SIZE);
+		for (j = 0; j < RTE_ETH_RETA_GROUP_SIZE; j++) {
+			reta_conf->reta[j] =
+				lif->rss_ind_tbl[(i * RTE_ETH_RETA_GROUP_SIZE) + j];
+		}
 		reta_conf++;
 	}
 
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-07 01:05:41.262715596 +0000
+++ 0076-net-ionic-fix-RSS-query.patch	2024-03-07 01:05:34.926942733 +0000
@@ -1 +1 @@
-From 1df32bfd0317a3c8aed1e91b51ca2aa8317812e4 Mon Sep 17 00:00:00 2001
+From 64baeefd1fb0c98a09f57d025023d33f5fcfef0c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1df32bfd0317a3c8aed1e91b51ca2aa8317812e4 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index d066dc35b6..dc7cd0497d 100644
+index 841097364c..1d72c6c754 100644
@@ -24 +25,2 @@
-@@ -29,6 +29,7 @@ Akash Saxena <akash.saxena at caviumnetworks.com>
+@@ -27,6 +27,7 @@ Ajit Khaparde <ajit.khaparde at broadcom.com>
+ Akash Saxena <akash.saxena at caviumnetworks.com>
@@ -27 +28,0 @@
- Akihiko Odaki <akihiko.odaki at daynix.com>
@@ -30 +30,0 @@
- Alan Brady <alan.brady at intel.com>
@@ -31,0 +32 @@
+ Alan Dewar <alan.dewar at att.com> <adewar at brocade.com>


More information about the stable mailing list