From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 6DE09A0096 for ; Wed, 10 Apr 2019 18:46:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5E6EF1B12B; Wed, 10 Apr 2019 18:46:09 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id B70211B12B for ; Wed, 10 Apr 2019 18:46:07 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 282C02D814; Wed, 10 Apr 2019 16:46:07 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-94.ams2.redhat.com [10.36.117.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F5D15D961; Wed, 10 Apr 2019 16:46:05 +0000 (UTC) From: Kevin Traynor To: Dekel Peled Cc: Shahaf Shuler , dpdk stable Date: Wed, 10 Apr 2019 17:44:10 +0100 Message-Id: <20190410164411.10546-62-ktraynor@redhat.com> In-Reply-To: <20190410164411.10546-1-ktraynor@redhat.com> References: <20190410164411.10546-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 10 Apr 2019 16:46:07 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fix hex dump of error completion' has been queued to LTS release 18.11.2 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 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/16/19. 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. Thanks. Kevin Traynor --- >From 829c97a85f4d4a217df5aa4a8fff5a0d4aeac9ec 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 6fd2285e0..e58baaa35 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -492,5 +492,5 @@ check_cqe(volatile struct mlx5_cqe *cqe, rte_hexdump(stderr, "MLX5 Error CQE:", (const void *)((uintptr_t)err_cqe), - sizeof(*err_cqe)); + sizeof(*cqe)); } return 1; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-10 14:06:12.618878551 +0100 +++ 0062-net-mlx5-fix-hex-dump-of-error-completion.patch 2019-04-10 14:06:08.031290420 +0100 @@ -1,8 +1,10 @@ -From 38f0a160b5fe1c9e8451dea2cab9a78ebfe86675 Mon Sep 17 00:00:00 2001 +From 829c97a85f4d4a217df5aa4a8fff5a0d4aeac9ec 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,7 +26,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h -index be464e870..c0e1adf14 100644 +index 6fd2285e0..e58baaa35 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -492,5 +492,5 @@ check_cqe(volatile struct mlx5_cqe *cqe,