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 799A7428F8 for ; Sun, 9 Apr 2023 17:37:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7397E410EF; Sun, 9 Apr 2023 17:37:14 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2067.outbound.protection.outlook.com [40.107.94.67]) by mails.dpdk.org (Postfix) with ESMTP id B051E40141 for ; Sun, 9 Apr 2023 17:37:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HMe0oLP67L16zTzhBZti+nM+ZKbW2YFwidIYXXgyWIANXgcYhhKeRw6RO84K5I3Qzn8HGYz6CiVempCdceLkA0/IfG5bv9b6jJXBzXwvys01CFqcdXWRKol/d9cbR5flY1GEd9NW8L8WPCANTgZvt15yxWpbxHhzEJI9bRFA26MuaoKHskRnbcpm/raQBFkYQn39BfP7yUwqHSz5NJ8YPlhBL445V58yxcL9cv+J+tPbFV6yY4fu+vQ7Uq4alTUyasWZkpQEvZfT4MAod5Yv9zvP68kKrq9n1fXQvPwu2EY2djAagWxhTYkgM/h2Rno6uxssRaG1ub7HqxP5UA6IIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ssqPeIBz1oxNYg+l3HCq20tK5OEGqi2AOxL+ZFB6Xgg=; b=NupqltbWqRmgrlZtPArRXxSwdreSgdXtiDSvFhD2tzs558QYx1qQPOgUkEpMtzEyvll7+cCs+ymXiGgB+yi6+WOJrf6ROyxD6rgpBIABUBwv+G1HJX1l2B1UbXwOAWa3BMC6rRrythg+Gb8IIvzenoRSFKi7ug2FScQmYd1Wm6s0gtlIwSPeI7nAePZUFL+y/fZl0CEqEVMdjPRUE5Xl27g0Zo8NK34RgQ+bWpqlPQFC+7QJ7jYJgCEFokjG5ZmDT7pN7GEPXwd+/Ff+EZN5A9wTnYlmw6dj8Al+73XwbuTRKfR0qrU+cGeTxpZA0U9+FO0oEg3hUNwwbWk6+tVhEg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ssqPeIBz1oxNYg+l3HCq20tK5OEGqi2AOxL+ZFB6Xgg=; b=tEEMBsJsRFyw7vgoAO1VX/ZEjiY/4M+IPFnNRldcn1HMw7zHnm+XJHtYonFN5u/hjSZCPJ55YDN1gk46eZeuqzs2VBAfU2d5dby+v1ZrvXpDEaqEOO3n9nVSakTbNPnKsd2iHSl+S5wkdOYejlSh/IV2NgDolD3Tbp7AIUcEliKRR31tWFzXVYTomlWtk0uN3OT7KZN6BF7z/2nn8CFRr5qTsFMI8VFbg3XUkZVLDyW/Fcjq98qmRbCNPkhuV8Jf9jLDiV5NVTiM/uFM6MSRFkFVazNb38m7Blfyfq9aY8q4sYQ46jztL1HFoyegxMy7dLZxWGnc8P8EbDlzFDvepQ== Received: from BN1PR14CA0010.namprd14.prod.outlook.com (2603:10b6:408:e3::15) by DM4PR12MB5817.namprd12.prod.outlook.com (2603:10b6:8:60::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Sun, 9 Apr 2023 15:37:09 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e3:cafe::fc) by BN1PR14CA0010.outlook.office365.com (2603:10b6:408:e3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.39 via Frontend Transport; Sun, 9 Apr 2023 15:37:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.20 via Frontend Transport; Sun, 9 Apr 2023 15:37:09 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:36:57 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 9 Apr 2023 08:36:56 -0700 From: Xueming Li To: Alexander Kozyrev CC: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix CQE dump for Tx' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:25:20 +0800 Message-ID: <20230409152529.5308-133-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT031:EE_|DM4PR12MB5817:EE_ X-MS-Office365-Filtering-Correlation-Id: 775d4bcf-43d5-46c0-1773-08db39104817 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8W4B1r5QTGa+yRPD/WsxCYdJZwM/hNwXRSnFkHxO2ZlJQ28MYxKzeKVScPxr/hrUq6nAbpJstMuJWXfT4juLo7QUP/uDJwiqkMG7noSjbQ7O2L9LVpP98lQVkCC5rgm9yQIf2uV6QUtIjey7x2wuqN0P54z1SRg12AVRZl1c6ylTWb+U68FTtbYjno9eQQJ1JCy3FWKjJ6LQyKeL4yTz3W0Vc/+jpp2ydpmNovX3luUyRlP++Y8/qwV/LBxf5bvBdsaqthdbt1rP30y0GsQpLWHo+CaeYo8xa9uYkO3d/dBbysVQ1hoEzbgB5WRD8qioT9N467+86NYz+5T0Tf5lcasFloqi+Jp/8fjX0kf5zXqelPExN/ySTxgTeo9o4C1vPSziB5LpIXh2JuaGUSKTQkb6uV5JtzgqC9uLvLEh//mn4O0uqMgmzMXflTYWF+i9aNsIujYoG95kF91p5nlx5PwOPhuExvTsR5qAMVxr6kfqlEZclfl4S4AKEYKPYxBCuBThlRW/PUqj+IPS5dNKEtRCUp+SjTko+kZvAJeUlo29hLIFasQ7GVhjLZwpd9yD1ekjqBafD+qa99UfYCwnJdzxq/IaRLvhHzT+d3LLwOfeXofmFRXcmfOZmoUJHkK4UTXXOscWnj5VcXyAJxMfaWDnj8V3zme+HlTzsg4PizoB3lmhdKebNiY9aT0RxEp+cuBVMbySawxmxO8EdjMf9iSduG1PEop1j4Z/Ryx+CCE7W2OdMO67s2PawrM4wTz5QkGf/L7qZ86/s86FY3DbB04kjH1OPkFguPQBW+BWB+O/FAdDWr9/T99DU31zU3WshCETi5iRyPjwqCBS6+Z5zw== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(396003)(376002)(39860400002)(136003)(451199021)(46966006)(40470700004)(36840700001)(36756003)(40460700003)(82310400005)(2906002)(5660300002)(8936002)(8676002)(6862004)(55016003)(40480700001)(86362001)(966005)(6666004)(7696005)(1076003)(26005)(54906003)(6636002)(36860700001)(478600001)(2616005)(47076005)(83380400001)(336012)(426003)(6286002)(186003)(16526019)(53546011)(70586007)(70206006)(82740400003)(356005)(7636003)(41300700001)(4326008)(316002)(37006003)(19627235002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:37:09.2758 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 775d4bcf-43d5-46c0-1773-08db39104817 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5817 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 22.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/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/80ec04827faa12d2a5c2dfb0405669b9544dfde5 Thanks. Xueming Li --- >From 80ec04827faa12d2a5c2dfb0405669b9544dfde5 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 Cc: Xueming Li [ 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 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, 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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:42.137999700 +0800 +++ 0132-net-mlx5-fix-CQE-dump-for-Tx.patch 2023-04-09 21:45:38.809042200 +0800 @@ -1 +1 @@ -From cd4158177434d557742b4bb0fbe68e59d2c2db21 Mon Sep 17 00:00:00 2001 +From 80ec04827faa12d2a5c2dfb0405669b9544dfde5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit cd4158177434d557742b4bb0fbe68e59d2c2db21 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org