From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E3CE042814 for ; Wed, 29 Mar 2023 03:04:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DF96440F18; Wed, 29 Mar 2023 03:04:56 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id BDE6840EE7 for ; Wed, 29 Mar 2023 03:04:55 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id q7-20020a05600c46c700b003ef6e809574so5310301wmo.4 for ; Tue, 28 Mar 2023 18:04:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680051895; x=1682643895; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8+DxxqAj3sytqP0pbhUznbNdgcLEQbGQqiTMHFkec9Q=; b=h6AjFGaIJGeB+xfRs10betb1B7Nl9VMGxTDOXdx5KYfeDtJMQsmQYw2/LROpa5S3Sx EdcN9Ywxu3JM1fwK6aHVzXPfg8p2PewVy35y6pr8gk6sKCIexet8KZu1/flCrYJsO7WY ge2ihogTFmiI/ykNOg1+ysPfIYnC2+2jOjG4/rSg6fnjMrBN2ZyYOxFedUI4Lk39173X o18Cpa4GNWRH+4n6qw6e3xHSYqvDflAKgXet/PqD8Nf/9N81OHeJrCuIUiWngaIdo1zT r3LzgUJE/jz5Ju2UqENN0JoSfZ+G0WVMPxA7vnhdbOyPCCUDpJeYifz7b8blN3dql8bP /9lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680051895; x=1682643895; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8+DxxqAj3sytqP0pbhUznbNdgcLEQbGQqiTMHFkec9Q=; b=PAzi6n6q3f9yF9QxSlgAa3rZ+J4l9OFBsf7GDO108dzAIglhgMcsetwyMpW9+kbENM DU/FAXqB9ECBE2cgx9TcRY0AUBxoGZ8VbUbPnCgq6P+mAn8KzwfeRFaHlSvk5bOuAXgq 2AswXc1e01lsL/E+ry163bsEGjkoRO2k20r2VSTe5pXSBjBYq5++YvXXdrhUlQENfIiv f6OyDhRlyRfYFDfWj27pPPiBHjxmOKy7OvnIEJn+yvTmpBxSMPvL+zkkKImVLBN9odqM hpHJ2Ox/3WAvvsqnJml1K+t1Nj5jxxDjSZe30i2wnB6OnTh6qAfAn2s4VyWsohH9rpkH UE+Q== X-Gm-Message-State: AO0yUKV0QHmWnv9F8oBteFV2KRheqA8arE+CxRCsANKfFe3XHzwTe9ev bIARxHrYPb5BOrLrkjObVPaRisKgMfI= X-Google-Smtp-Source: AK7set8AN/o4Z7l8qs/Mi1N0q66jWKidkshQ6NDASc7Arg+afvY7R3nvBPFYAHE5cH2YFbV+01e/AQ== X-Received: by 2002:a05:600c:2312:b0:3eb:39e2:915b with SMTP id 18-20020a05600c231200b003eb39e2915bmr13449200wmo.31.1680051895204; Tue, 28 Mar 2023 18:04:55 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id 7-20020a05600c024700b003ef5db16176sm369367wmj.32.2023.03.28.18.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 18:04:54 -0700 (PDT) From: luca.boccassi@gmail.com To: Alexander Kozyrev Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix CQE dump for Tx' has been queued to stable release 20.11.8 Date: Wed, 29 Mar 2023 02:04:39 +0100 Message-Id: <20230329010446.563852-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230329010446.563852-1-luca.boccassi@gmail.com> References: <20230322004155.2333903-19-luca.boccassi@gmail.com> <20230329010446.563852-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 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 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 Acked-by: Matan Azrad --- 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@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,