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 9086542850 for ; Thu, 30 Mar 2023 10:36:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7024F41138; Thu, 30 Mar 2023 10:36:13 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id AC00340685 for ; Thu, 30 Mar 2023 10:36:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680165371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AbFRuXNK4h38/pCtDbbIH8dVrOWBWk8YwzcZQreSung=; b=AuL2ep/ESPkA4RmK9g9hn9ifAL62Lk6Lb7oCGgphyGDO15hRlrxNoC/Bnu3Rbs5+knSvvM HDfMOdIYbAeDbCO31FqXfxVkcGNbKi9GmJYs6Kjxmt6e8U8x9qwZyu+eiWUPGapX8W06ES qliJt6IFKTwumzoWNfhsiJVaRUddFTs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-128-ckvYtTmkMRuYnJX1jhCWKg-1; Thu, 30 Mar 2023 04:36:07 -0400 X-MC-Unique: ckvYtTmkMRuYnJX1jhCWKg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 01507185A790; Thu, 30 Mar 2023 08:36:07 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C36540521FD; Thu, 30 Mar 2023 08:36:06 +0000 (UTC) From: Kevin Traynor To: Alexander Kozyrev Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix CQE dump for Tx' has been queued to stable release 21.11.4 Date: Thu, 30 Mar 2023 09:35:55 +0100 Message-Id: <20230330083600.473876-3-ktraynor@redhat.com> In-Reply-To: <20230330083600.473876-1-ktraynor@redhat.com> References: <20230330083600.473876-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.4 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/02/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/663a819dae91431201620a7af9e2e8f1c7716c73 Thanks. Kevin --- >From 663a819dae91431201620a7af9e2e8f1c7716c73 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_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_tx.c b/drivers/net/mlx5/mlx5_tx.c index fd2cf20967..8f03743986 100644 --- a/drivers/net/mlx5/mlx5_tx.c +++ b/drivers/net/mlx5/mlx5_tx.c @@ -108,5 +108,5 @@ mlx5_tx_error_cqe_handle(struct mlx5_txq_data *__rte_restrict txq, (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:", -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-30 09:30:45.366387335 +0100 +++ 0004-net-mlx5-fix-CQE-dump-for-Tx.patch 2023-03-30 09:30:45.245229242 +0100 @@ -1 +1 @@ -From cd4158177434d557742b4bb0fbe68e59d2c2db21 Mon Sep 17 00:00:00 2001 +From 663a819dae91431201620a7af9e2e8f1c7716c73 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cd4158177434d557742b4bb0fbe68e59d2c2db21 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index a13c7e937c..14e1487e59 100644 +index fd2cf20967..8f03743986 100644