[dpdk-stable] patch 'net/ice/base: fix issues around move nodes' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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/30/20. 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.

Thanks.

Luca Boccassi

---
>From 5d6c470fd61e3c36e4fa4f726e5781868aa25dde Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Wed, 26 Aug 2020 13:39:35 +0800
Subject: [PATCH] net/ice/base: fix issues around move nodes

[ upstream commit 252deadabce2c6d3cb2d3307a7fac8c1ea62b6c5 ]

1. Fixed the max children check when moving the last(8th) children. This
   allows the parent node to hold 8 children instead of 7.
2. Check whether the VSI is already part of the given aggregator subtree
   before moving it.

Fixes: 29a0c11489ef ("net/ice/base: clean code")

Signed-off-by: Victor Raj <victor.raj at intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Qiming Yang <qiming.yang at intel.com>
---
 drivers/net/ice/base/ice_sched.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c
index 0d2c64e33d..ef439c9ade 100644
--- a/drivers/net/ice/base/ice_sched.c
+++ b/drivers/net/ice/base/ice_sched.c
@@ -2228,7 +2228,7 @@ ice_sched_move_nodes(struct ice_port_info *pi, struct ice_sched_node *parent,
 		return ICE_ERR_PARAM;
 
 	/* Does parent have enough space */
-	if (parent->num_children + num_items >=
+	if (parent->num_children + num_items >
 	    hw->max_children[parent->tx_sched_layer])
 		return ICE_ERR_AQ_FULL;
 
@@ -2296,6 +2296,10 @@ ice_sched_move_vsi_to_agg(struct ice_port_info *pi, u16 vsi_handle, u32 agg_id,
 	if (!vsi_node)
 		return ICE_ERR_DOES_NOT_EXIST;
 
+	/* Is this VSI already part of given aggregator? */
+	if (ice_sched_find_node_in_subtree(pi->hw, agg_node, vsi_node))
+		return ICE_SUCCESS;
+
 	aggl = ice_sched_get_agg_layer(pi->hw);
 	vsil = ice_sched_get_vsi_layer(pi->hw);
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:12.662171166 +0000
+++ 0028-net-ice-base-fix-issues-around-move-nodes.patch	2020-10-28 10:35:11.460829376 +0000
@@ -1,15 +1,16 @@
-From 252deadabce2c6d3cb2d3307a7fac8c1ea62b6c5 Mon Sep 17 00:00:00 2001
+From 5d6c470fd61e3c36e4fa4f726e5781868aa25dde Mon Sep 17 00:00:00 2001
 From: Qi Zhang <qi.z.zhang at intel.com>
 Date: Wed, 26 Aug 2020 13:39:35 +0800
 Subject: [PATCH] net/ice/base: fix issues around move nodes
 
+[ upstream commit 252deadabce2c6d3cb2d3307a7fac8c1ea62b6c5 ]
+
 1. Fixed the max children check when moving the last(8th) children. This
    allows the parent node to hold 8 children instead of 7.
 2. Check whether the VSI is already part of the given aggregator subtree
    before moving it.
 
 Fixes: 29a0c11489ef ("net/ice/base: clean code")
-Cc: stable at dpdk.org
 
 Signed-off-by: Victor Raj <victor.raj at intel.com>
 Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
@@ -19,10 +20,10 @@
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/ice/base/ice_sched.c b/drivers/net/ice/base/ice_sched.c
-index cf9a6a777d..edd90aecb6 100644
+index 0d2c64e33d..ef439c9ade 100644
 --- a/drivers/net/ice/base/ice_sched.c
 +++ b/drivers/net/ice/base/ice_sched.c
-@@ -2267,7 +2267,7 @@ ice_sched_move_nodes(struct ice_port_info *pi, struct ice_sched_node *parent,
+@@ -2228,7 +2228,7 @@ ice_sched_move_nodes(struct ice_port_info *pi, struct ice_sched_node *parent,
  		return ICE_ERR_PARAM;
  
  	/* Does parent have enough space */
@@ -31,7 +32,7 @@
  	    hw->max_children[parent->tx_sched_layer])
  		return ICE_ERR_AQ_FULL;
  
-@@ -2335,6 +2335,10 @@ ice_sched_move_vsi_to_agg(struct ice_port_info *pi, u16 vsi_handle, u32 agg_id,
+@@ -2296,6 +2296,10 @@ ice_sched_move_vsi_to_agg(struct ice_port_info *pi, u16 vsi_handle, u32 agg_id,
  	if (!vsi_node)
  		return ICE_ERR_DOES_NOT_EXIST;