From patchwork Mon Feb 26 13:45:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 137226 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 451A943BED; Mon, 26 Feb 2024 14:46:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3276442E62; Mon, 26 Feb 2024 14:46:31 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2073.outbound.protection.outlook.com [40.107.243.73]) by mails.dpdk.org (Postfix) with ESMTP id 8F8C542E50 for ; Mon, 26 Feb 2024 14:46:28 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XD93hWyLOLj40+zsSPg5yiut0pmuSxTYdLUdus8sdAM6ys6Blc8gF8cNH6+2t6BN9qEaH5CHXuXGYzXFhkWXKrsp9cPpYyj7IScm83WNE/t6eSaehdFzfYxO3AMqudvv5GGYVyaEVFQfsLlN3EDRuX7cyIYjHLSXRP2wJOypc6ZDXIi+wb6skEvsluYznj/R6ZsmI3Lg9zkxoxh0AmkNzAKVNVXqyra2ZT92y7+06/AE1G/CXvZF4iK/OQV/P+IgAX9CJNzULs/TkL1qB8RYHGMRpj+YYQgpkDSzNnfarIQ4sobJ9miR3Z3+y+mvPk4I84Yx0bWpk6Pj2sAxNic1cg== 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=ru8nfI0O5omW7xIMk+6BKLnMfTXzbwO9hK8kSvH4YUQ=; b=KwGxumMYszEczbhUQwO3vQaxDMfYD1nrJlhciHu8U2HO/0quVAF/H5ZGoxXkKSR4BTX89c5Gkgjn/HusdBwBD14jpJNPF/s/l01gIxqkAgMu71Ns6Oa34bGYoAAciSk/bKYqjn46prqPz8UTsGx602ZaNlt4+hdPZb8bJ8+87u4a2MDRKGKS60a8YFnJ0rY/5uCEoYpuS9H3/kxkv+L6NqL5g7aK2dih9cCie4svazipfrg0iYTekmzNt4GXa8VKWUDH1RkpAktTZGxQlY6js8+PQ+OBAYf6uubS/LUMJfAqqCII1AJChNeZ17tLlnmjiI8vDt7RJeSz9jVNgeh+0g== 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=ru8nfI0O5omW7xIMk+6BKLnMfTXzbwO9hK8kSvH4YUQ=; b=n/AZujiSyaDTk/AyG2qJxEYXCJONfV6r11/nPmvKpqWkBLR7YX4Q7acxHcgCqDy6ClA5UtKniValX3sf3tUTUav2a1ZS5Lp/ai/HG+YVFv9L0GbqZKpG55DaaXFRKrmxc/jpqWX55nZuu+XnKwfksUISCBhE2/SWIszsRYaVO8w0I50IJgIBJH8jEXLDOlZ16/aVtXWJ+S7LiwchTFwrPqxX2Yen3xm0p+8g2RaRh1xv5I+vf8pFutix1l+KoFHfpEcnDFZ+iCsXDrdVUnAYumnf850TwK+4iLTDf0ymWBp6qrmmHAre8+eKNpZpeio7IcRdBtcVfAKDNDQ7Svra3Q== Received: from CH2PR08CA0018.namprd08.prod.outlook.com (2603:10b6:610:5a::28) by CH0PR12MB5266.namprd12.prod.outlook.com (2603:10b6:610:d1::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.34; Mon, 26 Feb 2024 13:46:22 +0000 Received: from DS2PEPF00003442.namprd04.prod.outlook.com (2603:10b6:610:5a:cafe::4c) by CH2PR08CA0018.outlook.office365.com (2603:10b6:610:5a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.49 via Frontend Transport; Mon, 26 Feb 2024 13:46:22 +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 DS2PEPF00003442.mail.protection.outlook.com (10.167.17.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Mon, 26 Feb 2024 13:46:22 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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.986.41; Mon, 26 Feb 2024 05:46:08 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Mon, 26 Feb 2024 05:46:07 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12 via Frontend Transport; Mon, 26 Feb 2024 05:46:05 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v3 1/7] common/mlx5: remove enum value duplication Date: Mon, 26 Feb 2024 15:45:50 +0200 Message-ID: <20240226134556.2985054-2-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240226134556.2985054-1-michaelba@nvidia.com> References: <20240207155533.1582031-1-michaelba@nvidia.com> <20240226134556.2985054-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003442:EE_|CH0PR12MB5266:EE_ X-MS-Office365-Filtering-Correlation-Id: 4bb34a0f-c8d9-4723-7c1e-08dc36d15197 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3AEmehoxBUnAerHmwklMTE/WX1HS8y45iEsC5jQQVu4O7SvTStHs9ZfLu0LT7uZrRlpI3n3eZ6//SDCjqj+/zbgDVkm5gGaO9+eYlNPxfvhycyG/aj5uqkhi13e5ktPlM47ZktJfpPTQFnuJNO+NUQydcwU3B1OQcgOluwyPjOfx0KyfaTYyK6RC7FUaKl7PdWN5hEPd1hZAHhrgdxzOFmZT2oQFVoJ8C/IxWZvUrMACIVLuUeoYx5e+PMWpjeJMg0dE7zRU9GJvkEmAbFjvUYk38SLnhYfW6cprVB65h4IVra04yBQFtMDu7lhH1ciybeASjVoOJXRYUmcilwBIrkp+kz6KiMVjXSMh2Vi3tCdhL5KBrUr4zYmz8I8zYORCrgObiTxEji2VSYrILdQlJ0FAaqXthtMm9zsh9MfBnACwF4HuICIbHSLs2BCoM0kIaNrU758IAe2tmZdqCjky1s14+lulYufN3qmoGRoGfFGEC+2kesOY8a3svxnjKm/315YyHY9ARUKY9PF9yDedqZBKH1lyvgwqJlQ2wAFyhRY97uMJuNE3dTkC5B/Htj2SVE6p4Jbuupc4Fu44i0LW/t+/smp8DXQgCP03p9HVvsYB4MsIYHQoAy8ATvHTop4FKZlyGsVnBbNWErOUlIw6m3LPMX9RjMcXibeZvXzyNMWNEeQbxwYJgRIyEFG+6EWnGXKg681pMctk699xrfTTNeO3Ix/33jP+ujg9DdWv2RIIVLSU+pz8O96UnNnnmKvA 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:(13230031)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 13:46:22.2058 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4bb34a0f-c8d9-4723-7c1e-08dc36d15197 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: DS2PEPF00003442.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5266 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The "mlx5_modification_field" enumeration has 2 different fields representing the same value 0x4A. 1. "MLX5_MODI_OUT_IPV6_NEXT_HDR" - specific for IPv6. 2. "MLX5_MODI_OUT_IP_PROTOCOL" - for both IPv4 and IPv6. This patch removes "MLX5_MODI_OUT_IPV6_NEXT_HDR" and replaces all its usages with "MLX5_MODI_OUT_IP_PROTOCOL". Signed-off-by: Michael Baum Acked-by: Dariusz Sosnowski --- drivers/common/mlx5/mlx5_prm.h | 1 - drivers/net/mlx5/hws/mlx5dr_action.c | 4 ++-- drivers/net/mlx5/hws/mlx5dr_pat_arg.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 282e59e52c..6a8cb7a8aa 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -840,7 +840,6 @@ enum mlx5_modification_field { MLX5_MODI_IN_MPLS_LABEL_3, MLX5_MODI_IN_MPLS_LABEL_4, MLX5_MODI_OUT_IP_PROTOCOL = 0x4A, - MLX5_MODI_OUT_IPV6_NEXT_HDR = 0x4A, MLX5_MODI_META_REG_C_8 = 0x8F, MLX5_MODI_META_REG_C_9 = 0x90, MLX5_MODI_META_REG_C_10 = 0x91, diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c b/drivers/net/mlx5/hws/mlx5dr_action.c index f55069c675..631763dee0 100644 --- a/drivers/net/mlx5/hws/mlx5dr_action.c +++ b/drivers/net/mlx5/hws/mlx5dr_action.c @@ -2291,7 +2291,7 @@ mlx5dr_action_create_pop_ipv6_route_ext_mhdr3(struct mlx5dr_action *action) MLX5_SET(copy_action_in, cmd, length, 8); MLX5_SET(copy_action_in, cmd, src_offset, 24); MLX5_SET(copy_action_in, cmd, src_field, mod_id); - MLX5_SET(copy_action_in, cmd, dst_field, MLX5_MODI_OUT_IPV6_NEXT_HDR); + MLX5_SET(copy_action_in, cmd, dst_field, MLX5_MODI_OUT_IP_PROTOCOL); pattern.data = (__be64 *)cmd; pattern.sz = sizeof(cmd); @@ -2352,7 +2352,7 @@ mlx5dr_action_create_push_ipv6_route_ext_mhdr1(struct mlx5dr_action *action) /* Set ipv6.protocol to IPPROTO_ROUTING */ MLX5_SET(set_action_in, cmd, action_type, MLX5_MODIFICATION_TYPE_SET); MLX5_SET(set_action_in, cmd, length, 8); - MLX5_SET(set_action_in, cmd, field, MLX5_MODI_OUT_IPV6_NEXT_HDR); + MLX5_SET(set_action_in, cmd, field, MLX5_MODI_OUT_IP_PROTOCOL); MLX5_SET(set_action_in, cmd, data, IPPROTO_ROUTING); pattern.data = (__be64 *)cmd; diff --git a/drivers/net/mlx5/hws/mlx5dr_pat_arg.c b/drivers/net/mlx5/hws/mlx5dr_pat_arg.c index a949844d24..513549ff3c 100644 --- a/drivers/net/mlx5/hws/mlx5dr_pat_arg.c +++ b/drivers/net/mlx5/hws/mlx5dr_pat_arg.c @@ -67,7 +67,7 @@ bool mlx5dr_pat_require_reparse(__be64 *actions, uint16_t num_of_actions) /* Below fields can change packet structure require a reparse */ if (field == MLX5_MODI_OUT_ETHERTYPE || - field == MLX5_MODI_OUT_IPV6_NEXT_HDR) + field == MLX5_MODI_OUT_IP_PROTOCOL) return true; } From patchwork Mon Feb 26 13:45:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 137228 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8157943BED; Mon, 26 Feb 2024 14:46:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D24B242E88; Mon, 26 Feb 2024 14:46:39 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2074.outbound.protection.outlook.com [40.107.243.74]) by mails.dpdk.org (Postfix) with ESMTP id B78BB42E50 for ; Mon, 26 Feb 2024 14:46:31 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JzXF6V5qZe0HSjehrgtHpl/CdzkG3G0EsohMge6d9neWQHCpOXh/5oL5Ne+4FGj483dL8dCb4zHwXxaSRDgRXzHWBU8AUclqvHJ39GNooswCf8//guKmeNclEP6qLLz5y0CBccgxe3wtRtTAzpEoG7kQjDcnAf0Dwjeq8zdQ3yPZUec8nyQGkSlGF1rmng8I7Wk+QtS8WxUabnuEs6Zdha1gzTqXivZGzJAIN0p7JbEJLn/HmB1SJkK04g++UKftqfLXFzHiJzyYf8CjHQ/0MjJ4hnYtt38/1or5XACGSal9OOl2YwWlLljiRt1r5SoET+z4aoWZiqiguXpl+L6bzw== 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=Aoz3nCrpvsRYb/tvZM/wZgyeaXOB99kxn/CRSFW9pgw=; b=NqwY76cjL+vu8CYWYu42eq/WbM0F2WuyrBpk0KpWymdTSUafyQBAZ3A78apSKujCzoFFccH1VkF96Gs0iztRKL3iCYYiQlpR7r0FYbMTdK3VZyYzHpyeSkFJNem08jLwycmnGvpcWd4XWfE5bmTE65mDHkY5GBcJLw/MxL/McqLLvuO0h7wJWpFYlA6qc85qEo0uf5iANGZr4yqH1qeDfKtG7LnRq+UjzVkJ+Pv664J6VrrWL6FbPSwVStwzvoHL98io7HSGUKEjGJhQTGrPond58wOw08OmLYaii0VmojIwVtb4o5FvdEEJ2u2bDEDtnK0tnF+JnjcpUaBOPckIPQ== 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=Aoz3nCrpvsRYb/tvZM/wZgyeaXOB99kxn/CRSFW9pgw=; b=P9H2KO9RIAg4ItFz2rXfudETwMII8+L0XKcvBd8x9MmT+dl86FlLex3buA3AS6l7HovasAAcjLWh+9eYul6wnEix1U+wLiZd1ExsTfFHXXuS21uZXhfjI6JUtMZP8m1YLHP8+SzCHwmxp2O7QBDFx3u9XNQao466Y6gQlV2s0Z8+5Un8hhdbZAHsSxO4arQwDkpQLfDYJp52SIK1Ihq0lPsOmQMr6r5x3mZakrCct0ZQTklESIe+Ymfaz3RQ+klHFxEq4Lts39FyZ0GHn30kenBUFpFlhOwdAdtNEthYhQ6uHLmxD4kWQKFXZahnbN6XYMrxY8dEWdFZE9Dn/35VcQ== Received: from BN9PR03CA0414.namprd03.prod.outlook.com (2603:10b6:408:111::29) by MN2PR12MB4142.namprd12.prod.outlook.com (2603:10b6:208:1dd::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.34; Mon, 26 Feb 2024 13:46:27 +0000 Received: from BN2PEPF000044A5.namprd04.prod.outlook.com (2603:10b6:408:111:cafe::6f) by BN9PR03CA0414.outlook.office365.com (2603:10b6:408:111::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.49 via Frontend Transport; Mon, 26 Feb 2024 13:46:27 +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 BN2PEPF000044A5.mail.protection.outlook.com (10.167.243.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Mon, 26 Feb 2024 13:46:27 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.41; Mon, 26 Feb 2024 05:46:10 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Mon, 26 Feb 2024 05:46:09 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12 via Frontend Transport; Mon, 26 Feb 2024 05:46:07 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v3 2/7] common/mlx5: reorder modification field PRM list Date: Mon, 26 Feb 2024 15:45:51 +0200 Message-ID: <20240226134556.2985054-3-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240226134556.2985054-1-michaelba@nvidia.com> References: <20240207155533.1582031-1-michaelba@nvidia.com> <20240226134556.2985054-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044A5:EE_|MN2PR12MB4142:EE_ X-MS-Office365-Filtering-Correlation-Id: 4bc61f8e-e753-4e40-3c04-08dc36d154c0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R+XtS+3l01ZCmktv/+tp6P91syn/x0is8DrN1wx/tSLaa2vknk12eiFW5i7HYLDHLxQ/50kLRU+5PRsRayoKfBd+iVQPcT918BcsxoOdVjAR8ZKAzR8XzXujpRsudpsGMMrjK6YU17qaCk4SBPhMheGD2DTJyGYn4lZOks4NIQCTpzUDkkiLva/F9xugBg7/UIF6+DmlQNH3PfwWN5O0Zf+AUEm0rSu+ZkhgEXD770zUvYsFPXMGviDxOq3InxDMrn0kCx4169m3PWWQUol1ZnZRrt1o0vCPIZfSmvW+8tt8sPhJm5iAG0wsRcsEvvJyVuZm68+/gI233pgEvcYVJCbqjT5f2a1SWhpSdimVapdLTZBcNVQOef4ZpQ+u/bt1nAu5M5Qb9sG+YUT719bhBhAU1QqW+b7b1IGCGsWr60JuskPo5hJ+rrPsNYwPgQrCBOAVhDgAjhMgL2L3Ght1K9L7eIS6clubcuaysoK9F1fhfpoQTitKd5I+GHsLoDJqWaGuUXtgCKcnQ3u+t/oVB+ifeyT0N3Qt1VFldq9Jv12ffYRTEqISQ6XzlYGrTiYQtox/8g2chKp2/Jz19DGiFGWzyw1NnuByJx3RBqIPYG9OyKapOBneJps5ck1GcvfCIpWLHdSMWmDa5xFHoA4tfMtJiKPAOl8c5x5BUaZTdC0yUy3OrVFXVuJf6X8FXRwllfe2/6qdAPBycEGCHu0+kWq14mQK9DDZLV62d5w6eSuB0l1NS2V0iYB/fcxmGK6j 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:(13230031)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 13:46:27.5216 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4bc61f8e-e753-4e40-3c04-08dc36d154c0 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: BN2PEPF000044A5.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4142 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Reorder modification field PRM list according to values from lowest to highest. This patch also removes value specification from all fields which their value is one more than previous one. Signed-off-by: Michael Baum Acked-by: Dariusz Sosnowski --- drivers/common/mlx5/mlx5_prm.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 6a8cb7a8aa..6967acbdc3 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -816,6 +816,7 @@ enum mlx5_modification_field { MLX5_MODI_OUT_IPV6_HOPLIMIT, MLX5_MODI_IN_IPV6_HOPLIMIT, MLX5_MODI_META_DATA_REG_A, + MLX5_MODI_OUT_IP_PROTOCOL, MLX5_MODI_META_DATA_REG_B = 0x50, MLX5_MODI_META_REG_C_0, MLX5_MODI_META_REG_C_1, @@ -829,32 +830,31 @@ enum mlx5_modification_field { MLX5_MODI_IN_TCP_SEQ_NUM, MLX5_MODI_OUT_TCP_ACK_NUM, MLX5_MODI_IN_TCP_ACK_NUM = 0x5C, + MLX5_MODI_OUT_ESP_SPI = 0x5E, MLX5_MODI_GTP_TEID = 0x6E, MLX5_MODI_OUT_IP_ECN = 0x73, MLX5_MODI_TUNNEL_HDR_DW_1 = 0x75, - MLX5_MODI_GTPU_FIRST_EXT_DW_0 = 0x76, + MLX5_MODI_GTPU_FIRST_EXT_DW_0, MLX5_MODI_HASH_RESULT = 0x81, + MLX5_MODI_OUT_ESP_SEQ_NUM, MLX5_MODI_IN_MPLS_LABEL_0 = 0x8a, MLX5_MODI_IN_MPLS_LABEL_1, MLX5_MODI_IN_MPLS_LABEL_2, MLX5_MODI_IN_MPLS_LABEL_3, MLX5_MODI_IN_MPLS_LABEL_4, - MLX5_MODI_OUT_IP_PROTOCOL = 0x4A, - MLX5_MODI_META_REG_C_8 = 0x8F, - MLX5_MODI_META_REG_C_9 = 0x90, - MLX5_MODI_META_REG_C_10 = 0x91, - MLX5_MODI_META_REG_C_11 = 0x92, - MLX5_MODI_META_REG_C_12 = 0x93, - MLX5_MODI_META_REG_C_13 = 0x94, - MLX5_MODI_META_REG_C_14 = 0x95, - MLX5_MODI_META_REG_C_15 = 0x96, + MLX5_MODI_META_REG_C_8, + MLX5_MODI_META_REG_C_9, + MLX5_MODI_META_REG_C_10, + MLX5_MODI_META_REG_C_11, + MLX5_MODI_META_REG_C_12, + MLX5_MODI_META_REG_C_13, + MLX5_MODI_META_REG_C_14, + MLX5_MODI_META_REG_C_15, MLX5_MODI_OUT_IPV6_TRAFFIC_CLASS = 0x11C, - MLX5_MODI_OUT_IPV4_TOTAL_LEN = 0x11D, - MLX5_MODI_OUT_IPV6_PAYLOAD_LEN = 0x11E, - MLX5_MODI_OUT_IPV4_IHL = 0x11F, - MLX5_MODI_OUT_TCP_DATA_OFFSET = 0x120, - MLX5_MODI_OUT_ESP_SPI = 0x5E, - MLX5_MODI_OUT_ESP_SEQ_NUM = 0x82, + MLX5_MODI_OUT_IPV4_TOTAL_LEN, + MLX5_MODI_OUT_IPV6_PAYLOAD_LEN, + MLX5_MODI_OUT_IPV4_IHL, + MLX5_MODI_OUT_TCP_DATA_OFFSET, MLX5_MODI_OUT_IPSEC_NEXT_HDR = 0x126, MLX5_MODI_INVALID = INT_MAX, }; From patchwork Mon Feb 26 13:45:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 137227 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6F17543BED; Mon, 26 Feb 2024 14:46:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5919E42E75; Mon, 26 Feb 2024 14:46:38 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2049.outbound.protection.outlook.com [40.107.93.49]) by mails.dpdk.org (Postfix) with ESMTP id ACE4042E51 for ; Mon, 26 Feb 2024 14:46:29 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SUT0QS4URp2grDyvo90Tv5rrvr06kycR0s634ZT3yQGcsINMBXQSRELPA8grdBhJOHQ5ARSJ02wPMRTS7n8MavWwBgsTlHgKdx8ojHWinNGmPxKbv0o8lu6OKEpTk/nPNrlzMIpYzQWUKt6pK1AvEhRt/ZI8j1igKFuMHQjWIelAhX9m12D8sFIz7LN63rNdqtifHmYgPscHRAV3oQlyqeaf/L+lMC+aMd/XPxLqKbfW7XAuLobWToBqAJ45xJuIDL5ByNF3baZhAprn2DXGTS2RB2y4EWIgqyDueMi6ipokH/mLfr1Tt9PDEtbonStZ9oQzmxsjNSNB2T4FqQRJ+w== 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=nC1tMH4tcRloUo/yfgOFym6Umds0qfNkYwjdXMSId4I=; b=YdPhDo/E9nEqqBNfKbrp4mOiHa2nH6+i5GH1Of/jBM4S0p8V3AlBLL6PhdPrS6bQ5LqHgildAzO/czuPzBS53gld9v9hVzgfOLjIKhBXbLMZcvR5IYJJrwzbR6jnqStV8tVt7//i+EJUUrlHX6eYga7z/WxQcOpf1H/C8kQYgXbWDgx4yeCVLU9EgNu71h1QHYk2gnqohSQXA8s8o03n/U6JFsRXAKJ0TKpJNgSDeirRM4c2B/WW2i/fr2rJ3lwzCCO9hhcB7jLIcaCKLPNy29YcVlnGMBx0R+XXj0fPblbeN8sGNUmAy8Dyh3egxBB+n3oA9Nq38ZfJIobTDbsgAA== 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=nC1tMH4tcRloUo/yfgOFym6Umds0qfNkYwjdXMSId4I=; b=mh9j5DvQvcZP+DWF9eCdyAQ2ekFGfJalHM6sCs1bhSFCoO0O3Vzewzc74C845Y4geOtqOdNqxpOy/FXKjjvPlIBrO/ag47F0hjS6yXBu0O0W460r3Zvu3ZAxQQ01kotuo1I0y8WcEwg0/98yc24YnAfR6clKvbB6y8EwyziJz7SLVbaKubGh5xmgXjrigfZIoj85nq2MBZ8vY//TFXUZSsEqJ1wNjbpl+hVBtgML5SPF+2FUPK3xoXKnl6zer/7+3cQR9a1/UAS4EhQB3ocdKLYezCVvSRI71cbQg4RdlcQQt0NEEBduwL6szVy+kklEUjR9iggrbCpQTc0Sbdy8cg== Received: from CH0PR03CA0248.namprd03.prod.outlook.com (2603:10b6:610:e5::13) by SJ2PR12MB9240.namprd12.prod.outlook.com (2603:10b6:a03:563::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.33; Mon, 26 Feb 2024 13:46:27 +0000 Received: from DS2PEPF00003441.namprd04.prod.outlook.com (2603:10b6:610:e5:cafe::32) by CH0PR03CA0248.outlook.office365.com (2603:10b6:610:e5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.49 via Frontend Transport; Mon, 26 Feb 2024 13:46:27 +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 DS2PEPF00003441.mail.protection.outlook.com (10.167.17.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Mon, 26 Feb 2024 13:46:26 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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.986.41; Mon, 26 Feb 2024 05:46:12 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Mon, 26 Feb 2024 05:46:11 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12 via Frontend Transport; Mon, 26 Feb 2024 05:46:10 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v3 3/7] common/mlx5: add inner PRM fields Date: Mon, 26 Feb 2024 15:45:52 +0200 Message-ID: <20240226134556.2985054-4-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240226134556.2985054-1-michaelba@nvidia.com> References: <20240207155533.1582031-1-michaelba@nvidia.com> <20240226134556.2985054-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003441:EE_|SJ2PR12MB9240:EE_ X-MS-Office365-Filtering-Correlation-Id: 7073f011-3187-4d5b-49d4-08dc36d1544c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wkoc6KwFuUYJNOJru9658wRsuMQxm3g637kjiZ4+cqKIerWYT0tvi1GmQDPVrYW+pb2oDYPRY8GSnZUneox436rSvYK2LQ8J4JhdQr9EiKA+fYOEi8iR/xM+2ZU0dInE26LWboGRP7tZqHgA0PDMFCl+/RF5JRWe18wBF7nSEq6mqAIX4E4Mfc4IxOx7YniogVpZ2uVeUuYIzXPLPVLHDcer8yVMCfzrGd1vH5peHeQRLGpvGlLvnNKDMyXXp+UsGoOXc1nO3YcOgsJugsI9Q9q2tBoSXd+UselOAoSTdX1/XTTLMrskxsDq+ZOg3uxTGdH9xBBWOUBra86cyin0mvi2diN+3uyL5u8h5m8YN/6uJhnPjVj+XuFa3UddvA2/NSOSzJyNgUnLQxM3bwzMrG3WrHltimO709aGtvoFMJ79tYTcRs5PluDde1fglgS6PWns1bn60eg11Me7fkGVBBCokUvLoSlp4QzjWdxyXBKg0KzTdlK1RzONagBhhsL5g8D1i37Z+Jgc9IyLIFT7A9cfaARuy7SY7gZ3OULZQSINP7RdxPHIIQghv3lg2j3+lfwgl07dpTdYsAozJNgfovUPk1RYSrv0bZQuCx21zuJDxNjvnep8x+PHbTjyTMJkVLgBzn7wYo4F9kcUvFXQYqA+7lbon/IWkmlYs3TatxgAKveKHkxRNejkaT6etO7oae/k2Bb3n/LFXNN0of86jUa37CZUq8jj3e2jN2vYF0Z1Ot1FA7hXICbhNPlyJuEl 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:(13230031)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 13:46:26.7618 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7073f011-3187-4d5b-49d4-08dc36d1544c 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: DS2PEPF00003441.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB9240 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This patch adds inner values into PRM modify field list for each existing outer field. Signed-off-by: Michael Baum Acked-by: Dariusz Sosnowski --- drivers/common/mlx5/mlx5_prm.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 6967acbdc3..6124af1857 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -829,14 +829,17 @@ enum mlx5_modification_field { MLX5_MODI_OUT_TCP_SEQ_NUM, MLX5_MODI_IN_TCP_SEQ_NUM, MLX5_MODI_OUT_TCP_ACK_NUM, - MLX5_MODI_IN_TCP_ACK_NUM = 0x5C, + MLX5_MODI_IN_TCP_ACK_NUM, MLX5_MODI_OUT_ESP_SPI = 0x5E, + MLX5_MODI_IN_ESP_SPI, MLX5_MODI_GTP_TEID = 0x6E, MLX5_MODI_OUT_IP_ECN = 0x73, - MLX5_MODI_TUNNEL_HDR_DW_1 = 0x75, + MLX5_MODI_IN_IP_ECN, + MLX5_MODI_TUNNEL_HDR_DW_1, MLX5_MODI_GTPU_FIRST_EXT_DW_0, MLX5_MODI_HASH_RESULT = 0x81, MLX5_MODI_OUT_ESP_SEQ_NUM, + MLX5_MODI_IN_ESP_SEQ_NUM, MLX5_MODI_IN_MPLS_LABEL_0 = 0x8a, MLX5_MODI_IN_MPLS_LABEL_1, MLX5_MODI_IN_MPLS_LABEL_2, @@ -855,7 +858,12 @@ enum mlx5_modification_field { MLX5_MODI_OUT_IPV6_PAYLOAD_LEN, MLX5_MODI_OUT_IPV4_IHL, MLX5_MODI_OUT_TCP_DATA_OFFSET, - MLX5_MODI_OUT_IPSEC_NEXT_HDR = 0x126, + MLX5_MODI_IN_IPV6_TRAFFIC_CLASS, + MLX5_MODI_IN_IPV4_TOTAL_LEN, + MLX5_MODI_IN_IPV6_PAYLOAD_LEN, + MLX5_MODI_IN_IPV4_IHL, + MLX5_MODI_IN_TCP_DATA_OFFSET, + MLX5_MODI_OUT_IPSEC_NEXT_HDR, MLX5_MODI_INVALID = INT_MAX, }; From patchwork Mon Feb 26 13:45:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 137229 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9857243BED; Mon, 26 Feb 2024 14:46:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A900742E95; Mon, 26 Feb 2024 14:46:41 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2079.outbound.protection.outlook.com [40.107.93.79]) by mails.dpdk.org (Postfix) with ESMTP id 55CA842E74 for ; Mon, 26 Feb 2024 14:46:36 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GtbmhxLb+BwIGuloXhx1DMoKXKPM1LMpAkslPoPFOzNRrmW6BGnh0lKO+asorNTEkttPm03J5ZOrZGXMAQBbZ/q9uXe+t3u32HDqTGCK9EL9zEKYttdj0cbkvzefAWAzY+MYouXle/+WNhwcHxIlGoVcSYMFRYLNfmaN3Q26pTSZmKnsQ1eVXQSzqbooAU5Hn11w+pRVXfkPb0P5Ye6lmVHIczpS5TLCb6IFlqlFJmQtCkYfX30EP/T7J3D++FoArncW4FV9YTryIlFQJUd9wpCQ9GBP/pqp+n08mkFkrFPC2I4JVDcIvhk+N6k5OEtgcqxshYnNa9uM9YDOlcSO2g== 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=frQ7oWY9wqC5nCBiXHsCxToh7YGw/0S3pN/WrKWVMso=; b=B0G5PqRDLMIhr3NvosStDfuj5DWGtn7J8HEeQN28YqmS0f241ryCABa/gFifFudK0H4hCxCnsgB3Q4O0pHTu5m9MfkH7t66tSIFo4vkrB8UDJGzhUS7vMiTZ0BF2cQzDx6ez8glyoZWIp6XL3MFqUAFOZez8zvuQ4Yok1VIRwn2qf5OUEp3uTGwYDB11JG3blXSYFpMD0uwgt44ckMEXfNnM+E3RZNhB+t3JYjTeyiQNm24V6aCWEAzDenZl6USUUEnrEovHhiNBdpM0bkhUjSBeHNczel7T/bH+UPy9d41ENL7/icGiVINqktHqUXiJqqB6l7rRq3heWqLgvxWhPQ== 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=frQ7oWY9wqC5nCBiXHsCxToh7YGw/0S3pN/WrKWVMso=; b=qqUbxwgtu2vq7f4gmAl0gBCK07GP8KxOQGfLhhJBRBizDRVFY6Xg57wCoUIfi1jEKdRlDqXOHphtFNeM72sWh6Q80AqTMJ5ff7lVGZc/dE63N6mCe/RK02yGnxCyE9wPORD3b0E2RkMz42BD2PRxEoXtVKgUHEkKZkiMchkq/QX2VjEb9ucWvMZdzEHEwYDQ5Xs3cbs7HNRx8hHgrusC/nDe6YRjzXVZnviktufHEuo1r2rnaVCv6udlfeHo3BG/9KY4ixRCPJEbaQ2nHD8q4cP5RS9KzQvTkrcqzhMfsvBTO7O8alawwt7B1WsVHisy8XUJSjbdi0U5OgOzXMGGkA== Received: from BN9PR03CA0649.namprd03.prod.outlook.com (2603:10b6:408:13b::24) by BN9PR12MB5337.namprd12.prod.outlook.com (2603:10b6:408:102::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.36; Mon, 26 Feb 2024 13:46:32 +0000 Received: from BN2PEPF000044A7.namprd04.prod.outlook.com (2603:10b6:408:13b:cafe::32) by BN9PR03CA0649.outlook.office365.com (2603:10b6:408:13b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.49 via Frontend Transport; Mon, 26 Feb 2024 13:46:32 +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 BN2PEPF000044A7.mail.protection.outlook.com (10.167.243.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Mon, 26 Feb 2024 13:46:32 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.41; Mon, 26 Feb 2024 05:46:15 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Mon, 26 Feb 2024 05:46:14 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12 via Frontend Transport; Mon, 26 Feb 2024 05:46:12 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v3 4/7] common/mlx5: add IPv6 flow label PRM field Date: Mon, 26 Feb 2024 15:45:53 +0200 Message-ID: <20240226134556.2985054-5-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240226134556.2985054-1-michaelba@nvidia.com> References: <20240207155533.1582031-1-michaelba@nvidia.com> <20240226134556.2985054-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044A7:EE_|BN9PR12MB5337:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ce7c20e-b010-4942-5f0a-08dc36d1578c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XD2gZou2rHsUfDDVSU+jE+OQuzleRoej1G0wohGfEi7Xl4fHkV9jcOjIdEZcFfBM19H8cej0yektGWGxa3FBbAOfXleuz4mwY93MadoHAjsPnfwBht8FPmfPMfgzR0zadj/mkDyMnCEpGkEUHT9/SM5b8V8FdP0mQcjlIGDpz+5t/lmGOitYnnAgGPANOf35amYJUwyWNc22Iw1BE374chETHo3IRQBrVyIIQnxwWJSnaj+zFAE2Q2ap6gvvkvMqsIAoPewFdg3lodnvPl7vls5SmsfSqarz1XRLkos2t2wAYqV79PMNUUgobRlkRupY4e0g4cad5D+0X2DGnb4knjKXLFxL2TGnhJGdZWtsr63kud4hCV4i/LlqL88yzALKNUFkFvqrBMD4Bh1fDw8IY8cbmicrB/+Hwis+cPJkivXwrHtmb+eEM8EgTDX55VP6eUL/1WGIJKYIWv0y3yvGaDg81ME66LvwRYtcALsprTbv6ANc20Itqx+LuFdqicJajkxc/jSqEPLI87N68C9nKf9rB3oETf0xFkWz3DGVtDIEBLbaYGXqMexy2fh20Wc4obTPL2nMRkd3Nt7uuKXhwA3QGbikGyhT29d5T/D9/L5VxtypkYuCmPg7E3+O1F9cS/mUNphvKuSxGAtkj6Yj7eOSuUFTFbv2M6CdFloY7rKMm5Ol/GKMVQFyaDCOQFrtC6urYy5jofUj9auREVDDIIx9Wboo/JuHYjnOIYpGZqWusVnuH1GTttTcR4qQlOaX 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:(13230031)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 13:46:32.1993 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ce7c20e-b010-4942-5f0a-08dc36d1578c 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: BN2PEPF000044A7.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5337 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add IPv6 flow label field into PRM modify field list. The new values are "MLX5_MODI_OUT_IPV6_FLOW_LABEL" and "MLX5_MODI_IN_IPV6_FLOW_LABEL". Signed-off-by: Michael Baum Acked-by: Dariusz Sosnowski --- drivers/common/mlx5/mlx5_prm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 6124af1857..92309d453b 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -864,6 +864,8 @@ enum mlx5_modification_field { MLX5_MODI_IN_IPV4_IHL, MLX5_MODI_IN_TCP_DATA_OFFSET, MLX5_MODI_OUT_IPSEC_NEXT_HDR, + MLX5_MODI_OUT_IPV6_FLOW_LABEL, + MLX5_MODI_IN_IPV6_FLOW_LABEL, MLX5_MODI_INVALID = INT_MAX, }; From patchwork Mon Feb 26 13:45:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 137230 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 770E343BED; Mon, 26 Feb 2024 14:46:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 061D042E91; Mon, 26 Feb 2024 14:46:48 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2071.outbound.protection.outlook.com [40.107.93.71]) by mails.dpdk.org (Postfix) with ESMTP id 5F3C442E76 for ; Mon, 26 Feb 2024 14:46:38 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HliI9U8oyTtj+L3Vdnz1NmcIOXvvWhi58k+lYHoPVDt7O4rkM7Rr+4TyATtgz4hJKxj4HnbkaTkRIO9XePsXxgMerOLdpDW9XuIQj8euhCyuiWA7lZCJEu/C9I/w5nbVFNBILU5eo+sWAkj/JSJ2uKSiMgdKk+RWqMqH8DMp4AfkcOE56ITvgXM2WTphsP1wuMMCDDh1NvMbbQLOW8nfbRKeus9R/JvG3InnsGY67ZLjHqMDMOAUqzwDdbEzIGXM5yTlaORbGHC1pV13PCDeRcnUnmn9jYDWwIc6SJSAqDo1GQP8r9WwdrL2arcwHSafGAcRrTS2XeqKVBGKwb2AkQ== 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=D3D2Rb3Wdilogk8OlBkvR5dWMTOwHZStLGVQkKbiZ5Q=; b=LG4w4tstSNJo3nKUh2UWt9rrhhifmJUBvJD7YPV4OdcsoW3JAjN3N1bEkb/5CoqgVWyUmnVkoL6Fc01k3d6q7GjtxghDeJHjBNlaJ7VUhVfrTcJLYQoNxMWfRy+RTNIiGIPDy96Dp09v9AeuseB2gG0UVDAGB/oveLX/L8AsGZrOr+HX2pY6gf5tLyRUReNLw3LXd2WiTDjijwMzyz9HCORXJHYvVtZj3+/cD+KGMSt+VUNOzJseaJL1vIuJ8yMPmcJ/zHqQGfckSlRMHYMSPerFyqnX/BXAI6tVtn75god/T4nwlmcTOCq+ISHzKN3gpsBnBWfwF2ezxXN4M8NEkw== 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=D3D2Rb3Wdilogk8OlBkvR5dWMTOwHZStLGVQkKbiZ5Q=; b=O2PKPGyKu/eKrDvpA+xf4jON2qFFVH1wA2MDp6ZhvncvSP2dkPsl6kPy4OJr6AGWWQjUzruWLzKfodgp3m3gEtMxPkFKr3d0QWk7C5BScnmQquJoUUonuzMUzcMuNTag3zjR2sjnSAkT/UVMUUhlgSowN4o3WxH6+RJq/t/awjN57dgEwtbcHhugnkz4j/X+CeBj8fgxFOSqVqfFiWWKEsi+xCzDxabQ/UJmY4m/iKbEMJyhuyXaH0e3P6hm/Z2jMKJEBPBce5dL5cdDgqRPUf3Nqewa0Tju9xlJtdCUEEigLbllzHI1g1mx7D8IdgDeW572fQVsBNz87S5mdjUv3g== Received: from DM6PR03CA0086.namprd03.prod.outlook.com (2603:10b6:5:333::19) by CH3PR12MB9195.namprd12.prod.outlook.com (2603:10b6:610:1a3::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.34; Mon, 26 Feb 2024 13:46:35 +0000 Received: from DS2PEPF00003446.namprd04.prod.outlook.com (2603:10b6:5:333:cafe::99) by DM6PR03CA0086.outlook.office365.com (2603:10b6:5:333::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.49 via Frontend Transport; Mon, 26 Feb 2024 13:46:35 +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 DS2PEPF00003446.mail.protection.outlook.com (10.167.17.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Mon, 26 Feb 2024 13:46:34 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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.986.41; Mon, 26 Feb 2024 05:46:18 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Mon, 26 Feb 2024 05:46:16 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12 via Frontend Transport; Mon, 26 Feb 2024 05:46:14 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v3 5/7] net/mlx5: add support for modify inner fields Date: Mon, 26 Feb 2024 15:45:54 +0200 Message-ID: <20240226134556.2985054-6-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240226134556.2985054-1-michaelba@nvidia.com> References: <20240207155533.1582031-1-michaelba@nvidia.com> <20240226134556.2985054-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003446:EE_|CH3PR12MB9195:EE_ X-MS-Office365-Filtering-Correlation-Id: dc52cd9d-7729-4d74-c37a-08dc36d15911 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ajfh8oT0kSAeTccxnqO20qo2keO/EebpQhaa700HuwHxJ4TKWj2yF7zk5yzF5GjKxpzkDWll6OtSfptWC5RSIHLjKIsqiEsiq5n+ZDba7UipEG/wTO9M4HV8Co8kU8FYHqIJizzlbXOOZLhAGkBqlPhpW8p4n0tLGKsb9KBgnDf0ycRTygpkcdJ8We6BgOrwCQvzus79WEmCgPHfWCFOLDU759VoAHc/8+dVELp+E5ACDvehSSYHk+3UetogVFvTrftZWEXbgNWC5DSbkxFvc8hazU8qncE6FuhLDNVLTvVKn7qMpHGPEDqYxfK1D7Yx/lL671AMlUH2VSaFXcN3kGTIA091qF8tazL5EoqwAhfVb2d29l6toqle/OfHitEeGPyOUbLhO8P6pla0qAMQ4+r1jzLAjyY+Q5LW8/oEG9jIP5oSYIM8vZVl4wceRqadKOQDnbjExgtqjThMxrt1iib05XzBK+H5ZAzoZs38+Y75vtOiDD8OselzQ7YQkBuKsDwJUHiIy6Xwm6mGVfPB0clHEnRn8+uKXWLC0oTz8JIBpChBOEibeQo1saDo4VETBgCqTUwnC5++lXiypKeKd6AZLIvoPLlJMkH5goL+r8jixdiKuGH16b9bZf0HxsCIwdu+isSdI9vyNydOkkq+dIzhozX3hUmesQxKCNkbTpOigfzrUFWxix2q5atiraNpLslVIcbdZWHZgb2EbsMd7WMTVm+Kcigs1vBrINjbCOHK/kyPCPYX3balyMcwjNuv 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:(13230031)(230273577357003)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 13:46:34.7356 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc52cd9d-7729-4d74-c37a-08dc36d15911 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: DS2PEPF00003446.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9195 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This patch adds support for copying from inner fields using "level" 2. Signed-off-by: Michael Baum Acked-by: Dariusz Sosnowski --- doc/guides/nics/mlx5.rst | 28 +++++- doc/guides/rel_notes/release_24_03.rst | 1 + drivers/net/mlx5/mlx5_flow.c | 12 ++- drivers/net/mlx5/mlx5_flow_dv.c | 113 +++++++++++---------- drivers/net/mlx5/mlx5_flow_hw.c | 130 ++++++++++++++++++++++++- 5 files changed, 223 insertions(+), 61 deletions(-) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 0d2213497a..dcf58c0a34 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -639,7 +639,6 @@ Limitations Only DWs configured in :ref:`parser creation ` can be modified, 'type' and 'class' fields can be modified when ``match_on_class_mode=2``. - Modification of GENEVE TLV option data supports one DW per action. - - Encapsulation levels are not supported, can modify outermost header fields only. - Offsets cannot skip past the boundary of a field. - If the field type is ``RTE_FLOW_FIELD_MAC_TYPE`` and packet contains one or more VLAN headers, @@ -653,6 +652,33 @@ Limitations - For flow metadata fields (e.g. META or TAG) offset specifies the number of bits to skip from field's start, starting from LSB in the least significant byte, in the host order. + - Modification of the MPLS header is supported with some limitations: + + - Only in HW steering. + - Only in ``src`` field. + - Only for outermost tunnel header (``level=2``). + For ``RTE_FLOW_FIELD_MPLS``, + the default encapsulation level ``0`` describes the outermost tunnel header. + + .. note:: + + the default encapsulation level ``0`` describes the "outermost that match is supported", + currently it is first tunnel, but it can be changed to outer when it is supported. + + - Default encapsulation level ``0`` describes outermost. + - Encapsulation level ``1`` is supported. + - Encapsulation level ``2`` is supported with some limitations: + + - Only in HW steering. + - Only in ``src`` field. + - ``RTE_FLOW_FIELD_VLAN_ID`` is not supported. + - ``RTE_FLOW_FIELD_IPV4_PROTO`` is not supported. + - ``RTE_FLOW_FIELD_IPV6_PROTO/DSCP/ECN`` are not supported. + - ``RTE_FLOW_FIELD_ESP_PROTO/SPI/SEQ_NUM`` are not supported. + - ``RTE_FLOW_FIELD_TCP_SEQ/ACK_NUM`` are not supported. + - Second tunnel fields are not supported. + + - Encapsulation levels greater than ``2`` are not supported. - Age action: diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst index 879bb4944c..0473858e19 100644 --- a/doc/guides/rel_notes/release_24_03.rst +++ b/doc/guides/rel_notes/release_24_03.rst @@ -130,6 +130,7 @@ New Features * Added support for matching a random value. * Added support for comparing result between packet fields or value. * Added support for accumulating value of field into another one. + * Added support for copy inner fields in HWS flow engine. * **Updated Marvell cnxk crypto driver.** diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 2b2ae62618..3e179110a0 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2387,10 +2387,14 @@ flow_validate_modify_field_level(const struct rte_flow_field_data *data, if (data->level == 0) return 0; if (data->field != RTE_FLOW_FIELD_TAG && - data->field != (enum rte_flow_field_id)MLX5_RTE_FLOW_FIELD_META_REG) - return rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ACTION, NULL, - "inner header fields modification is not supported"); + data->field != (enum rte_flow_field_id)MLX5_RTE_FLOW_FIELD_META_REG) { + if (data->level > 1) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + NULL, + "inner header fields modification is not supported"); + return 0; + } if (data->tag_index != 0) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, NULL, diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 42810e359c..feda003c07 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -82,6 +82,9 @@ } \ } while (0) +#define CALC_MODI_ID(field, level) \ + (((level) > 1) ? MLX5_MODI_IN_##field : MLX5_MODI_OUT_##field) + union flow_dv_attr { struct { uint32_t valid:1; @@ -1638,8 +1641,8 @@ mlx5_flow_field_id_to_modify_info MLX5_ASSERT(data->offset + width <= 48); off_be = 48 - (data->offset + width); if (off_be < 16) { - info[idx] = (struct field_modify_info){2, 4, - MLX5_MODI_OUT_DMAC_15_0}; + modi_id = CALC_MODI_ID(DMAC_15_0, data->level); + info[idx] = (struct field_modify_info){2, 4, modi_id}; length = off_be + width <= 16 ? width : 16 - off_be; if (mask) mask[1] = flow_modify_info_mask_16(length, @@ -1654,8 +1657,8 @@ mlx5_flow_field_id_to_modify_info } else { off_be -= 16; } - info[idx] = (struct field_modify_info){4, 0, - MLX5_MODI_OUT_DMAC_47_16}; + modi_id = CALC_MODI_ID(DMAC_47_16, data->level); + info[idx] = (struct field_modify_info){4, 0, modi_id}; if (mask) mask[0] = flow_modify_info_mask_32(width, off_be); else @@ -1665,8 +1668,8 @@ mlx5_flow_field_id_to_modify_info MLX5_ASSERT(data->offset + width <= 48); off_be = 48 - (data->offset + width); if (off_be < 16) { - info[idx] = (struct field_modify_info){2, 4, - MLX5_MODI_OUT_SMAC_15_0}; + modi_id = CALC_MODI_ID(SMAC_15_0, data->level); + info[idx] = (struct field_modify_info){2, 4, modi_id}; length = off_be + width <= 16 ? width : 16 - off_be; if (mask) mask[1] = flow_modify_info_mask_16(length, @@ -1681,8 +1684,8 @@ mlx5_flow_field_id_to_modify_info } else { off_be -= 16; } - info[idx] = (struct field_modify_info){4, 0, - MLX5_MODI_OUT_SMAC_47_16}; + modi_id = CALC_MODI_ID(SMAC_47_16, data->level); + info[idx] = (struct field_modify_info){4, 0, modi_id}; if (mask) mask[0] = flow_modify_info_mask_32(width, off_be); else @@ -1704,8 +1707,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_MAC_TYPE: MLX5_ASSERT(data->offset + width <= 16); off_be = 16 - (data->offset + width); - info[idx] = (struct field_modify_info){2, 0, - MLX5_MODI_OUT_ETHERTYPE}; + modi_id = CALC_MODI_ID(ETHERTYPE, data->level); + info[idx] = (struct field_modify_info){2, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_16(width, off_be); else @@ -1714,8 +1717,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_IPV4_IHL: MLX5_ASSERT(data->offset + width <= 4); off_be = 4 - (data->offset + width); - info[idx] = (struct field_modify_info){1, 0, - MLX5_MODI_OUT_IPV4_IHL}; + modi_id = CALC_MODI_ID(IPV4_IHL, data->level); + info[idx] = (struct field_modify_info){1, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_8(width, off_be); else @@ -1724,8 +1727,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_IPV4_DSCP: MLX5_ASSERT(data->offset + width <= 6); off_be = 6 - (data->offset + width); - info[idx] = (struct field_modify_info){1, 0, - MLX5_MODI_OUT_IP_DSCP}; + modi_id = CALC_MODI_ID(IP_DSCP, data->level); + info[idx] = (struct field_modify_info){1, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_8(width, off_be); else @@ -1734,8 +1737,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_IPV4_TOTAL_LEN: MLX5_ASSERT(data->offset + width <= 16); off_be = 16 - (data->offset + width); - info[idx] = (struct field_modify_info){2, 0, - MLX5_MODI_OUT_IPV4_TOTAL_LEN}; + modi_id = CALC_MODI_ID(IPV4_TOTAL_LEN, data->level); + info[idx] = (struct field_modify_info){2, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_16(width, off_be); else @@ -1744,8 +1747,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_IPV4_TTL: MLX5_ASSERT(data->offset + width <= 8); off_be = 8 - (data->offset + width); - info[idx] = (struct field_modify_info){1, 0, - MLX5_MODI_OUT_IPV4_TTL}; + modi_id = CALC_MODI_ID(IPV4_TTL, data->level); + info[idx] = (struct field_modify_info){1, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_8(width, off_be); else @@ -1754,8 +1757,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_IPV4_SRC: MLX5_ASSERT(data->offset + width <= 32); off_be = 32 - (data->offset + width); - info[idx] = (struct field_modify_info){4, 0, - MLX5_MODI_OUT_SIPV4}; + modi_id = CALC_MODI_ID(SIPV4, data->level); + info[idx] = (struct field_modify_info){4, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_32(width, off_be); else @@ -1764,8 +1767,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_IPV4_DST: MLX5_ASSERT(data->offset + width <= 32); off_be = 32 - (data->offset + width); - info[idx] = (struct field_modify_info){4, 0, - MLX5_MODI_OUT_DIPV4}; + modi_id = CALC_MODI_ID(DIPV4, data->level); + info[idx] = (struct field_modify_info){4, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_32(width, off_be); else @@ -1795,8 +1798,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN: MLX5_ASSERT(data->offset + width <= 16); off_be = 16 - (data->offset + width); - info[idx] = (struct field_modify_info){2, 0, - MLX5_MODI_OUT_IPV6_PAYLOAD_LEN}; + modi_id = CALC_MODI_ID(IPV6_PAYLOAD_LEN, data->level); + info[idx] = (struct field_modify_info){2, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_16(width, off_be); else @@ -1805,8 +1808,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_IPV6_HOPLIMIT: MLX5_ASSERT(data->offset + width <= 8); off_be = 8 - (data->offset + width); - info[idx] = (struct field_modify_info){1, 0, - MLX5_MODI_OUT_IPV6_HOPLIMIT}; + modi_id = CALC_MODI_ID(IPV6_HOPLIMIT, data->level); + info[idx] = (struct field_modify_info){1, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_8(width, off_be); else @@ -1818,10 +1821,10 @@ mlx5_flow_field_id_to_modify_info * arranged according to network byte ordering. */ struct field_modify_info fields[] = { - { 4, 0, MLX5_MODI_OUT_SIPV6_127_96 }, - { 4, 4, MLX5_MODI_OUT_SIPV6_95_64 }, - { 4, 8, MLX5_MODI_OUT_SIPV6_63_32 }, - { 4, 12, MLX5_MODI_OUT_SIPV6_31_0 }, + { 4, 0, CALC_MODI_ID(SIPV6_127_96, data->level)}, + { 4, 4, CALC_MODI_ID(SIPV6_95_64, data->level)}, + { 4, 8, CALC_MODI_ID(SIPV6_63_32, data->level)}, + { 4, 12, CALC_MODI_ID(SIPV6_31_0, data->level)}, }; /* First mask to be modified is the mask of 4th address byte. */ uint32_t midx = 3; @@ -1861,10 +1864,10 @@ mlx5_flow_field_id_to_modify_info * arranged according to network byte ordering. */ struct field_modify_info fields[] = { - { 4, 0, MLX5_MODI_OUT_DIPV6_127_96 }, - { 4, 4, MLX5_MODI_OUT_DIPV6_95_64 }, - { 4, 8, MLX5_MODI_OUT_DIPV6_63_32 }, - { 4, 12, MLX5_MODI_OUT_DIPV6_31_0 }, + { 4, 0, CALC_MODI_ID(DIPV6_127_96, data->level)}, + { 4, 4, CALC_MODI_ID(DIPV6_95_64, data->level)}, + { 4, 8, CALC_MODI_ID(DIPV6_63_32, data->level)}, + { 4, 12, CALC_MODI_ID(DIPV6_31_0, data->level)}, }; /* First mask to be modified is the mask of 4th address byte. */ uint32_t midx = 3; @@ -1901,8 +1904,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_TCP_PORT_SRC: MLX5_ASSERT(data->offset + width <= 16); off_be = 16 - (data->offset + width); - info[idx] = (struct field_modify_info){2, 0, - MLX5_MODI_OUT_TCP_SPORT}; + modi_id = CALC_MODI_ID(TCP_SPORT, data->level); + info[idx] = (struct field_modify_info){2, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_16(width, off_be); else @@ -1911,8 +1914,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_TCP_PORT_DST: MLX5_ASSERT(data->offset + width <= 16); off_be = 16 - (data->offset + width); - info[idx] = (struct field_modify_info){2, 0, - MLX5_MODI_OUT_TCP_DPORT}; + modi_id = CALC_MODI_ID(TCP_DPORT, data->level); + info[idx] = (struct field_modify_info){2, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_16(width, off_be); else @@ -1921,8 +1924,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_TCP_SEQ_NUM: MLX5_ASSERT(data->offset + width <= 32); off_be = 32 - (data->offset + width); - info[idx] = (struct field_modify_info){4, 0, - MLX5_MODI_OUT_TCP_SEQ_NUM}; + modi_id = CALC_MODI_ID(TCP_SEQ_NUM, data->level); + info[idx] = (struct field_modify_info){4, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_32(width, off_be); else @@ -1931,8 +1934,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_TCP_ACK_NUM: MLX5_ASSERT(data->offset + width <= 32); off_be = 32 - (data->offset + width); - info[idx] = (struct field_modify_info){4, 0, - MLX5_MODI_OUT_TCP_ACK_NUM}; + modi_id = CALC_MODI_ID(TCP_ACK_NUM, data->level); + info[idx] = (struct field_modify_info){4, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_32(width, off_be); else @@ -1941,8 +1944,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_TCP_FLAGS: MLX5_ASSERT(data->offset + width <= 9); off_be = 9 - (data->offset + width); - info[idx] = (struct field_modify_info){2, 0, - MLX5_MODI_OUT_TCP_FLAGS}; + modi_id = CALC_MODI_ID(TCP_FLAGS, data->level); + info[idx] = (struct field_modify_info){2, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_16(width, off_be); else @@ -1951,8 +1954,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_TCP_DATA_OFFSET: MLX5_ASSERT(data->offset + width <= 4); off_be = 4 - (data->offset + width); - info[idx] = (struct field_modify_info){1, 0, - MLX5_MODI_OUT_TCP_DATA_OFFSET}; + modi_id = CALC_MODI_ID(TCP_DATA_OFFSET, data->level); + info[idx] = (struct field_modify_info){1, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_8(width, off_be); else @@ -1961,8 +1964,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_UDP_PORT_SRC: MLX5_ASSERT(data->offset + width <= 16); off_be = 16 - (data->offset + width); - info[idx] = (struct field_modify_info){2, 0, - MLX5_MODI_OUT_UDP_SPORT}; + modi_id = CALC_MODI_ID(UDP_SPORT, data->level); + info[idx] = (struct field_modify_info){2, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_16(width, off_be); else @@ -1971,8 +1974,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_UDP_PORT_DST: MLX5_ASSERT(data->offset + width <= 16); off_be = 16 - (data->offset + width); - info[idx] = (struct field_modify_info){2, 0, - MLX5_MODI_OUT_UDP_DPORT}; + modi_id = CALC_MODI_ID(UDP_DPORT, data->level); + info[idx] = (struct field_modify_info){2, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_16(width, off_be); else @@ -2124,8 +2127,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_IPV4_ECN: MLX5_ASSERT(data->offset + width <= 2); off_be = 2 - (data->offset + width); - info[idx] = (struct field_modify_info){1, 0, - MLX5_MODI_OUT_IP_ECN}; + modi_id = CALC_MODI_ID(IP_ECN, data->level); + info[idx] = (struct field_modify_info){1, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_8(width, off_be); else @@ -2221,7 +2224,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_ESP_SPI: MLX5_ASSERT(data->offset + width <= 32); off_be = 32 - (data->offset + width); - info[idx] = (struct field_modify_info){4, 0, MLX5_MODI_OUT_ESP_SPI}; + modi_id = CALC_MODI_ID(ESP_SPI, data->level); + info[idx] = (struct field_modify_info){4, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_32(width, off_be); else @@ -2230,7 +2234,8 @@ mlx5_flow_field_id_to_modify_info case RTE_FLOW_FIELD_ESP_SEQ_NUM: MLX5_ASSERT(data->offset + width <= 32); off_be = 32 - (data->offset + width); - info[idx] = (struct field_modify_info){4, 0, MLX5_MODI_OUT_ESP_SEQ_NUM}; + modi_id = CALC_MODI_ID(ESP_SEQ_NUM, data->level); + info[idx] = (struct field_modify_info){4, 0, modi_id}; if (mask) mask[idx] = flow_modify_info_mask_32(width, off_be); else diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 3ae1220587..fc1bcdd84e 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -5003,6 +5003,131 @@ flow_hw_modify_field_is_add_dst_valid(const struct rte_flow_action_modify_field return false; } +/** + * Validate the level value for modify field action. + * + * @param[in] data + * Pointer to the rte_flow_field_data structure either src or dst. + * @param[in] inner_supported + * Indicator whether inner should be supported. + * @param[out] error + * Pointer to error structure. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. + */ +static int +flow_hw_validate_modify_field_level(const struct rte_flow_field_data *data, + bool inner_supported, + struct rte_flow_error *error) +{ + switch ((int)data->field) { + case RTE_FLOW_FIELD_START: + case RTE_FLOW_FIELD_VLAN_TYPE: + case RTE_FLOW_FIELD_RANDOM: + case RTE_FLOW_FIELD_FLEX_ITEM: + /* + * Level shouldn't be valid since field isn't supported or + * doesn't use 'level'. + */ + break; + case RTE_FLOW_FIELD_MARK: + case RTE_FLOW_FIELD_META: + case RTE_FLOW_FIELD_METER_COLOR: + case RTE_FLOW_FIELD_HASH_RESULT: + /* For meta data fields encapsulation level is don't-care. */ + break; + case RTE_FLOW_FIELD_TAG: + case MLX5_RTE_FLOW_FIELD_META_REG: + /* + * The tag array for RTE_FLOW_FIELD_TAG type is provided using + * 'tag_index' field. In old API, it was provided using 'level' + * field and it is still supported for backwards compatibility. + * Therefore, for meta tag field only, level is matter. It is + * taken as tag index when 'tag_index' field isn't set, and + * return error otherwise. + */ + if (data->level > 0) { + if (data->tag_index > 0) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, + data, + "tag array can be provided using 'level' or 'tag_index' fields, not both"); + DRV_LOG(WARNING, + "tag array provided in 'level' field instead of 'tag_index' field."); + } + break; + case RTE_FLOW_FIELD_MAC_DST: + case RTE_FLOW_FIELD_MAC_SRC: + case RTE_FLOW_FIELD_MAC_TYPE: + case RTE_FLOW_FIELD_IPV4_IHL: + case RTE_FLOW_FIELD_IPV4_TOTAL_LEN: + case RTE_FLOW_FIELD_IPV4_DSCP: + case RTE_FLOW_FIELD_IPV4_ECN: + case RTE_FLOW_FIELD_IPV4_TTL: + case RTE_FLOW_FIELD_IPV4_SRC: + case RTE_FLOW_FIELD_IPV4_DST: + case RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN: + case RTE_FLOW_FIELD_IPV6_HOPLIMIT: + case RTE_FLOW_FIELD_IPV6_SRC: + case RTE_FLOW_FIELD_IPV6_DST: + case RTE_FLOW_FIELD_TCP_PORT_SRC: + case RTE_FLOW_FIELD_TCP_PORT_DST: + case RTE_FLOW_FIELD_TCP_FLAGS: + case RTE_FLOW_FIELD_TCP_DATA_OFFSET: + case RTE_FLOW_FIELD_UDP_PORT_SRC: + case RTE_FLOW_FIELD_UDP_PORT_DST: + if (data->level > 2) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + data, + "second inner header fields modification is not supported"); + if (inner_supported) + break; + /* Fallthrough */ + case RTE_FLOW_FIELD_VLAN_ID: + case RTE_FLOW_FIELD_IPV4_PROTO: + case RTE_FLOW_FIELD_IPV6_PROTO: + case RTE_FLOW_FIELD_IPV6_DSCP: + case RTE_FLOW_FIELD_IPV6_ECN: + case RTE_FLOW_FIELD_TCP_SEQ_NUM: + case RTE_FLOW_FIELD_TCP_ACK_NUM: + case RTE_FLOW_FIELD_ESP_PROTO: + case RTE_FLOW_FIELD_ESP_SPI: + case RTE_FLOW_FIELD_ESP_SEQ_NUM: + case RTE_FLOW_FIELD_VXLAN_VNI: + case RTE_FLOW_FIELD_GENEVE_VNI: + case RTE_FLOW_FIELD_GENEVE_OPT_TYPE: + case RTE_FLOW_FIELD_GENEVE_OPT_CLASS: + case RTE_FLOW_FIELD_GENEVE_OPT_DATA: + case RTE_FLOW_FIELD_GTP_TEID: + case RTE_FLOW_FIELD_GTP_PSC_QFI: + if (data->level > 1) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + data, + "inner header fields modification is not supported"); + break; + case RTE_FLOW_FIELD_MPLS: + if (data->level == 1) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + data, + "outer MPLS header modification is not supported"); + if (data->level > 2) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + data, + "inner MPLS header modification is not supported"); + break; + case RTE_FLOW_FIELD_POINTER: + case RTE_FLOW_FIELD_VALUE: + default: + MLX5_ASSERT(false); + } + return 0; +} + static int flow_hw_validate_action_modify_field(struct rte_eth_dev *dev, const struct rte_flow_action *action, @@ -5033,7 +5158,7 @@ flow_hw_validate_action_modify_field(struct rte_eth_dev *dev, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, action, "immediate value, pointer and hash result cannot be used as destination"); - ret = flow_validate_modify_field_level(&action_conf->dst, error); + ret = flow_hw_validate_modify_field_level(&action_conf->dst, false, error); if (ret) return ret; if (!flow_hw_modify_field_is_geneve_opt(action_conf->dst.field)) { @@ -5080,7 +5205,7 @@ flow_hw_validate_action_modify_field(struct rte_eth_dev *dev, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, action, "source offset level must be fully masked"); - ret = flow_validate_modify_field_level(&action_conf->src, error); + ret = flow_hw_validate_modify_field_level(&action_conf->src, true, error); if (ret) return ret; } @@ -5145,6 +5270,7 @@ flow_hw_validate_action_modify_field(struct rte_eth_dev *dev, "invalid add_field destination"); return 0; } + static int flow_hw_validate_action_port_representor(struct rte_eth_dev *dev __rte_unused, const struct rte_flow_actions_template_attr *attr, From patchwork Mon Feb 26 13:45:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 137231 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 68A0943BED; Mon, 26 Feb 2024 14:47:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 294F542EA4; Mon, 26 Feb 2024 14:46:49 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2070.outbound.protection.outlook.com [40.107.244.70]) by mails.dpdk.org (Postfix) with ESMTP id 6253342E91 for ; Mon, 26 Feb 2024 14:46:41 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EDK3V1uyQiyuVrAe9lxBW7OkBEUzbSDy+4R5d756RTcdun7vVw2DXOclAZ4vZJEES9mVyPM+riRiLX9bf6h5f/P/gJ/ziIsLB+UEDmLAMHWZancVB3pwvsdOHDuTs4yKPPAfSzVlxzGrck/V7qG3EGbjAs+pexLALY4nMbfnSGKjY3DfOzcA0qYc8Zv5fQaR9eGDVSyKJZUnR4iB6EhkdRUmFNpKY0HgXzjwq8xSaHbKL2FmIKDA+au9sPZO7GsENHcNO9wfJjlRxlBM172ww/k3XkORkEdU6v8FD2jIbw7HyybZ1EaGBTr4A39UW+3K9eOU9zlljtFJJYY+plYf3w== 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=nwrHF+dOA0HhcqlXm972iqo1fDBt+nt9E66tTm3259E=; b=i2/p4rROSwBDzIhFO0ggFBThbU6JIi8lUi18Bg1HQAsrpYdpaDPBCk4+A+jfwoCVrbDjbhMZYWOBbLUHOm4J2wFMrzUm5EfTOwDmpbsyVvOTCJfNJNeqK0exAuCC2YiOotvOMX4qJ0L4ariQQUnGs9/Li5hv4fA0BNuMa1sbJGOIMS5moNn8tlagVy4NrI4WYXuqckiCaYKCUhz3e4/yzWujQdfd9sMkDBmHtcMsIyPQB/z6JSvO7RR2acihA2UDInzPbKVyQqO0mtojKMLQYHj12qcfTG6ll/EIBRFuYniK94eAQM17ENN3xWSQsW3lojXHb8VYBLLi8qAxvHAnEg== 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=nwrHF+dOA0HhcqlXm972iqo1fDBt+nt9E66tTm3259E=; b=DfqtZlBG27QPSe0kITDdGSRDIJ6yKXm3oUY5ww/F49o72h7NM+uqJlF497odfQ83Z01XHT3ss7287I6Qbv3MiBbAB6sIDlMfQkYsj8I67UCoDwvOJwjTeLdRek/FbAFChMsgrLMOCD9WybG9DwYFPT0Gc75gN9327opJ9eZ4UY8RgJxdTWfILzxe8TMb44s0JuMe1AywYj6OoyPgWDOlx8n4PHK6rtEwn7Omtc32g1kigbYFLFQlB+mLTRkd0xKj+4YV5XQSpkfbliy9SGKeLa4QNQeT3zvpnS8c78Eh5j5UhvkjUJSME6rQbuwsq4kUoY7WU2cZDavD+FUELatR5Q== Received: from CH2PR08CA0006.namprd08.prod.outlook.com (2603:10b6:610:5a::16) by SJ0PR12MB6783.namprd12.prod.outlook.com (2603:10b6:a03:44e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.34; Mon, 26 Feb 2024 13:46:38 +0000 Received: from DS2PEPF00003442.namprd04.prod.outlook.com (2603:10b6:610:5a:cafe::30) by CH2PR08CA0006.outlook.office365.com (2603:10b6:610:5a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.49 via Frontend Transport; Mon, 26 Feb 2024 13:46:37 +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 DS2PEPF00003442.mail.protection.outlook.com (10.167.17.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Mon, 26 Feb 2024 13:46:37 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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.986.41; Mon, 26 Feb 2024 05:46:21 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Mon, 26 Feb 2024 05:46:19 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12 via Frontend Transport; Mon, 26 Feb 2024 05:46:17 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v3 6/7] net/mlx5: support modify IPv6 traffic class field Date: Mon, 26 Feb 2024 15:45:55 +0200 Message-ID: <20240226134556.2985054-7-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240226134556.2985054-1-michaelba@nvidia.com> References: <20240207155533.1582031-1-michaelba@nvidia.com> <20240226134556.2985054-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003442:EE_|SJ0PR12MB6783:EE_ X-MS-Office365-Filtering-Correlation-Id: 72be001e-ac2f-48e1-3438-08dc36d15ab3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tmJiwM4ksYAxc8toEOtWU8zx5SgZb+iT3g613W1pL+Lb4DFxoeQthHOPdmWSXhf/c9f4xm+jhbTW1krVknv/9s2o3/TtIo4UxWdWFil8AL0PgI4kIEpKcpw0PIVfajUF2F1MNJF9lnVpXgJAmP8t/OWRc+kmiLg83sqTIpWo3BweRshuBCwlz5HvXeJ2/WBbITvlkzmisAALOlvucKASqjPYhRqNJUqFixApZgnm0UrgQTfWQekzeqM3lwqhJqHT96qABvE69quqVhGQLBXPuyPuzOlz36fNhdLjKy0VBrfrRTNM7w5yY+Ah40zuLECYUMzT1lmbTQuqZIezvlxtLhG7HG+PHPxZvEQMStsXQu8aYsYanO9GIcESsJl+NffXcYUmRn+U8AiYq5Fbl906sHYWhNsblZAeDOvk1bhNF9XsmdqYdcDYau8u+mLcY2F9Qx2O1teQXE/EsV30FTZOlwAfWiISePr3g1wcff1c0Q5WUauI4T+U6C+7iuiEaESIb+Zrg0Dn9Wendjk+aYtSonRpNj8pFOMCleMGGztTWUTQi6aMzoKRJnmfFQA6MglcBsI8rpvvvIUj8pp7UNFv2+JONutNHIqSMduON2bGs/7awmEgWtbF3RQ1yXpCAfqJvFamP2lOhP6jswgKe6DQe9KWdSEoF6BJ7HfY1mM2kzXVCzB8qQmowni5gynv3P04NABCEEEsrgAfQzLQ5okwvAO0T5Bpa8SlHNQ3z5d9W0LSTUmz93PjKzEDvkxirZXX 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:(13230031)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 13:46:37.5026 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 72be001e-ac2f-48e1-3438-08dc36d15ab3 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: DS2PEPF00003442.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB6783 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add HW steering support for IPv6 traffic class field modification. Copy from inner IPv6 traffic class field is also supported using "level=2". Signed-off-by: Michael Baum Acked-by: Dariusz Sosnowski --- doc/guides/rel_notes/release_24_03.rst | 1 + drivers/net/mlx5/mlx5_flow_dv.c | 11 +++++++++++ drivers/net/mlx5/mlx5_flow_hw.c | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst index 0473858e19..c2fc22ed66 100644 --- a/doc/guides/rel_notes/release_24_03.rst +++ b/doc/guides/rel_notes/release_24_03.rst @@ -127,6 +127,7 @@ New Features * Added support for GENEVE matching and modifying in HWS flow engine. * Added support for modifying IPv4 proto field in HWS flow engine. * Added support for modifying IPsec ESP fields in HWS flow engine. + * Added support for modifying IPv6 traffic class field in HWS flow engine. * Added support for matching a random value. * Added support for comparing result between packet fields or value. * Added support for accumulating value of field into another one. diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index feda003c07..2c0c8e37f7 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1394,6 +1394,7 @@ mlx5_flow_item_field_width(struct rte_eth_dev *dev, return 32; case RTE_FLOW_FIELD_IPV6_DSCP: return 6; + case RTE_FLOW_FIELD_IPV6_TRAFFIC_CLASS: case RTE_FLOW_FIELD_IPV6_HOPLIMIT: case RTE_FLOW_FIELD_IPV6_PROTO: return 8; @@ -1795,6 +1796,16 @@ mlx5_flow_field_id_to_modify_info else info[idx].offset = off_be; break; + case RTE_FLOW_FIELD_IPV6_TRAFFIC_CLASS: + MLX5_ASSERT(data->offset + width <= 8); + off_be = 8 - (data->offset + width); + modi_id = CALC_MODI_ID(IPV6_TRAFFIC_CLASS, data->level); + info[idx] = (struct field_modify_info){1, 0, modi_id}; + if (mask) + mask[idx] = flow_modify_info_mask_8(width, off_be); + else + info[idx].offset = off_be; + break; case RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN: MLX5_ASSERT(data->offset + width <= 16); off_be = 16 - (data->offset + width); diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index fc1bcdd84e..9d4fdb06c1 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -2878,7 +2878,7 @@ flow_hw_modify_field_construct(struct mlx5_hw_q_job *job, * bits left. Shift the data left for IPv6 DSCP */ if (field->id == MLX5_MODI_OUT_IPV6_TRAFFIC_CLASS && - !(mask & MLX5_IPV6_HDR_ECN_MASK)) + mhdr_action->dst.field == RTE_FLOW_FIELD_IPV6_DSCP) data <<= MLX5_IPV6_HDR_DSCP_SHIFT; data = (data & mask) >> off_b; job->mhdr_cmd[i++].data1 = rte_cpu_to_be_32(data); @@ -5067,6 +5067,7 @@ flow_hw_validate_modify_field_level(const struct rte_flow_field_data *data, case RTE_FLOW_FIELD_IPV4_TTL: case RTE_FLOW_FIELD_IPV4_SRC: case RTE_FLOW_FIELD_IPV4_DST: + case RTE_FLOW_FIELD_IPV6_TRAFFIC_CLASS: case RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN: case RTE_FLOW_FIELD_IPV6_HOPLIMIT: case RTE_FLOW_FIELD_IPV6_SRC: From patchwork Mon Feb 26 13:45:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 137232 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 67A9D43BED; Mon, 26 Feb 2024 14:47:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5968442EAA; Mon, 26 Feb 2024 14:46:50 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2078.outbound.protection.outlook.com [40.107.237.78]) by mails.dpdk.org (Postfix) with ESMTP id 5E6F942E6C for ; Mon, 26 Feb 2024 14:46:43 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n8d6dzIEci3+9FII+ua4WL+3x1yajtJ4KeRAVrpWfDznjxGvKYP15evbIV7j2ED93V5VVP/HYA4PGXZba7IZAasoMTDjdQHp8jYBXXH9DwqLAPwtjeBbIRHdK34z1OUxxH1o5SHRyL2PYFH9k0tEtl1WjpOmUEiTFsXgGmpjiLWRtULTm3KKkCTOf/5ZtJWQ/nqm7o3EeGZ+dUkz7sMqzxSfLZgkCOieq46ORQB7sI59G9D2ZR5pQCRi9ds1hkLjZvPM0BBuK5+xdw7yargxT5Wez/Okt6+IRl2R4QwgzHaKDPwpWXALW+PDJLp1Mrp8y41R4j6tIBhbMNL45TcY0A== 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=4oIderHYSm8JOcb4liTCcHJUoGQh7UvysPZwNX0ICLo=; b=Pjkmh+7PCnqnH587lgn8ozHpay6yZkMt3ZSkIbMdDcUNkQqwBygxJ17N6ld2MVOdEalIUdcVSmdVgOta7ogp3V+ROsPJ3loiORd8n6IuGDXyZujfLDFaMxC0MRc6PbMHYxujVhfZes3vO3vaBAG8H9VQ2OgpFoHf1twW1DGCt1RfnIdMCZCQ/uQUCN4mV9kc/N6j245uZMJDcHknjHODTWTrXDNe8SWWY37sYyzao139jzqirfXePSsanelAX7YOz75DbbX+q4v2ApLZVMBSZxVNBAkeMtPwgtvbSOO3PdWjlsLexGbJlFaJ1AsNZpMSuXcbH1zQg+2wrVhnbxQN7A== 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=4oIderHYSm8JOcb4liTCcHJUoGQh7UvysPZwNX0ICLo=; b=g5M3rAyJ8wlh+h/eeGXsejJ70vE+ZtgCSyMd53RToHVtyI/ejQB6bFqP+8qfmcu3UTiweK3nw71+sOYYPPcjqa5L7yDFCq/vjxM6ktnN2NGxDh1yPcHjWFLH2oYzBjPCknczJxsmM2La12OsDTD+4G16qC5C5RNJjvKqCLaWncSIM+85VzdsG7I4U292nC398yn3gMH86PFA3/yBsAmjoe4XtlrFiM4t4t79KK7TahRmZuKpkY6dHzjokyOJJ4HhcAS+7fk4y4BSa6nSklMB979R+FAysA0/E1Qf3zUdu8YzUh4KnIJ+H5WVc/lfhbj2OIHTzS93JMKWNooFWueGOQ== Received: from BN9PR03CA0649.namprd03.prod.outlook.com (2603:10b6:408:13b::24) by CYXPR12MB9428.namprd12.prod.outlook.com (2603:10b6:930:d5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.34; Mon, 26 Feb 2024 13:46:41 +0000 Received: from BN2PEPF000044A7.namprd04.prod.outlook.com (2603:10b6:408:13b:cafe::82) by BN9PR03CA0649.outlook.office365.com (2603:10b6:408:13b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.49 via Frontend Transport; Mon, 26 Feb 2024 13:46:40 +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 BN2PEPF000044A7.mail.protection.outlook.com (10.167.243.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25 via Frontend Transport; Mon, 26 Feb 2024 13:46:40 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.41; Mon, 26 Feb 2024 05:46:23 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Mon, 26 Feb 2024 05:46:21 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12 via Frontend Transport; Mon, 26 Feb 2024 05:46:20 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v3 7/7] net/mlx5: support modify IPv6 flow label field Date: Mon, 26 Feb 2024 15:45:56 +0200 Message-ID: <20240226134556.2985054-8-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240226134556.2985054-1-michaelba@nvidia.com> References: <20240207155533.1582031-1-michaelba@nvidia.com> <20240226134556.2985054-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000044A7:EE_|CYXPR12MB9428:EE_ X-MS-Office365-Filtering-Correlation-Id: 01e8308d-6dd5-415c-acc0-08dc36d15c8c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0v0K/lMiNncT5qheR34mpalwrivbmvUPeWDcR/mTcexCnO+JbQjBVkHlzaysAqdNDCyDJbKiw3ako+Z7NU/q+jGLAsu0tSjY0PGmzEncWfdd5aK33q9DnH+WGrZIob21hVCEfxcP1IXBzQeKEtmdRtM9gQ1iFKn+iIcIYUOzS68tf3Ub1F9ES5kMcMefd12pBJ9xtDqhI0faLXm9WRRyhIkiSfmIVPjJeh0E0A5/QXztZKZKy/q5QTyq31o/rNHhCsVZ0dO2BaC8wWo+U+cbtLSC81d3ysD8OcUgZ6RHDfj8oor06KjK3MABCBazVmcVSFqYxE9e8uEDAF+oS2bGxOPlimgp1qY+/tUpjF0q35mxL/MCZCYxwOHXyPPSqJj9Ys+XeXmbqcK8Ynp1910bwz5T2vaRDzoiK1R4nqdNu07YvxHdsfI9/k4ZAkfHoXnadhnSJ7kS8PCfAd5P1cld7aepySnAKXA2Invk98FSbM+Twvme8wZ6oAOwFEhfRrNjSSxJ/GX0i52vnWFzaUI/RsqiTeUu8qqZeP2lDsGa1mOqWsu6kJCxQxDsDAY6TayIp5F0mqUPXM58FXjy5HjlSUSzZgxZfc4RvagHbhs5A+b/PzaSR79wJwkATpUyHYXYdFz1CpqoTnlWc/hr3bV6IXxuNxv1nx7MrWuPcE1pT6yUPNcXkwCCPDxU1+OUW2C14ye3bSkHsA0XoKjibbdq8G0nnWSOuHgehojCyvR8TFTzFB2sfxCmJVb5XIHKGjpL 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:(13230031)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 13:46:40.5586 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01e8308d-6dd5-415c-acc0-08dc36d15c8c 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: BN2PEPF000044A7.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9428 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add HW steering support for IPv6 flow label field modification. Copy from inner IPv6 flow label field is also supported using "level=2". Signed-off-by: Michael Baum Acked-by: Dariusz Sosnowski --- doc/guides/rel_notes/release_24_03.rst | 1 + drivers/net/mlx5/mlx5_flow_dv.c | 12 ++++++++++++ drivers/net/mlx5/mlx5_flow_hw.c | 1 + 3 files changed, 14 insertions(+) diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst index c2fc22ed66..ff9c6552e4 100644 --- a/doc/guides/rel_notes/release_24_03.rst +++ b/doc/guides/rel_notes/release_24_03.rst @@ -128,6 +128,7 @@ New Features * Added support for modifying IPv4 proto field in HWS flow engine. * Added support for modifying IPsec ESP fields in HWS flow engine. * Added support for modifying IPv6 traffic class field in HWS flow engine. + * Added support for modifying IPv6 flow label field in HWS flow engine. * Added support for matching a random value. * Added support for comparing result between packet fields or value. * Added support for accumulating value of field into another one. diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 2c0c8e37f7..75a8a223ab 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -1394,6 +1394,8 @@ mlx5_flow_item_field_width(struct rte_eth_dev *dev, return 32; case RTE_FLOW_FIELD_IPV6_DSCP: return 6; + case RTE_FLOW_FIELD_IPV6_FLOW_LABEL: + return 20; case RTE_FLOW_FIELD_IPV6_TRAFFIC_CLASS: case RTE_FLOW_FIELD_IPV6_HOPLIMIT: case RTE_FLOW_FIELD_IPV6_PROTO: @@ -1806,6 +1808,16 @@ mlx5_flow_field_id_to_modify_info else info[idx].offset = off_be; break; + case RTE_FLOW_FIELD_IPV6_FLOW_LABEL: + MLX5_ASSERT(data->offset + width <= 20); + off_be = 20 - (data->offset + width); + modi_id = CALC_MODI_ID(IPV6_FLOW_LABEL, data->level); + info[idx] = (struct field_modify_info){4, 0, modi_id}; + if (mask) + mask[idx] = flow_modify_info_mask_32(width, off_be); + else + info[idx].offset = off_be; + break; case RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN: MLX5_ASSERT(data->offset + width <= 16); off_be = 16 - (data->offset + width); diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 9d4fdb06c1..254273e0fb 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -5068,6 +5068,7 @@ flow_hw_validate_modify_field_level(const struct rte_flow_field_data *data, case RTE_FLOW_FIELD_IPV4_SRC: case RTE_FLOW_FIELD_IPV4_DST: case RTE_FLOW_FIELD_IPV6_TRAFFIC_CLASS: + case RTE_FLOW_FIELD_IPV6_FLOW_LABEL: case RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN: case RTE_FLOW_FIELD_IPV6_HOPLIMIT: case RTE_FLOW_FIELD_IPV6_SRC: