patch 'net/ice: fix Tx queue capacity sizing after TM commit' has been queued to stable release 24.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 24.11.9

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

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

Thanks.

Luca Boccassi

---
>From 4476c4091f7aa24926d1527db24c8a9028f7750f Mon Sep 17 00:00:00 2001
From: Ciara Loftus <ciara.loftus at intel.com>
Date: Mon, 7 Sep 2026 13:07:47 +0000
Subject: [PATCH] net/ice: fix Tx queue capacity sizing after TM commit

[ upstream commit 21443461255c4552fc93715fac01141edecea718 ]

commit_new_hierarchy() computes the number of usable Tx queues (nb_qps)
by indexing the arrays nodes_created_per_level[] and hw->layer_info[]
with a value derived from ice_get_leaf_level().  Array
nodes_created_per_level[] is indexed by absolute hw scheduler layer, but
ice_get_leaf_level() returns a value relative to the TM hierarchy's root
position, so the index used was off by the number of hidden layers.

This under-counted the qgroup layer, causing nb_qps to be computed from
a shallower layer than the one actually holding the committed qgroup
nodes. In turn, this caused rte_eth_dev_configure to reject any
nb_tx_queues above the miscalculated capacity.

Fix by converting the index to an absolute layer index.

Fixes: 715d449a965b ("net/ice: enhance Tx scheduler hierarchy support")

Signed-off-by: Ciara Loftus <ciara.loftus at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/ice/ice_tm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_tm.c b/drivers/net/ice/ice_tm.c
index 6a715cf1b8f..149d1630589 100644
--- a/drivers/net/ice/ice_tm.c
+++ b/drivers/net/ice/ice_tm.c
@@ -848,7 +848,7 @@ commit_new_hierarchy(struct rte_eth_dev *dev)
 	const uint16_t new_root_level = pf->tm_conf.hidden_layers;
 	/* count nodes per hw level, not per logical */
 	uint16_t nodes_created_per_level[ICE_TM_MAX_LAYERS] = {0};
-	uint8_t q_lvl = ice_get_leaf_level(pf);
+	uint8_t q_lvl = ice_get_leaf_level(pf) + pf->tm_conf.hidden_layers;
 	uint8_t qg_lvl = q_lvl - 1;
 	struct ice_sched_node *new_vsi_root = hw->vsi_ctx[pf->main_vsi->idx]->sched.vsi_node[0];
 
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-10-27 11:43:57.020990000 +0000
+++ 0086-net-ice-fix-Tx-queue-capacity-sizing-after-TM-commit.patch	2026-10-27 11:43:53.602062172 +0000
@@ -1 +1 @@
-From 21443461255c4552fc93715fac01141edecea718 Mon Sep 17 00:00:00 2001
+From 4476c4091f7aa24926d1527db24c8a9028f7750f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 21443461255c4552fc93715fac01141edecea718 ]
+
@@ -21 +22,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
- drivers/net/intel/ice/ice_tm.c | 2 +-
+ drivers/net/ice/ice_tm.c | 2 +-
@@ -29,4 +30,4 @@
-diff --git a/drivers/net/intel/ice/ice_tm.c b/drivers/net/intel/ice/ice_tm.c
-index 2e6ef9c264..651d6aa932 100644
---- a/drivers/net/intel/ice/ice_tm.c
-+++ b/drivers/net/intel/ice/ice_tm.c
+diff --git a/drivers/net/ice/ice_tm.c b/drivers/net/ice/ice_tm.c
+index 6a715cf1b8f..149d1630589 100644
+--- a/drivers/net/ice/ice_tm.c
++++ b/drivers/net/ice/ice_tm.c