patch 'event/dlb2: fix dequeue with CQ depth <= 16' has been queued to stable release 22.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.9

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/02/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/2501056ccb39f18238a86287dddb8389dfaf1e3a

Thanks.

Luca Boccassi

---
>From 2501056ccb39f18238a86287dddb8389dfaf1e3a Mon Sep 17 00:00:00 2001
From: Pravin Pathak <pravin.pathak at intel.com>
Date: Wed, 18 Jun 2025 23:03:10 -0500
Subject: [PATCH] event/dlb2: fix dequeue with CQ depth <= 16

[ upstream commit 0b92203cdae06dee0626e46e62b9c34450e776d8 ]

When application configures a DIR port with CQ depth less than 8, DLB PMD
sets port's cq_depth as 8 and token reservation is used to make the
effective cq_depth smaller. However, while setting port's cq_depth_mask
application configured CQ depth was used resulting in reading incorrect
cachelines while dequeuing. Use PMD calculated CQ depth for cq_depth_mask
calculation.

Fixes: 3a6d0c04e7fb3e ("event/dlb2: add port setup")

Signed-off-by: Pravin Pathak <pravin.pathak at intel.com>
Signed-off-by: Tirthendu Sarkar <tirthendu.sarkar at intel.com>
---
 drivers/event/dlb2/dlb2.c       | 4 ++--
 drivers/event/dlb2/pf/dlb2_pf.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c
index d5981afa6a..50b88802c6 100644
--- a/drivers/event/dlb2/dlb2.c
+++ b/drivers/event/dlb2/dlb2.c
@@ -1887,9 +1887,9 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2,
 	qm_port->cq_idx_unmasked = 0;
 
 	if (dlb2->poll_mode == DLB2_CQ_POLL_MODE_SPARSE)
-		qm_port->cq_depth_mask = (cfg.cq_depth * 4) - 1;
+		qm_port->cq_depth_mask = (qm_port->cq_depth * 4) - 1;
 	else
-		qm_port->cq_depth_mask = cfg.cq_depth - 1;
+		qm_port->cq_depth_mask = qm_port->cq_depth - 1;
 
 	qm_port->gen_bit_shift = __builtin_popcount(qm_port->cq_depth_mask);
 	/* starting value of gen bit - it toggles at wrap time */
diff --git a/drivers/event/dlb2/pf/dlb2_pf.c b/drivers/event/dlb2/pf/dlb2_pf.c
index 3d15250e11..e585861254 100644
--- a/drivers/event/dlb2/pf/dlb2_pf.c
+++ b/drivers/event/dlb2/pf/dlb2_pf.c
@@ -400,7 +400,7 @@ dlb2_pf_dir_port_create(struct dlb2_hw_dev *handle,
 	/* Calculate the port memory required, and round up to the nearest
 	 * cache line.
 	 */
-	alloc_sz = cfg->cq_depth * qe_sz;
+	alloc_sz = RTE_MAX(cfg->cq_depth, DLB2_MIN_HARDWARE_CQ_DEPTH) * qe_sz;
 	alloc_sz = RTE_CACHE_LINE_ROUNDUP(alloc_sz);
 
 	port_base = dlb2_alloc_coherent_aligned(&mz, &cq_base, alloc_sz,
-- 
2.47.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-06-30 13:21:22.478218049 +0100
+++ 0019-event-dlb2-fix-dequeue-with-CQ-depth-16.patch	2025-06-30 13:21:21.763057717 +0100
@@ -1 +1 @@
-From 0b92203cdae06dee0626e46e62b9c34450e776d8 Mon Sep 17 00:00:00 2001
+From 2501056ccb39f18238a86287dddb8389dfaf1e3a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0b92203cdae06dee0626e46e62b9c34450e776d8 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 08291b10b8..bec1e88074 100644
+index d5981afa6a..50b88802c6 100644
@@ -27 +28 @@
-@@ -1951,9 +1951,9 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2,
+@@ -1887,9 +1887,9 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2,
@@ -37 +38 @@
- 	qm_port->gen_bit_shift = rte_popcount32(qm_port->cq_depth_mask);
+ 	qm_port->gen_bit_shift = __builtin_popcount(qm_port->cq_depth_mask);
@@ -40 +41 @@
-index ac432b81ad..cd2788c035 100644
+index 3d15250e11..e585861254 100644
@@ -43 +44 @@
-@@ -427,7 +427,7 @@ dlb2_pf_dir_port_create(struct dlb2_hw_dev *handle,
+@@ -400,7 +400,7 @@ dlb2_pf_dir_port_create(struct dlb2_hw_dev *handle,