[dpdk-stable] patch 'net/mlx5: fix hex dump of error completion' has been queued to LTS release 17.11.7

Yongseok Koh yskoh at mellanox.com
Tue Jul 23 02:59:53 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 17.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 07/27/19. So please
shout if anyone has objection.

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.

Thanks.

Yongseok

---
>From 173194e236b5d9e952b138a132c4db64656627b5 Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Thu, 28 Feb 2019 17:18:45 +0200
Subject: [PATCH] net/mlx5: fix hex dump of error completion

[ upstream commit 38f0a160b5fe1c9e8451dea2cab9a78ebfe86675 ]

struct mlx5_cqe is defined in MLX5 PMD code (mlx5_prm.h).
It includes 64 bytes padding in case of (RTE_CACHE_LINE_SIZE == 128).

struct mlx5_err_cqe is defined in kernel, and doesn't include padding.

When running in debug mode, in case an error CQE is detected
it is printed using rte_hexdump().

The size of data to print should be sizeof(*cqe) instead of
sizeof(*err_cqe), to handle the case of (RTE_CACHE_LINE_SIZE == 128),
and print the full data in any case.

Fixes: c7714992092f ("net/mlx5: extend debug logs verbosity")

Signed-off-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Shahaf Shuler <shahafs at mellanox.com>
---
 drivers/net/mlx5/mlx5_rxtx.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
index 7e811c106c..ce25c4eddb 100644
--- a/drivers/net/mlx5/mlx5_rxtx.h
+++ b/drivers/net/mlx5/mlx5_rxtx.h
@@ -429,7 +429,7 @@ check_cqe(volatile struct mlx5_cqe *cqe,
 				op_code, op_code, syndrome);
 			rte_hexdump(stderr, "MLX5 Error CQE:",
 				    (const void *)((uintptr_t)err_cqe),
-				    sizeof(*err_cqe));
+				    sizeof(*cqe));
 		}
 		return 1;
 	} else if ((op_code != MLX5_CQE_RESP_SEND) &&
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-07-22 17:55:07.909186654 -0700
+++ 0026-net-mlx5-fix-hex-dump-of-error-completion.patch	2019-07-22 17:55:05.908469000 -0700
@@ -1,8 +1,10 @@
-From 38f0a160b5fe1c9e8451dea2cab9a78ebfe86675 Mon Sep 17 00:00:00 2001
+From 173194e236b5d9e952b138a132c4db64656627b5 Mon Sep 17 00:00:00 2001
 From: Dekel Peled <dekelp at mellanox.com>
 Date: Thu, 28 Feb 2019 17:18:45 +0200
 Subject: [PATCH] net/mlx5: fix hex dump of error completion
 
+[ upstream commit 38f0a160b5fe1c9e8451dea2cab9a78ebfe86675 ]
+
 struct mlx5_cqe is defined in MLX5 PMD code (mlx5_prm.h).
 It includes 64 bytes padding in case of (RTE_CACHE_LINE_SIZE == 128).
 
@@ -16,7 +18,6 @@
 and print the full data in any case.
 
 Fixes: c7714992092f ("net/mlx5: extend debug logs verbosity")
-Cc: stable at dpdk.org
 
 Signed-off-by: Dekel Peled <dekelp at mellanox.com>
 Acked-by: Shahaf Shuler <shahafs at mellanox.com>
@@ -25,10 +26,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
-index be464e8705..c0e1adf140 100644
+index 7e811c106c..ce25c4eddb 100644
 --- a/drivers/net/mlx5/mlx5_rxtx.h
 +++ b/drivers/net/mlx5/mlx5_rxtx.h
-@@ -491,7 +491,7 @@ check_cqe(volatile struct mlx5_cqe *cqe,
+@@ -429,7 +429,7 @@ check_cqe(volatile struct mlx5_cqe *cqe,
  				op_code, op_code, syndrome);
  			rte_hexdump(stderr, "MLX5 Error CQE:",
  				    (const void *)((uintptr_t)err_cqe),


More information about the stable mailing list