patch 'common/cnxk: fix bitmap usage for TM' has been queued to stable release 21.11.1

Kevin Traynor ktraynor at redhat.com
Tue Mar 8 15:14:44 CET 2022


Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/14/22. 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/552ab1729a35c68e4c9c9c3d37370d3e3e058d57

Thanks.

Kevin

---
>From 552ab1729a35c68e4c9c9c3d37370d3e3e058d57 Mon Sep 17 00:00:00 2001
From: Nithin Dabilpuram <ndabilpuram at marvell.com>
Date: Thu, 3 Mar 2022 12:30:41 +0530
Subject: [PATCH] common/cnxk: fix bitmap usage for TM

[ upstream commit 66d485fb50d8de4e78deefebdadc4723c2db2ea2 ]

Revert change [1] to return error on case where no slab of free
resources is found. That error check break's a case where
there is a spare schedule queue to be reused that was just
allocated for sake of contiguous static TM nodes.

[1]
Fixes: 14f7e5d4bf2d ("common/cnxk: add missing checks of return values")

Signed-off-by: Nithin Dabilpuram <ndabilpuram at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/common/cnxk/roc_nix_tm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/common/cnxk/roc_nix_tm.c b/drivers/common/cnxk/roc_nix_tm.c
index e765fe703c..ebb27a3106 100644
--- a/drivers/common/cnxk/roc_nix_tm.c
+++ b/drivers/common/cnxk/roc_nix_tm.c
@@ -1017,8 +1017,6 @@ nix_tm_assign_hw_id(struct nix *nix, struct nix_tm_node *parent,
 		}
 
-		if (!slab) {
-			if (!plt_bitmap_scan(bmp, &pos, &slab))
-				return -ENOENT;
-		}
+		if (!slab)
+			plt_bitmap_scan(bmp, &pos, &slab);
 
 		if (child->priority == parent->rr_prio && spare_schq != -1) {
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-08 13:55:29.149273083 +0000
+++ 0029-common-cnxk-fix-bitmap-usage-for-TM.patch	2022-03-08 13:55:28.498315169 +0000
@@ -1 +1 @@
-From 66d485fb50d8de4e78deefebdadc4723c2db2ea2 Mon Sep 17 00:00:00 2001
+From 552ab1729a35c68e4c9c9c3d37370d3e3e058d57 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 66d485fb50d8de4e78deefebdadc4723c2db2ea2 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 7a17780058..5b70c7bfed 100644
+index e765fe703c..ebb27a3106 100644
@@ -25 +26 @@
-@@ -1043,8 +1043,6 @@ nix_tm_assign_hw_id(struct nix *nix, struct nix_tm_node *parent,
+@@ -1017,8 +1017,6 @@ nix_tm_assign_hw_id(struct nix *nix, struct nix_tm_node *parent,



More information about the stable mailing list