patch 'net/ice: fix TM hierarchy deletion' has been queued to stable release 24.11.7

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 24.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 06/13/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/049783cc7a964bda6d2b0508c7db50c02e8b33a1

Thanks.

Luca Boccassi

---
>From 049783cc7a964bda6d2b0508c7db50c02e8b33a1 Mon Sep 17 00:00:00 2001
From: Mukul Katiyar <mukul at versa-networks.com>
Date: Thu, 7 May 2026 12:59:29 +0000
Subject: [PATCH] net/ice: fix TM hierarchy deletion

[ upstream commit e1f639cba2ce3656ca72c7c4a0648ca9ec61e225 ]

When a TM hierarchy is fully deleted and then committed, the hardware
scheduler nodes may be left with any bandwidth limits that were
programmed by the previous hierarchy commit. These stale limits may
remain in effect the next time the device starts, permanently throttling
traffic even though the TM hierarchy was removed.

Fix this by resetting all descendant hardware scheduler nodes to their
default state when committing an empty hierarchy. Also restore the port
queue count to its hardware default and clear the committed flag so the
port starts cleanly without any TM configuration applied.

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

Signed-off-by: Mukul Katiyar <mukul at versa-networks.com>
Signed-off-by: Ciara Loftus <ciara.loftus at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 .mailmap                 |  1 +
 drivers/net/ice/ice_tm.c | 24 ++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index bf13801dfd..9d87c0f640 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1091,6 +1091,7 @@ Moti Haimovsky <motih at mellanox.com>
 Muhammad Ahmad <muhammad.ahmad at emumba.com>
 Muhammad Bilal <m.bilal at emumba.com>
 Mukesh Dua <mukesh.dua81 at gmail.com>
+Mukul Katiyar <mukul at versa-networks.com>
 Murphy Yang <murphyx.yang at intel.com>
 Murthy NSSR <nidadavolu.murthy at caviumnetworks.com>
 Muthurajan Jayakumar <muthurajan.jayakumar at intel.com>
diff --git a/drivers/net/ice/ice_tm.c b/drivers/net/ice/ice_tm.c
index ff53f2acfd..2bb684bb02 100644
--- a/drivers/net/ice/ice_tm.c
+++ b/drivers/net/ice/ice_tm.c
@@ -805,6 +805,19 @@ create_sched_node_recursive(struct ice_pf *pf, struct ice_port_info *pi,
 	return 0;
 }
 
+static void
+reset_hw_node_recursive(struct ice_hw *hw, struct ice_sched_node *node)
+{
+	uint16_t i;
+
+	for (i = 0; i < node->num_children; i++) {
+		reset_hw_node_recursive(hw, node->children[i]);
+		if (ice_cfg_hw_node(hw, NULL, node->children[i]))
+			PMD_DRV_LOG(WARNING, "Failed to reset node %u to default configuration",
+					node->children[i]->info.node_teid);
+	}
+}
+
 static int
 commit_new_hierarchy(struct rte_eth_dev *dev)
 {
@@ -820,8 +833,15 @@ commit_new_hierarchy(struct rte_eth_dev *dev)
 	struct ice_sched_node *new_vsi_root = hw->vsi_ctx[pf->main_vsi->idx]->sched.vsi_node[0];
 
 	if (sw_root == NULL) {
-		PMD_DRV_LOG(ERR, "No root node defined in TM hierarchy");
-		return -1;
+		if (!pf->tm_conf.committed) {
+			PMD_DRV_LOG(ERR, "No root node defined in TM hierarchy");
+			return -EINVAL;
+		}
+		/* TM hierarchy deleted. Restore default scheduler state. */
+		reset_hw_node_recursive(hw, hw->vsi_ctx[pf->main_vsi->idx]->sched.vsi_node[0]);
+		pf->main_vsi->nb_qps = pf->lan_nb_qps;
+		pf->tm_conf.committed = false;
+		return ice_alloc_lan_q_ctx(hw, 0, 0, pf->main_vsi->nb_qps);
 	}
 
 	/* handle case where VSI node needs to move DOWN the hierarchy */
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-06-11 14:20:03.267421519 +0100
+++ 0049-net-ice-fix-TM-hierarchy-deletion.patch	2026-06-11 14:20:01.238746566 +0100
@@ -1 +1 @@
-From e1f639cba2ce3656ca72c7c4a0648ca9ec61e225 Mon Sep 17 00:00:00 2001
+From 049783cc7a964bda6d2b0508c7db50c02e8b33a1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e1f639cba2ce3656ca72c7c4a0648ca9ec61e225 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -24,2 +25,2 @@
- .mailmap                       |  1 +
- drivers/net/intel/ice/ice_tm.c | 24 ++++++++++++++++++++++--
+ .mailmap                 |  1 +
+ drivers/net/ice/ice_tm.c | 24 ++++++++++++++++++++++--
@@ -29 +30 @@
-index fb544d0057..1ef52121dd 100644
+index bf13801dfd..9d87c0f640 100644
@@ -32 +33 @@
-@@ -1137,6 +1137,7 @@ Moti Haimovsky <motih at mellanox.com>
+@@ -1091,6 +1091,7 @@ Moti Haimovsky <motih at mellanox.com>
@@ -40 +41 @@
-diff --git 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
@@ -42,2 +43,2 @@
---- a/drivers/net/intel/ice/ice_tm.c
-+++ b/drivers/net/intel/ice/ice_tm.c
+--- a/drivers/net/ice/ice_tm.c
++++ b/drivers/net/ice/ice_tm.c