patch 'net/ice: fix support for 3 scheduler levels' has been queued to stable release 24.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.3

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

Thanks.

Kevin

---
>From 5075b4bbbceb75d3d7991c8e17d0b7d31d04cdd3 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Tue, 6 May 2025 11:34:14 +0100
Subject: [PATCH] net/ice: fix support for 3 scheduler levels

[ upstream commit c8f20c67da13294934dc71e6c18427685ca6eb38 ]

When using only 3 scheduler levels, the VSI node needs to be a node
further down the scheduler hierarchy, rather than one up it as with all
other possible level settings (5-9). Take account of this possibility in
the code.

Fixes: 4ace7701eb44 ("net/ice: provide parameter to limit scheduler layers")

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

diff --git a/drivers/net/ice/ice_tm.c b/drivers/net/ice/ice_tm.c
index ff3a6cd77f..f2d8e12181 100644
--- a/drivers/net/ice/ice_tm.c
+++ b/drivers/net/ice/ice_tm.c
@@ -819,4 +819,16 @@ 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];
+	/* handle case where VSI node needs to move DOWN the hierarchy */
+	while (new_vsi_root->tx_sched_layer < new_root_level) {
+		if (new_vsi_root->num_children == 0)
+			return -1;
+		/* remove all child nodes but the first */
+		while (new_vsi_root->num_children > 1)
+			free_sched_node_recursive(pi, new_vsi_root,
+					new_vsi_root->children[1],
+					new_vsi_root->vsi_handle);
+		new_vsi_root = new_vsi_root->children[0];
+	}
+	/* handle case where VSI node needs to move UP the hierarchy */
 	while (new_vsi_root->tx_sched_layer > new_root_level)
 		new_vsi_root = new_vsi_root->parent;
-- 
2.50.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-07-18 20:29:11.616372156 +0100
+++ 0014-net-ice-fix-support-for-3-scheduler-levels.patch	2025-07-18 20:29:10.818906988 +0100
@@ -1 +1 @@
-From c8f20c67da13294934dc71e6c18427685ca6eb38 Mon Sep 17 00:00:00 2001
+From 5075b4bbbceb75d3d7991c8e17d0b7d31d04cdd3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c8f20c67da13294934dc71e6c18427685ca6eb38 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -17 +18 @@
- drivers/net/intel/ice/ice_tm.c | 12 ++++++++++++
+ drivers/net/ice/ice_tm.c | 12 ++++++++++++
@@ -20 +21 @@
-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
@@ -22,2 +23,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