patch 'net/mlx5: fix CQE dump for Tx' has been queued to stable release 20.11.8

luca.boccassi at gmail.com luca.boccassi at gmail.com
Wed Mar 29 03:04:39 CEST 2023


Hi,

FYI, your patch has been queued to stable release 20.11.8

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/31/23. 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/f93f785d060077a584e15c85cc29ac20a4510ded

Thanks.

Luca Boccassi

---
>From f93f785d060077a584e15c85cc29ac20a4510ded Mon Sep 17 00:00:00 2001
From: Alexander Kozyrev <akozyrev at nvidia.com>
Date: Fri, 24 Mar 2023 01:51:40 +0200
Subject: [PATCH] net/mlx5: fix CQE dump for Tx

[ upstream commit cd4158177434d557742b4bb0fbe68e59d2c2db21 ]

The regular CQE size can be 64 bytes or 128 bytes depending
on the cache line size. The error CQE is always 64 bytes long.
Only 64 bytes are dumped to the log file in case of Tx queue
recovery form the error. Use the CQE size, not the error CQE size.

Fixes: 957e45fb7bcb ("net/mlx5: handle Tx completion with error")

Signed-off-by: Alexander Kozyrev <akozyrev at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx5/mlx5_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index f7c8b8c076..c8f24dd4ef 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -785,7 +785,7 @@ mlx5_tx_error_cqe_handle(struct mlx5_txq_data *__rte_restrict txq,
 			mlx5_dump_debug_information(name, "MLX5 Error CQ:",
 						    (const void *)((uintptr_t)
 						    txq->cqes),
-						    sizeof(*err_cqe) *
+						    sizeof(struct mlx5_cqe) *
 						    (1 << txq->cqe_n));
 			mlx5_dump_debug_information(name, "MLX5 Error SQ:",
 						    (const void *)((uintptr_t)
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-29 01:31:22.669466535 +0100
+++ 0003-net-mlx5-fix-CQE-dump-for-Tx.patch	2023-03-29 01:31:22.478039404 +0100
@@ -1 +1 @@
-From cd4158177434d557742b4bb0fbe68e59d2c2db21 Mon Sep 17 00:00:00 2001
+From f93f785d060077a584e15c85cc29ac20a4510ded Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cd4158177434d557742b4bb0fbe68e59d2c2db21 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -17 +18 @@
- drivers/net/mlx5/mlx5_tx.c | 2 +-
+ drivers/net/mlx5/mlx5_rxtx.c | 2 +-
@@ -20,5 +21,5 @@
-diff --git a/drivers/net/mlx5/mlx5_tx.c b/drivers/net/mlx5/mlx5_tx.c
-index a13c7e937c..14e1487e59 100644
---- a/drivers/net/mlx5/mlx5_tx.c
-+++ b/drivers/net/mlx5/mlx5_tx.c
-@@ -107,7 +107,7 @@ mlx5_tx_error_cqe_handle(struct mlx5_txq_data *__rte_restrict txq,
+diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
+index f7c8b8c076..c8f24dd4ef 100644
+--- a/drivers/net/mlx5/mlx5_rxtx.c
++++ b/drivers/net/mlx5/mlx5_rxtx.c
+@@ -785,7 +785,7 @@ mlx5_tx_error_cqe_handle(struct mlx5_txq_data *__rte_restrict txq,


More information about the stable mailing list