From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A30C746BAE for ; Fri, 18 Jul 2025 21:33:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9D71F40E30; Fri, 18 Jul 2025 21:33:31 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 2DCCA40E30 for ; Fri, 18 Jul 2025 21:33:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dMuZc1Q/5LYFZnhIl56tjQq9+p+Y03tlQ9eFKFQneB0=; b=HKd5OlXDgKJZxyhf0ztWK9sPDPi85RC9tw4xKNmREK09iB0UoUdvi9lZcQ96S2Ggw8yYmJ GEybPmVvluS0BuNBL6BK/zrcEBKhVFUBOAgb3MOiEbqsAlvfxkcFQ9UtVMVODeJaLkp7Dh +7ufEPRWCHbzXebBz6nsNibOZSXsx/U= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-602-0PhMv0j-NzWKrrikhZZPjg-1; Fri, 18 Jul 2025 15:33:26 -0400 X-MC-Unique: 0PhMv0j-NzWKrrikhZZPjg-1 X-Mimecast-MFC-AGG-ID: 0PhMv0j-NzWKrrikhZZPjg_1752867205 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8D48B1800298; Fri, 18 Jul 2025 19:33:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1ECC618003FC; Fri, 18 Jul 2025 19:33:23 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Ciara Loftus , dpdk stable Subject: patch 'net/ice: fix support for 3 scheduler levels' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:08 +0100 Message-ID: <20250718193247.1008129-14-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: viZgS6iLGx8H0LqQvjv2pMLLIPNKUgpZli2FbkTpoKc_1752867205 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 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 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 Acked-by: Ciara Loftus --- 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@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