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 C500046C54 for ; Wed, 30 Jul 2025 16:59:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF16B402C3; Wed, 30 Jul 2025 16:59:15 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2069.outbound.protection.outlook.com [40.107.100.69]) by mails.dpdk.org (Postfix) with ESMTP id D9FD4402C3 for ; Wed, 30 Jul 2025 16:59:13 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OQ9YS8DK7BmOkVt0A+vUhFvNOoiLcmtPhzDr/KhWL+zqT1jRx+nHIMT0wYPLeGpybyFMEDiLIsUg8ErtDILU5Xebw7psbUIu4Kv0+efFv0lptD0yQAxq2zfqYVpomPgeEFp5oy2wGW8ItEh6FSJnXr10Vbopkxhq3YTeLGDrnbhLt+QeaBIEoermGA2UJmUFAY+mw1lZB17iasFuOX4ZZhVNomA6nQJxPtd/FOhw2EMIc3q6+D+9ZqkG+vv+6fg8b4M7MOU5l8nJbKhbzrhDCj4oJtPsMm1Llhr7NX747igsMOJ+kQoshogDc7+4aUiRllQrXeyLWVLvlT3YnAyOkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=LD1SQw0b6ZZxWdJZ7ygDxlXq8c3eygZ5bZ8Bm42p40c=; b=uIRZlKaCXZDB8Nfk0G/hiunWeh4p0nyl/NywpEum1xb+jedTdqCx/sSRk9m4ukzTOFhlsM9EcFLgWXzeTrVelgu7kNzFTGnwT7MFCds33NB7dBXbekLT74w7z9cbCakvPDL3r8PU3gxj01m7g0cNGIS80tWcdnjIA7hxwQUsDcmRov88EVHsdPGoP498RyMNrvvjcm6Xw2bGJ80ayXSq/aZ75NBVNHd3sfr+vIPfp3OF/2O0E3HKcb/cOeL5qzjqbtqrJnR9bNHAuqDhhsHdi8I1MxvMhA8BAg/5q3ijUW04gFNpdesoJIe/k6RR2wiUeqhqkITKZ8oKKBwYXX+5Ow== 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 (0) 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=LD1SQw0b6ZZxWdJZ7ygDxlXq8c3eygZ5bZ8Bm42p40c=; b=Ojsv3U3N0goq3wubloovFCe6ho6EbtH70m5y6nlXIOyq5ruZE4//+rblYm82FTLN4V1Ys/XK0gY4EgtVkfLPc9zZdZMFQaUmmHXL4MEDwHHhQp4cfEFRuuwzDS/Ctl9ZOCdIlNA4DouCNDdz4TcyIn65fwVpT+MxRFkUUzRQAzI+Qn9gTwOwlEypN2zX/ZldczxnVpf28Z+Vf8xF0DA9fQLq/568sqTgi5Vdck0spfKxMXnGEsJO0eqmdoDBL59CBjlpRzLKdJhWKX7locHpcx68cGPSbAc/Ca4arjSMbYI2tkhB6GSJ2NPp0fM4+AoTBA0z9Y3ixS63brMyU/DLSQ== Received: from SJ0PR13CA0064.namprd13.prod.outlook.com (2603:10b6:a03:2c4::9) by DM4PR12MB5963.namprd12.prod.outlook.com (2603:10b6:8:6a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.11; Wed, 30 Jul 2025 14:59:11 +0000 Received: from CO1PEPF000075F1.namprd03.prod.outlook.com (2603:10b6:a03:2c4:cafe::3f) by SJ0PR13CA0064.outlook.office365.com (2603:10b6:a03:2c4::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.11 via Frontend Transport; Wed, 30 Jul 2025 14:59:11 +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 CO1PEPF000075F1.mail.protection.outlook.com (10.167.249.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 14:59:10 +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.1544.14; Wed, 30 Jul 2025 07:58:48 -0700 Received: from nvidia.com (10.126.230.35) 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.1544.14; Wed, 30 Jul 2025 07:58:34 -0700 From: Xueming Li To: Bing Zhao CC: Xueming Li , Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix WQE size calculation for Tx queue' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 22:56:16 +0800 Message-ID: <20250730145633.245984-8-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730145633.245984-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730145633.245984-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] 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: CO1PEPF000075F1:EE_|DM4PR12MB5963:EE_ X-MS-Office365-Filtering-Correlation-Id: 35cede79-dbef-421c-d1ca-08ddcf79a42d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?asEUcr/lpU29Or03PW5vPTBvsKy13vzoLAJSRrSao22iPS0IMfbH2MHcAX3D?= =?us-ascii?Q?t1bte7sQMWGztcybEa8tEa8efe6HFfnCMvaktX5ie0tM6tm0BF8d7eO4w8m5?= =?us-ascii?Q?6e0BdpIRpKPX592haXVqbEDtzdi83P8q+5lEvKd7HTx/kdm731e0sdD8nM+N?= =?us-ascii?Q?gksVfH1ytulhuxLPxpZvpNSregi35a33zOmtl52IgALOHtvB5s5HY7/iXoRy?= =?us-ascii?Q?rwMKAjVqV3RCLi74d+qtmCWeEIls4pbXS4NXYvpqJItTzqmyUHXR8thnRSM9?= =?us-ascii?Q?b2GVS1ZpBtlGjYeAvRRY7rpq2IpmU3ZKbrtSp0k8i/0qPFHXNK84ktqmiGPT?= =?us-ascii?Q?YFePEKNHUR/5uRbuYxDYsUAnJcq/iYGOWjzZ+6VGrjtHOu1PQoHZ5OiMBQsC?= =?us-ascii?Q?HJpywsf/j/J32j4dviOxWhyX27l8spWLQuuxS+JYVFVeIrt19+0IN8TBo9LN?= =?us-ascii?Q?uUKkFwYcKl+ZXjdNpXqBXeXWE2u2uCA8Ksq/JUDjzHwqjctFexR3r55cvv8n?= =?us-ascii?Q?S5C/PNJ4ECb0uwRMakKfilC8n5W98WoF097AjTr/JR2/bN0/fBgbzGGLIMOY?= =?us-ascii?Q?7ecsLfGW31YmcUMWc/52FtJunqADciu1D8Ji8R3S52mqoQiPAA3speoD8fkd?= =?us-ascii?Q?d48ZKTPKaOmExrfS8x9ONGV0De/As3TKVovzvZ9Rja7xoZar1ljFvOFzkmoM?= =?us-ascii?Q?vGr6Cjq+/eHz2FY5j2BhGf5jUFOx196SG42qdmo41razJ4BGbO0dMDS1DH2/?= =?us-ascii?Q?xoU7ckkjuP/ZW0HR4RPNucoALevM0HEQbvImZEWGw622SpjP9rs66+YIAHdd?= =?us-ascii?Q?B67ARO4fN5gmVG0gq64I27rpyqZfNXtbkeoDcrrJMtnOoFEIEjlIw/Pkg7/U?= =?us-ascii?Q?sSMgzR9ykRpdN2bedAS1086OYLRdqQYQo+vO1i5tQmuaqYoQXPzRYa0DQQTf?= =?us-ascii?Q?RXysgnzxh9r8Dk+Io/Dj3WNuoyLamFq9IqvJQJ1eEYgYvlxgG7IvWGPT8mJ7?= =?us-ascii?Q?L25ZOKvtFf/RFtbDXK1J0RwkjrmV+e3QftHsqYot55kVai9TJKfPgqx0b0DA?= =?us-ascii?Q?yn5tSWKr0n/qSK+yPqmBlMe5lnRV9GkTjHaUmAcHrwZ5+ZyBt5CXLd1K6hkh?= =?us-ascii?Q?6phA4Q9c9dek/0MD4xxNIqzBDefglEcTv8H+sO39NwiHMrJVEHV/CVxBmd5D?= =?us-ascii?Q?2nxdjc6AGlL+OKwkUjhdXB9ms3j9bz+bO3dYYLS0wSTXuXklthhR9AyVV/rJ?= =?us-ascii?Q?ydpuWwNhtdCYvV20uSBiq/K6d+52Xz0QkJ1cC+dDXHT613QPgUqdI9X9F8pF?= =?us-ascii?Q?ELYABJkCEKy3fH+i5rHW4fGrp9IxiQ1KMMkO1kKzuQJhBjV22u8ce9MuZizf?= =?us-ascii?Q?+XWVnf2c7iOOatfILieKkF7AyiZNAUXI/t3sVFmXBfcDUq+CyvP+mHHD5GiC?= =?us-ascii?Q?2n/x4Wmxqw+Xmb9dfjzC7DxDxxhtM4W4iMFcnMu3OtfnHM/XXAHLy9mx2asg?= =?us-ascii?Q?cB/9rlxTI5T3bbu7AuFEcAqGuGFX3RAP+YSyX76y5gLW79fziX4xVYOEnQ?= =?us-ascii?Q?=3D=3D?= 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:(13230040)(376014)(82310400026)(1800799024)(36860700013)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 14:59:10.1131 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35cede79-dbef-421c-d1ca-08ddcf79a42d 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: CO1PEPF000075F1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5963 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 23.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/10/25. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=97595e70f80a6a2a2dab6209f8fda183907d62ea Thanks. Xueming Li --- >From 97595e70f80a6a2a2dab6209f8fda183907d62ea Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Fri, 27 Jun 2025 11:25:02 +0300 Subject: [PATCH] net/mlx5: fix WQE size calculation for Tx queue Cc: Xueming Li [ upstream commit 5c0c1a13c34aa57c6e18f9ba852a9b5807c58b72 ] The txq_calc_wqebb_cnt() should be consistent with the calculation in the function mlx5_txq_devx_obj_new(). Or when the input descriptor number is 512, the WQE size will be wrongly considered to be 30 when no max_inline_data is zero in some cases. The total number of WQE will be considered as 256 and that is incorrect. Adjusting the WQE size will solve the wrong calculation when the calculated WQE size is less than 64B. Fixes: 38b4b397a57d ("net/mlx5: add Tx configuration and setup") Cc: stable@dpdk.org Signed-off-by: Bing Zhao Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_txq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index 0905570f1a..1ddd360a64 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -707,6 +707,7 @@ txq_calc_wqebb_cnt(struct mlx5_txq_ctrl *txq_ctrl) MLX5_WSEG_SIZE - MLX5_ESEG_MIN_INLINE_SIZE + txq_ctrl->max_inline_data; + wqe_size = RTE_MAX(wqe_size, MLX5_WQE_SIZE); return rte_align32pow2(wqe_size * desc) / MLX5_WQE_SIZE; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 22:50:03.603404636 +0800 +++ 0007-net-mlx5-fix-WQE-size-calculation-for-Tx-queue.patch 2025-07-30 22:50:02.980749523 +0800 @@ -1 +1 @@ -From 5c0c1a13c34aa57c6e18f9ba852a9b5807c58b72 Mon Sep 17 00:00:00 2001 +From 97595e70f80a6a2a2dab6209f8fda183907d62ea Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5c0c1a13c34aa57c6e18f9ba852a9b5807c58b72 ] @@ -25 +28 @@ -index 5db12f5c64..8ee8108497 100644 +index 0905570f1a..1ddd360a64 100644 @@ -28 +31 @@ -@@ -709,6 +709,7 @@ txq_calc_wqebb_cnt(struct mlx5_txq_ctrl *txq_ctrl) +@@ -707,6 +707,7 @@ txq_calc_wqebb_cnt(struct mlx5_txq_ctrl *txq_ctrl)