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 B23CB46A63 for ; Thu, 26 Jun 2025 14:04:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AC45940287; Thu, 26 Jun 2025 14:04:02 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2071.outbound.protection.outlook.com [40.107.244.71]) by mails.dpdk.org (Postfix) with ESMTP id 9531D400D6 for ; Thu, 26 Jun 2025 14:04:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PjxeaOL+s8JQbkyKgsQooj0y7wAU9VzW0X/4fRVTvxQKQ9ADWMqn1a9aCaEgps3abYem7thnXwJbKztUx1ZOcWZVHT7QzRpbotyooIWK33Gl4prlhHs9ztwVLGpIuxJnmzBS34A1+fCueJP/K/k4byKu2sC3iWKu425/iPTGMWaExtgvVGr85UDtMUyNOx1P86JpOdnxl2C3prmN9iZITWg5NHPvMCgtOfCnyETRS11a+2nQ6LcKOCUnj073ef7wx2U+ugIr/8Lmrlle4YVePaO3ZQRoHE67F5Cm05dyd7NXbedlEfBSxMXA3HWMSRas95+X/auLPva1yOEDkd+Fhw== 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=JHv1RFvVvdkaDmsNjBKYM4ZP8UEWRYr2ONMsBnYNT5w=; b=eXKArhezoWg2l9UWzk4p2Tg7mYHPLWb8t13WafQnqb/+Nv7KTHPMnux6c7v6LHGBaaAaCGmv6xAx/jYAzq+GWOaDRI2lMhHiuThv/9GGHsHR55z4IJ5R2GzqygEhG0ufRJI29PX2klgIV9yP8CeXYyapIjmwI1mQVCM+b/aKnmt96jfEqqw4iz4RfNHYEP9zpUA4vqhj5G5vRl0zrzYLb9l9GNCsYI7iCJd2PU0216vuu6xladhX/CVlB3ZcZLy9LryiXCTknivBCu2w2TNs3nJW5dNPIVPhmCk8JoemjoACY7kA0ynQSZXWsiauN+tPYeUliP/R9Ry9mqPkjogsKg== 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=JHv1RFvVvdkaDmsNjBKYM4ZP8UEWRYr2ONMsBnYNT5w=; b=UEn32FLTUG35C71m1T5s2h+7SMmxQYftwYm/n+yxBsLbaln0Yl5goIa7U8eKn76G2nSxGoevbpXmX+SZvd/1NOz6S9pQBJOtsiLG2D4FpM2yKewSCdy2c5T/a/CfnGxR2maew0rEdLEIWiLonmNYE2NfaEb6vYY0mdIzemtlvpv7cA6tI+482qFuwLoXJ5kZD3ihym/GfDrKcnKzso4QIcFyjHNWYMvJb/PMN5WxydvU62W4VIcy7RYZb9Bdcnicq+SFjJ6QCZ6tj682sT6KIW6uBM2UYWyFT1qoS3rkoggjEqLyUDIui/Dg1/16Ux03JT8oyi4zMJv05oZVEE1g8Q== Received: from DS7PR03CA0261.namprd03.prod.outlook.com (2603:10b6:5:3b3::26) by DM4PR12MB7766.namprd12.prod.outlook.com (2603:10b6:8:101::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.29; Thu, 26 Jun 2025 12:03:58 +0000 Received: from CY4PEPF0000EE3E.namprd03.prod.outlook.com (2603:10b6:5:3b3:cafe::2f) by DS7PR03CA0261.outlook.office365.com (2603:10b6:5:3b3::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.21 via Frontend Transport; Thu, 26 Jun 2025 12:03:58 +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 CY4PEPF0000EE3E.mail.protection.outlook.com (10.167.242.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:03:57 +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.4; Thu, 26 Jun 2025 05:03:47 -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; Thu, 26 Jun 2025 05:03:45 -0700 From: Xueming Li To: Dariusz Sosnowski CC: Xueming Li , Bing Zhao , "dpdk stable" Subject: patch 'net/mlx5: fix header modify action on group 0' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:00:41 +0800 Message-ID: <20250626120145.27369-22-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3E:EE_|DM4PR12MB7766:EE_ X-MS-Office365-Filtering-Correlation-Id: 8caf1109-efbb-4145-4810-08ddb4a987e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?2+MI34RzDYldGUBax46SnCW/fhYM3dJV6eoN3PteSDQrpj5hwCavjeO6ONyP?= =?us-ascii?Q?bXj0e71M0lBWJQ1ach6WcKq8nTZ5cyhs2VvcoL7I+oBLq96kiXAhlF5nTTsF?= =?us-ascii?Q?S9C7dItjGacL122h3D6KhhoOzP9NHPQjihud2acN9VgDhT5oG4EzdCHDAl9H?= =?us-ascii?Q?r4g8BK/21aTC1wt4No/YJrzLjEF0qZu4HhTecFtCDL0mmaepRqop1QxYTx0I?= =?us-ascii?Q?qby29F+XaG1FXmgZ/6oPhA/8mPqNLTxPiCtsgWqe+Irjtbl89aAUn51Lxkzn?= =?us-ascii?Q?7zmva/LkrgKMER5oLD0wRwiBKvwmrM/gjSmkL8o0mRC6XK+VI/NidygB+jB7?= =?us-ascii?Q?KIqVrE8duQvAgiwV7ZDnS7AYPfZ517XzcvSRhEoOTh6h9J2ru/m3iLmOXqGX?= =?us-ascii?Q?J/Oh+NPUUFtzOvm/223di2uYSE0ztNnE4kMGi17JP6jmrieN+PRmLA4zM+0X?= =?us-ascii?Q?3GjBIxxr3FGfHywYBb6slOkjGoPgdc7lE2SH+Kcewj0uhDB1NCv9spUYFCoX?= =?us-ascii?Q?43TYs/IX4wFWqvO8byZGWdDG7pDHeHmu3jDZ5g7bYR19x2OMLBHJsQGkQCR2?= =?us-ascii?Q?+cp4eD+iNi1WYBbz1rNcj0pGwkoZm65XfTTPGy4iRNQ7r0/XgOVNrxKTcew+?= =?us-ascii?Q?gjdoCjekudAjZBKj0Zyl/plMIAugWiPIRWA8y/BwHp1AGhI9pPHs5xW3eztv?= =?us-ascii?Q?1g8U0Ve85K5TXTHsbYCothhmkpTx2Pen4gs5qk9hJ/x++Kv07FnMXWYwqIV6?= =?us-ascii?Q?B5wKevdW8xt323n4ypNh4VH7hAeBZwWFX9qY+BY+O+NZplSjMtEh6cKa+aF1?= =?us-ascii?Q?GMo4yEh4NOjWPUzuQscWpgf4rbxf3DNkbctjvCLMJENDZy7rp4zM4vxl2bbG?= =?us-ascii?Q?nBP88syzxcxZQkxI9sqeLRJQkHN8fP8GQaiz9RPJ2cIy0P7DBkHrbmOnVe54?= =?us-ascii?Q?jvTVHWCcYbr20bb1KGtxm+FgluFkfPcVfksXWAqlL1gr+vY8tPJUAXC/falL?= =?us-ascii?Q?MMsUIN9ElrO3mmvtRKnwoWDX5CJ1wqNoXc+tBDq3lNQ94/7yyc+QlNq2mW8g?= =?us-ascii?Q?kGbywFSavQCBNFpyrVM13Sqh1bLR6OSG6dwn9gjgSINoqJhUjRtp/XF9Ywby?= =?us-ascii?Q?S0TL6hxA8M5QOA4TXd5H12+CiRj82SwFQfz0a+BQ4+tPdqoDH/5X+mb/qhIc?= =?us-ascii?Q?YjenQBgFxGbNbAOLxa8v5Eu8ClbsZUjfUrMpxs69ySc0SqFWI1GM/47bfVfE?= =?us-ascii?Q?Nv9VNSK7xH6gyqcA5A59PWkZ0/fv/uP6fKiYlg57NHAuLSd8/Ozlrnb1VcT0?= =?us-ascii?Q?+dFG1/Yo96vYFIDScSOVYu7n7jbHhdauwNlwR8BtTsfYskJ+ERuaAqaFvL3G?= =?us-ascii?Q?B++29HgxCZ80Zc3PsXwG9FVAVEgzRWkmUPZerJZg/2mNwWoiX2/T0YPO53VY?= =?us-ascii?Q?DC7QVcu+EZASNwHfhC7LJgJhlsLq6ChtltyTzZLOGZQ35KAfec8Mazp19oOb?= =?us-ascii?Q?swTTlJZDi9h1i6xvvOhHyrHSEHlIsNNUUDXTGIffmFNSUgIUC9AlqDRCsw?= =?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)(1800799024)(376014)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:03:57.7972 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8caf1109-efbb-4145-4810-08ddb4a987e7 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: CY4PEPF0000EE3E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7766 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 06/28/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=5789022ac7b77a88a8805fff678cc2f572492956 Thanks. Xueming Li --- >From 5789022ac7b77a88a8805fff678cc2f572492956 Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Fri, 25 Apr 2025 21:32:57 +0200 Subject: [PATCH] net/mlx5: fix header modify action on group 0 Cc: Xueming Li [ upstream commit f1ebb26d0d9388b6df65d493b06ce3b55adfb893 ] HW modify header commands generated for multiple modify field flow actions, which modify/access the same packet fields do not have to be separated by NOPs when used on group 0. This is because: - On group > 0, HW uses Modify Header Pattern objects which require NOP explicitly. - On group 0, modify field action is implemented using Modify Header Context object managed by FW. FW inserts requires NOPs internally. mlx5 PMD inserted NOP always, which caused flow/table creation failures on group 0 flow rules. This patch addresses that. Fixes: 0f4aa72b99da ("net/mlx5: support flow modify field with HWS") Signed-off-by: Dariusz Sosnowski Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow_hw.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index c53d407746..fac6c51f90 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -1105,7 +1105,8 @@ flow_hw_action_modify_field_is_shared(const struct rte_flow_action *action, static __rte_always_inline bool flow_hw_should_insert_nop(const struct mlx5_hw_modify_header_action *mhdr, - const struct mlx5_modification_cmd *cmd) + const struct mlx5_modification_cmd *cmd, + const struct rte_flow_attr *attr) { struct mlx5_modification_cmd last_cmd = { { 0 } }; struct mlx5_modification_cmd new_cmd = { { 0 } }; @@ -1113,6 +1114,15 @@ flow_hw_should_insert_nop(const struct mlx5_hw_modify_header_action *mhdr, unsigned int last_type; bool should_insert = false; + /* + * Modify header action list does not require NOPs in root table, + * because different type of underlying object is used: + * - in root table - MODIFY_HEADER_CONTEXT (does not require NOPs), + * - in non-root - either inline modify action or based on Modify Header Pattern + * (which requires NOPs). + */ + if (attr->group == 0) + return false; if (cmds_num == 0) return false; last_cmd = *(&mhdr->mhdr_cmds[cmds_num - 1]); @@ -1188,7 +1198,8 @@ flow_hw_mhdr_cmd_append(struct mlx5_hw_modify_header_action *mhdr, static __rte_always_inline int flow_hw_converted_mhdr_cmds_append(struct mlx5_hw_modify_header_action *mhdr, - struct mlx5_flow_dv_modify_hdr_resource *resource) + struct mlx5_flow_dv_modify_hdr_resource *resource, + const struct rte_flow_attr *attr) { uint32_t idx; int ret; @@ -1196,7 +1207,7 @@ flow_hw_converted_mhdr_cmds_append(struct mlx5_hw_modify_header_action *mhdr, for (idx = 0; idx < resource->actions_num; ++idx) { struct mlx5_modification_cmd *src = &resource->actions[idx]; - if (flow_hw_should_insert_nop(mhdr, src)) { + if (flow_hw_should_insert_nop(mhdr, src, attr)) { ret = flow_hw_mhdr_cmd_nop_append(mhdr); if (ret) return ret; @@ -1312,14 +1323,14 @@ flow_hw_modify_field_compile(struct rte_eth_dev *dev, * This NOP command will not be a part of action's command range used to update commands * on rule creation. */ - if (flow_hw_should_insert_nop(mhdr, &resource->actions[0])) { + if (flow_hw_should_insert_nop(mhdr, &resource->actions[0], attr)) { ret = flow_hw_mhdr_cmd_nop_append(mhdr); if (ret) return rte_flow_error_set(error, ret, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "too many modify field operations specified"); } cmds_start = mhdr->mhdr_cmds_num; - ret = flow_hw_converted_mhdr_cmds_append(mhdr, resource); + ret = flow_hw_converted_mhdr_cmds_append(mhdr, resource, attr); if (ret) return rte_flow_error_set(error, ret, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "too many modify field operations specified"); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:18.707953789 +0800 +++ 0021-net-mlx5-fix-header-modify-action-on-group-0.patch 2025-06-26 19:59:17.246418050 +0800 @@ -1 +1 @@ -From f1ebb26d0d9388b6df65d493b06ce3b55adfb893 Mon Sep 17 00:00:00 2001 +From 5789022ac7b77a88a8805fff678cc2f572492956 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit f1ebb26d0d9388b6df65d493b06ce3b55adfb893 ] @@ -22 +24,0 @@ -Cc: stable@dpdk.org @@ -31 +33 @@ -index 2f7b769aec..cbe6bd3ef9 100644 +index c53d407746..fac6c51f90 100644 @@ -34 +36 @@ -@@ -1422,7 +1422,8 @@ flow_hw_action_modify_field_is_shared(const struct rte_flow_action *action, +@@ -1105,7 +1105,8 @@ flow_hw_action_modify_field_is_shared(const struct rte_flow_action *action, @@ -44 +46 @@ -@@ -1430,6 +1431,15 @@ flow_hw_should_insert_nop(const struct mlx5_hw_modify_header_action *mhdr, +@@ -1113,6 +1114,15 @@ flow_hw_should_insert_nop(const struct mlx5_hw_modify_header_action *mhdr, @@ -60 +62 @@ -@@ -1508,7 +1518,8 @@ flow_hw_mhdr_cmd_append(struct mlx5_hw_modify_header_action *mhdr, +@@ -1188,7 +1198,8 @@ flow_hw_mhdr_cmd_append(struct mlx5_hw_modify_header_action *mhdr, @@ -70 +72 @@ -@@ -1516,7 +1527,7 @@ flow_hw_converted_mhdr_cmds_append(struct mlx5_hw_modify_header_action *mhdr, +@@ -1196,7 +1207,7 @@ flow_hw_converted_mhdr_cmds_append(struct mlx5_hw_modify_header_action *mhdr, @@ -79 +81 @@ -@@ -1639,14 +1650,14 @@ flow_hw_modify_field_compile(struct rte_eth_dev *dev, +@@ -1312,14 +1323,14 @@ flow_hw_modify_field_compile(struct rte_eth_dev *dev,