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 7B76F4625C for ; Tue, 18 Feb 2025 13:40:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 77D7B402E5; Tue, 18 Feb 2025 13:40:08 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2049.outbound.protection.outlook.com [40.107.223.49]) by mails.dpdk.org (Postfix) with ESMTP id 8559B402A0 for ; Tue, 18 Feb 2025 13:40:07 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dyFjw4QjUUDhbpXUL/t+H2IIoj0SQX7Gj4yidwg9ty+3ltzcHYFCi5s5jN7XQXHnoirHDognjqvYfE8MaBvUMpKvxgW73PD028vNCMEb+rLkh/vWiuDmmcR/xqN31mOWhc+q0NWydSSuBKkfNceDkNaBOsmcMkeYcg24q78/1ip5uR52J9bGhiEpPG2LGHrphhmmtAlt+3so72knBRGjPvOxl53TF4xBaMwGO9pnOoVBgnxf/L6pH+58B5fwWKoCxnloOlArotJYqN6g47jwFM5GnmY38cnSPxbVN4bI3KGvyUALsTP59v1PLmVkNew0bmQ4mblyGTPuqkCzKIcFjw== 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=2kPwMqrW2vAWx7ZKsvfqdsYDBPtd9Me6KJb/yeIUBIc=; b=hcNIlSqEQYisK/MUDPuwAtj1ZRUsSHsyLLaOSbU8tcLNec0QsEh1MyvII/bLWDss/3uQ0ZvW2PGZnpvzymnGqE9piXlR4SaGQQGsklHwpW8uq37mYY0lOKi9w0XrKmxorhajU95iZj/2RbubI85ohtZFVzQ7A2HZMeT2nGmpWZPjqcxLZG645ZYv/5sMRIK/J+H3sCeXkA+uh7lMx9tZakiqnnTujxYNZHGf/vavibe6T8dxQUvYB4wOPsZUmNlz0WLg6/v+kI+k6v10tMsJ0aGbHrPBuH8LKHs0ooCfj0RMprfOuF/GTGqcRg/72aRSmo6CjHAi+JHwfy50NJQm9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=2kPwMqrW2vAWx7ZKsvfqdsYDBPtd9Me6KJb/yeIUBIc=; b=FmTTrSvSwB72eGUZtBOI1FZ9zXAXI7GCbAhtk2JO+YlCVhVIKGhh1TboI6BqQXl8XkQTc0Vq7uC4bXe6ms+XuGFyZPYPjF4+h8n4h22tHxqXokGNNhgj7eEHFryAy0AnRuyTjc16ZIajlKAolkzv1s3CdV1zk+4OnEJBNTbE7LsTa4GwSMwJ27BnO7fMUG876aoIBljsgzjhZFjNprs5QmTltwNTyNkRzovHlYXWLkZI8ftqczcgqfkMhOLpjHVkwvfb2UrbSkPTzj9yvGLRM5EYUH2ZVNDu1TmQlofTPBwMMlV3LrMWV8xY0N7PnW5FGo/VY/x4abYBL60negFAoA== Received: from BY1P220CA0011.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:59d::11) by LV3PR12MB9409.namprd12.prod.outlook.com (2603:10b6:408:21d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:40:02 +0000 Received: from SJ1PEPF00002324.namprd03.prod.outlook.com (2603:10b6:a03:59d:cafe::2e) by BY1P220CA0011.outlook.office365.com (2603:10b6:a03:59d::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.14 via Frontend Transport; Tue, 18 Feb 2025 12:40:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF00002324.mail.protection.outlook.com (10.167.242.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:40:01 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:39:49 -0800 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; Tue, 18 Feb 2025 04:39:47 -0800 From: Xueming Li To: Maayan Kashani CC: , Dariusz Sosnowski , "dpdk stable" Subject: patch 'net/mlx5: adjust actions per rule limitation' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:37 +0800 Message-ID: <20250218123523.36836-43-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-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: SJ1PEPF00002324:EE_|LV3PR12MB9409:EE_ X-MS-Office365-Filtering-Correlation-Id: e2f39bdf-6675-4a9b-7119-08dd50195ca5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|1800799024|36860700013|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vWj7GZ8Y28ywa3DCCtxQbkiiLoc4tnQNwP6bJb2KBCLTccjjz/+vRYNMi3TQ?= =?us-ascii?Q?tymJDD7c97EWKKu3wVGaS6CAM1gikYfesFl2Gh3Cd7g1NrwIvUUdE0ydCOFk?= =?us-ascii?Q?AhMpjmHfznUe9LfEHtDnVIpX/heirq7vYHzXlL4VwrkaBxXoBVk/0ID1khaZ?= =?us-ascii?Q?UJzVqg0jOBoBqU1jH+hMI2Y+zRR7RebRJrLsICIFDnk/flQ9HoejV0XwdZhg?= =?us-ascii?Q?sDv9lSk8f+6Y5Z8uG059lSyrwIbFzkrEtBV0Ra27uGYtwYvoFv7X7dFxPOae?= =?us-ascii?Q?p2lBDoh046jl6IncHN7AzWnLuJbLKYeMrth0hBhyOmCpmrHQnlAp6joBD9Rr?= =?us-ascii?Q?GdaG6e/GhjVgcJhM7LfSGr7wedMz7bLXrHrr1ULqJ0EBjU+qx4fr4Kvp3Pbx?= =?us-ascii?Q?r/f8jk6kPAG492VWmfRCsZp0zDOVb8+phv+oNNnp+dZyCwVMwRnkLQyv9imW?= =?us-ascii?Q?fGlp8G6c8fQamW+z5YTkGx6CLTSW+DoLCzI2neWRaPCequ+awUyWcXfzt5EV?= =?us-ascii?Q?dsS/I00TTXSC4md4oTOoyb1lJ1aiBMtBm9njTrsd1NX1O1FTF3y/7W0rTGS5?= =?us-ascii?Q?Fkg/wJaPr7TasA0kRU2EnZa9ajpxyN93VSHr5nZlIfLOuTUmRcs/V4PgWETO?= =?us-ascii?Q?7wZnMEFKt+azxti1IMON+hTfYqIbFgXHALWoZoowGRz7jEnPjfIvxiLZtLAS?= =?us-ascii?Q?nM4Win4XrkDZHUvaW1M4glu2jQmhTBmJdjfmxb1sx9zPb+ua0xjH06OFZDG3?= =?us-ascii?Q?xfwvio3USEzvYhzjCeCnr1lC9aEeQ9LSwAh9cYFFzLaHLDfAYcx97Cj1LgRW?= =?us-ascii?Q?xp2IFUShtQfkpa7wJsKijBb1KPe0bi4r34aFjU+euhYpeS4QdgZo7ZgjyykK?= =?us-ascii?Q?/WbmqscnaOxtmAj+QfiPHLwn63uOf3nssg4QY//KfX+EVOpj6gNhI08PI62K?= =?us-ascii?Q?rU4AU2us5Xap+E3s34d1PHtnhusJ1c4ib2r4nHJeHfqdzyFQov5Ua/rA0dB1?= =?us-ascii?Q?EV3ZgvY9k0bTIqHjYXZ8Q2RbetNY0SmL97HU3Avzs6ipbMF41lfyxChUpT+M?= =?us-ascii?Q?ZRK6w4Hv7vo60m4/Ag+UzxD7ZsJySMeGdcIF1PLGiT/CETChVF39zHkNtZzA?= =?us-ascii?Q?pAqxTTm4OY2hEQZrp6TguzPGhychXQ2fNziIBLTlkb70pPsGa9t7G12EDF7a?= =?us-ascii?Q?liPjVw03aiOV8mI6zeTCl7t2uNsIBSm2pJZ7vZiE79GjI0BvMHKbKYKybisx?= =?us-ascii?Q?oM5xas2sROA8soE3ftiBluxyn+vHzRGqi413kxEQaBTyRzD/BkkdQtsYPHGT?= =?us-ascii?Q?A4lWUzvVZWhjE6n6sBKyuIO/oBBTfSicoHtzEe9szIStya25bg3tl5AKOqoP?= =?us-ascii?Q?heeTbLVd3+5hvYscjVqn+h3hQmpIfmL78voLHWWJZD2JEgDbFqfgqpkye3m4?= =?us-ascii?Q?ax3fI7c3SxIXnSPF/f2Cnc2rfoDdTCd86sX3400pQnfQ13H7iP+R76Zk9RAX?= =?us-ascii?Q?l1sMPM+MraKwKL8=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:40:01.4916 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e2f39bdf-6675-4a9b-7119-08dd50195ca5 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00002324.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9409 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=191a7d7a4979262752fb5213c9027de86a34f36a Thanks. Xueming Li --- >From 191a7d7a4979262752fb5213c9027de86a34f36a Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Tue, 28 Jan 2025 09:54:03 +0200 Subject: [PATCH] net/mlx5: adjust actions per rule limitation Cc: Xueming Li [ upstream commit ab54e17fe2f5207d7b988d568344570e156551ad ] HWS implementation added a limitation of 16 actions per rule, which was incompatible with SWS limitation of 32 actions per rule. Changing the hard coded limitation in PMD to 32. Fixes: f13fab23922b ("net/mlx5: add flow jump action") Signed-off-by: Maayan Kashani Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow.h | 2 +- drivers/net/mlx5/mlx5_flow_hw.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 01f0eab1fa..9d18a576ae 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1422,7 +1422,7 @@ struct mlx5_hw_modify_header_action { }; /* The maximum actions support in the flow. */ -#define MLX5_HW_MAX_ACTS 16 +#define MLX5_HW_MAX_ACTS 32 /* DR action set struct. */ struct mlx5_hw_actions { diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 3dc26d5a0b..54f264a03c 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -14,9 +14,6 @@ #if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H) #include "mlx5_hws_cnt.h" -/* The maximum actions support in the flow. */ -#define MLX5_HW_MAX_ACTS 16 - /* * The default ipool threshold value indicates which per_core_cache * value to set. -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:02.222995573 +0800 +++ 0042-net-mlx5-adjust-actions-per-rule-limitation.patch 2025-02-18 19:39:00.578244056 +0800 @@ -1 +1 @@ -From ab54e17fe2f5207d7b988d568344570e156551ad Mon Sep 17 00:00:00 2001 +From 191a7d7a4979262752fb5213c9027de86a34f36a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ab54e17fe2f5207d7b988d568344570e156551ad ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 93c2406abc..445c9cdb4b 100644 +index 01f0eab1fa..9d18a576ae 100644 @@ -25 +27 @@ -@@ -1583,7 +1583,7 @@ struct mlx5_hw_modify_header_action { +@@ -1422,7 +1422,7 @@ struct mlx5_hw_modify_header_action { @@ -35 +37 @@ -index 2b62711413..501bf33f94 100644 +index 3dc26d5a0b..54f264a03c 100644 @@ -38,3 +40,3 @@ -@@ -21,9 +21,6 @@ - /** Fast path async flow API functions. */ - static struct rte_flow_fp_ops mlx5_flow_hw_fp_ops; +@@ -14,9 +14,6 @@ + #if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H) + #include "mlx5_hws_cnt.h"