patch 'net/mlx5: fix WQE size calculation for Tx queue' has been queued to stable release 23.11.5

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/10/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=97595e70f80a6a2a2dab6209f8fda183907d62ea

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 97595e70f80a6a2a2dab6209f8fda183907d62ea Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz at nvidia.com>
Date: Fri, 27 Jun 2025 11:25:02 +0300
Subject: [PATCH] net/mlx5: fix WQE size calculation for Tx queue
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 5c0c1a13c34aa57c6e18f9ba852a9b5807c58b72 ]

The txq_calc_wqebb_cnt() should be consistent with the calculation in
the function mlx5_txq_devx_obj_new(). Or when the input descriptor
number is 512, the WQE size will be wrongly considered to be 30 when
no max_inline_data is zero in some cases. The total number of WQE will
be considered as 256 and that is incorrect.

Adjusting the WQE size will solve the wrong calculation when the
calculated WQE size is less than 64B.

Fixes: 38b4b397a57d ("net/mlx5: add Tx configuration and setup")
Cc: stable at dpdk.org

Signed-off-by: Bing Zhao <bingz at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5_txq.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index 0905570f1a..1ddd360a64 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -707,6 +707,7 @@ txq_calc_wqebb_cnt(struct mlx5_txq_ctrl *txq_ctrl)
 		   MLX5_WSEG_SIZE -
 		   MLX5_ESEG_MIN_INLINE_SIZE +
 		   txq_ctrl->max_inline_data;
+	wqe_size = RTE_MAX(wqe_size, MLX5_WQE_SIZE);
 	return rte_align32pow2(wqe_size * desc) / MLX5_WQE_SIZE;
 }
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-07-30 22:50:03.603404636 +0800
+++ 0007-net-mlx5-fix-WQE-size-calculation-for-Tx-queue.patch	2025-07-30 22:50:02.980749523 +0800
@@ -1 +1 @@
-From 5c0c1a13c34aa57c6e18f9ba852a9b5807c58b72 Mon Sep 17 00:00:00 2001
+From 97595e70f80a6a2a2dab6209f8fda183907d62ea Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 5c0c1a13c34aa57c6e18f9ba852a9b5807c58b72 ]
@@ -25 +28 @@
-index 5db12f5c64..8ee8108497 100644
+index 0905570f1a..1ddd360a64 100644
@@ -28 +31 @@
-@@ -709,6 +709,7 @@ txq_calc_wqebb_cnt(struct mlx5_txq_ctrl *txq_ctrl)
+@@ -707,6 +707,7 @@ txq_calc_wqebb_cnt(struct mlx5_txq_ctrl *txq_ctrl)