patch 'net/intel: update key length when getting RSS key' has been queued to stable release 23.11.7

[Shani Peretz]

Hi,

FYI, your patch has been queued to stable release 23.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/05/26. 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/shanipr/dpdk-stable

This queued commit can be viewed at:
https://github.com/shanipr/dpdk-stable/commit/9b42f8f954515ed407a7c5f704ef2dc1ce501ad0

Thanks.

Shani

---
>From 9b42f8f954515ed407a7c5f704ef2dc1ce501ad0 Mon Sep 17 00:00:00 2001
From: Thierry Herbelot <thierry.herbelot at 6wind.com>
Date: Fri, 16 Jan 2026 14:54:35 +0100
Subject: [PATCH] net/intel: update key length when getting RSS key

[ upstream commit 23e5d5ed70c89715d1a29ee780ade74c8aab1998 ]

When adding the i40e PMD, the rss_hash_conf_get function was changed
to update the RSS key len.
The corresponding functions for ixgbe & e1000 were not updated to
follow the new convention.

Fixes: 8a387fa85f02 ("ethdev: more RSS flags")

Signed-off-by: Thierry Herbelot <thierry.herbelot at 6wind.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/e1000/igb_rxtx.c   | 3 ++-
 drivers/net/igc/igc_ethdev.c   | 1 +
 drivers/net/ixgbe/ixgbe_rxtx.c | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index 5ee9d48e00..f47e0e9dba 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -2015,13 +2015,14 @@ int eth_igb_rss_hash_conf_get(struct rte_eth_dev *dev,
 	hash_key = rss_conf->rss_key;
 	if (hash_key != NULL) {
 		/* Return RSS hash key */
-		for (i = 0; i < 10; i++) {
+		for (i = 0; i < IGB_HKEY_MAX_INDEX; i++) {
 			rss_key = E1000_READ_REG_ARRAY(hw, E1000_RSSRK(0), i);
 			hash_key[(i * 4)] = rss_key & 0x000000FF;
 			hash_key[(i * 4) + 1] = (rss_key >> 8) & 0x000000FF;
 			hash_key[(i * 4) + 2] = (rss_key >> 16) & 0x000000FF;
 			hash_key[(i * 4) + 3] = (rss_key >> 24) & 0x000000FF;
 		}
+		rss_conf->rss_key_len = IGB_HKEY_MAX_INDEX * sizeof(uint32_t);
 	}
 
 	/* Get RSS functions configured in MRQC register */
diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c
index f40b6f95ee..783413aefc 100644
--- a/drivers/net/igc/igc_ethdev.c
+++ b/drivers/net/igc/igc_ethdev.c
@@ -2549,6 +2549,7 @@ eth_igc_rss_hash_conf_get(struct rte_eth_dev *dev,
 		/* read RSS key from register */
 		for (i = 0; i < IGC_HKEY_MAX_INDEX; i++)
 			hash_key[i] = IGC_READ_REG_LE_VALUE(hw, IGC_RSSRK(i));
+		rss_conf->rss_key_len = IGC_HKEY_MAX_INDEX * sizeof(uint32_t);
 	}
 
 	/* get RSS functions configured in MRQC register */
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 98ba9126b7..d92d31250f 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -3655,13 +3655,14 @@ ixgbe_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
 	hash_key = rss_conf->rss_key;
 	if (hash_key != NULL) {
 		/* Return RSS hash key */
-		for (i = 0; i < 10; i++) {
+		for (i = 0; i < IXGBE_HKEY_MAX_INDEX; i++) {
 			rss_key = IXGBE_READ_REG_ARRAY(hw, rssrk_reg, i);
 			hash_key[(i * 4)] = rss_key & 0x000000FF;
 			hash_key[(i * 4) + 1] = (rss_key >> 8) & 0x000000FF;
 			hash_key[(i * 4) + 2] = (rss_key >> 16) & 0x000000FF;
 			hash_key[(i * 4) + 3] = (rss_key >> 24) & 0x000000FF;
 		}
+		rss_conf->rss_key_len = IXGBE_HKEY_MAX_INDEX * sizeof(uint32_t);
 	}
 
 	if (!ixgbe_rss_enabled(hw)) { /* RSS is disabled */
-- 
2.43.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-03-31 00:32:34.383684271 +0300
+++ 0060-net-intel-update-key-length-when-getting-RSS-key.patch	2026-03-31 00:32:29.112350000 +0300
@@ -1 +1 @@
-From 23e5d5ed70c89715d1a29ee780ade74c8aab1998 Mon Sep 17 00:00:00 2001
+From 9b42f8f954515ed407a7c5f704ef2dc1ce501ad0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 23e5d5ed70c89715d1a29ee780ade74c8aab1998 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -17,3 +18,3 @@
- drivers/net/intel/e1000/igb_rxtx.c   | 3 ++-
- drivers/net/intel/e1000/igc_ethdev.c | 1 +
- drivers/net/intel/ixgbe/ixgbe_rxtx.c | 3 ++-
+ drivers/net/e1000/igb_rxtx.c   | 3 ++-
+ drivers/net/igc/igc_ethdev.c   | 1 +
+ drivers/net/ixgbe/ixgbe_rxtx.c | 3 ++-
@@ -22,5 +23,5 @@
-diff --git a/drivers/net/intel/e1000/igb_rxtx.c b/drivers/net/intel/e1000/igb_rxtx.c
-index cdd7a3338f..14b2858817 100644
---- a/drivers/net/intel/e1000/igb_rxtx.c
-+++ b/drivers/net/intel/e1000/igb_rxtx.c
-@@ -2035,13 +2035,14 @@ int eth_igb_rss_hash_conf_get(struct rte_eth_dev *dev,
+diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
+index 5ee9d48e00..f47e0e9dba 100644
+--- a/drivers/net/e1000/igb_rxtx.c
++++ b/drivers/net/e1000/igb_rxtx.c
+@@ -2015,13 +2015,14 @@ int eth_igb_rss_hash_conf_get(struct rte_eth_dev *dev,
@@ -42,5 +43,5 @@
-diff --git a/drivers/net/intel/e1000/igc_ethdev.c b/drivers/net/intel/e1000/igc_ethdev.c
-index cfcf7cad28..2155a67268 100644
---- a/drivers/net/intel/e1000/igc_ethdev.c
-+++ b/drivers/net/intel/e1000/igc_ethdev.c
-@@ -2559,6 +2559,7 @@ eth_igc_rss_hash_conf_get(struct rte_eth_dev *dev,
+diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c
+index f40b6f95ee..783413aefc 100644
+--- a/drivers/net/igc/igc_ethdev.c
++++ b/drivers/net/igc/igc_ethdev.c
+@@ -2549,6 +2549,7 @@ eth_igc_rss_hash_conf_get(struct rte_eth_dev *dev,
@@ -49 +50 @@
- 			hash_key[i] = E1000_READ_REG_LE_VALUE(hw, E1000_RSSRK(i));
+ 			hash_key[i] = IGC_READ_REG_LE_VALUE(hw, IGC_RSSRK(i));
@@ -54,5 +55,5 @@
-diff --git a/drivers/net/intel/ixgbe/ixgbe_rxtx.c b/drivers/net/intel/ixgbe/ixgbe_rxtx.c
-index 824e328230..6633341167 100644
---- a/drivers/net/intel/ixgbe/ixgbe_rxtx.c
-+++ b/drivers/net/intel/ixgbe/ixgbe_rxtx.c
-@@ -3751,13 +3751,14 @@ ixgbe_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
+diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
+index 98ba9126b7..d92d31250f 100644
+--- a/drivers/net/ixgbe/ixgbe_rxtx.c
++++ b/drivers/net/ixgbe/ixgbe_rxtx.c
+@@ -3655,13 +3655,14 @@ ixgbe_dev_rss_hash_conf_get(struct rte_eth_dev *dev,