From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 72127A046B for ; Tue, 23 Jul 2019 03:02:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 53C631BEEC; Tue, 23 Jul 2019 03:02:06 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id F11EC1BEDC for ; Tue, 23 Jul 2019 03:02:04 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:02:02 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11HfC026580; Tue, 23 Jul 2019 04:02:00 +0300 From: Yongseok Koh To: Dekel Peled Cc: Shahaf Shuler , dpdk stable Date: Mon, 22 Jul 2019 17:59:53 -0700 Message-Id: <20190723010115.6446-26-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix hex dump of error completion' has been queued to LTS release 17.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: Shahaf Shuler --- 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 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@dpdk.org Signed-off-by: Dekel Peled Acked-by: Shahaf Shuler @@ -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),