patch 'common/cnxk: fix null SQ access' has been queued to stable release 24.11.4
Kevin Traynor
ktraynor at redhat.com
Fri Nov 21 12:21:00 CET 2025
Hi,
FYI, your patch has been queued to stable release 24.11.4
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/26/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/4d8505348c48426722d3c8fd6a54dd543aef7c45
Thanks.
Kevin
---
>From 4d8505348c48426722d3c8fd6a54dd543aef7c45 Mon Sep 17 00:00:00 2001
From: Satha Rao <skoteshwar at marvell.com>
Date: Thu, 13 Nov 2025 10:08:01 +0530
Subject: [PATCH] common/cnxk: fix null SQ access
[ upstream commit 52ff61c2ca114691d74546f5ce16e8a7ebd164ae ]
Condition to check SQ is non NULL before access. Also pktio locks
are simplified while doing threshold_profile config.
Fixes: 90a903ffa6eb ("common/cnxk: split NIX TM hierarchy enable API")
Signed-off-by: Satha Rao <skoteshwar at marvell.com>
---
drivers/common/cnxk/roc_nix_tm_ops.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/common/cnxk/roc_nix_tm_ops.c b/drivers/common/cnxk/roc_nix_tm_ops.c
index b89f08ac66..c5dfdb0122 100644
--- a/drivers/common/cnxk/roc_nix_tm_ops.c
+++ b/drivers/common/cnxk/roc_nix_tm_ops.c
@@ -619,4 +619,11 @@ roc_nix_tm_hierarchy_xmit_enable(struct roc_nix *roc_nix, enum roc_nix_tm_tree t
sq = nix->sqs[sq_id];
+ if (!sq) {
+ plt_err("nb_rxq %d nb_txq %d sq_id %d lvl %d", nix->nb_rx_queues,
+ nix->nb_tx_queues, sq_id, node->lvl);
+ roc_nix_tm_dump(roc_nix, NULL);
+ roc_nix_dump(roc_nix, NULL);
+ return NIX_ERR_TM_INVALID_NODE;
+ }
rc = roc_nix_sq_ena_dis(sq, true);
if (rc) {
--
2.51.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-11-21 11:05:11.931293727 +0000
+++ 0076-common-cnxk-fix-null-SQ-access.patch 2025-11-21 11:05:09.556201566 +0000
@@ -1 +1 @@
-From 52ff61c2ca114691d74546f5ce16e8a7ebd164ae Mon Sep 17 00:00:00 2001
+From 4d8505348c48426722d3c8fd6a54dd543aef7c45 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 52ff61c2ca114691d74546f5ce16e8a7ebd164ae ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 09d014a276..230e9b72f6 100644
+index b89f08ac66..c5dfdb0122 100644
@@ -21 +22 @@
-@@ -625,4 +625,11 @@ roc_nix_tm_hierarchy_xmit_enable(struct roc_nix *roc_nix, enum roc_nix_tm_tree t
+@@ -619,4 +619,11 @@ roc_nix_tm_hierarchy_xmit_enable(struct roc_nix *roc_nix, enum roc_nix_tm_tree t
More information about the stable
mailing list