From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2CB0CA04DE for ; Wed, 28 Oct 2020 11:47:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 20321C9FA; Wed, 28 Oct 2020 11:47:38 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 66190C9C0 for ; Wed, 28 Oct 2020 11:47:37 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id t9so5111321wrq.11 for ; Wed, 28 Oct 2020 03:47:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y+/4n6myhRLMpY8CxLo241Lex0t1D+lj66nLGHfNDuw=; b=CHk9cz4QGe+5HYBPCZYjrVvLxjEPM0Ty5pet0WZ8PCa0SAWxEyeQHQ1uxUUA8CPwfz Sxrm/cmfKt34pai4xKB0b23TMR+LPc5KxH0N3ilqc3ns+i6oOmeTpK0TEk3bsiGepsnn TXpMKVuj0BtRpfQ+upcU02iCRmDp1sHhIPDO5hEdSOXnVBhWaM6QX04ocWSTP2QzNZ5/ bHiUMU0J35kygSRaBS04v6kqan242TAh2Jbg/Y/eZLafc+diBgnXoswFn6Q5o1KjCHO6 Elzu8z5CV1RcNXkgkO2e0QBH1OaHn+IJ+1cgkH2uLU+vNDygTM2N526AU3k2AjgRjXMG 2q4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y+/4n6myhRLMpY8CxLo241Lex0t1D+lj66nLGHfNDuw=; b=rRDlmT/6R6P2UYaArfvwqf3T0NayfVRPQVE1J/6RkjubPtyBaq+mRd40bIzhn2DB5f pE3WM/lq6eKI46uF8JTOcfI9vK9mAO7TsmrgBrvv0gTgKkcJsqku7MHk0Hf4R0sLkUyC SQDvnAs9YWjITOvdRQwvu1/h2uWh8ClColgdMwOP72C1DgyUALx9PhK27u3FnLVIhi3g 29bSRG9VLr/PZA/MY/71Ckl9H7iDjWVqQL2Mv0/MJeeKWuct7rosYCmG1WAoDX2l4rSi MhLgp7Uq0gejAoFZkoU2D6Oe9SD2F2zDds2OPmmL8XtFipteVanttwXUxtakLTzt1m/2 y+iA== X-Gm-Message-State: AOAM532Bfi9G/FwD9UCe7im8O4zJ8nOpi6IJhKr905B9veuW2hyvAVJG QqLj7heMcOKxGy4Eta1GBvTc4YSwI/u8rPrn X-Google-Smtp-Source: ABdhPJzVumKzB0wR6F8ydyeGXstC3H/Cy0rkAgFPeGl8kcnE5mzubs6mKgwhl4Y7tbyaFPZ8Etgxig== X-Received: by 2002:adf:ed8f:: with SMTP id c15mr7854743wro.136.1603882056157; Wed, 28 Oct 2020 03:47:36 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o186sm5944832wmb.12.2020.10.28.03.47.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:47:35 -0700 (PDT) From: luca.boccassi@gmail.com To: Qi Zhang Cc: Victor Raj , Qiming Yang , dpdk stable Date: Wed, 28 Oct 2020 10:43:07 +0000 Message-Id: <20201028104606.3504127-28-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice/base: fix issues around move nodes' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- 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 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@dpdk.org Signed-off-by: Victor Raj Signed-off-by: Qi Zhang @@ -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;