From patchwork Tue Feb 6 14:39:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 136427 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 D021543A3A; Tue, 6 Feb 2024 15:40:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 867A241611; Tue, 6 Feb 2024 15:40:24 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id 90CB3415D7 for ; Tue, 6 Feb 2024 15:40:22 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mw9o6szsMdivIS30mzsae7owjP+rMgtO70Nr1Vr8557d113vbWxnFUr8HgAHYukKsVi3hPLHSdi6WCHtszWT4oVY2b/eZd8UKdn/T5B5dyLFHP33sSwh03qbW0KRlLMj1FuTiok3UOwYM5apIre1Oj1KINNMwQ89DNCPCWBy//Es49i/m8VSMmUFdjj7dgLCshcEviB/vNtl3MRfYOGvfU8NpMlGvuyhzgrdknRvzYsyvYRWDg8e4jfAolcm6KZI85VRQDVF6PDPRHPZWwkGdgIKtyRAmonsrqQ1MrXJTXenYc1zTFMsjGwp62wow08QZ5VYP4FQWxKH3Q9lv5ehGA== 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=RZ7smqYGtEN/LVkpGr+1doIoRs801pV1T2TG6iRfMDY=; b=S6IjG624zqi31FgILLlWoKbimSPX5jb7rCN4xJx8z0frYSlqEiV/95Z1Im/aNI0Fgc3e+MHf4BzKpWgz+bTn1MtL7ZoSqW2x8POS42MUDIcZigziLbuA6oW/y1okbCRPb0YgW8syXEiKD2RfbaAtY2M7rtntQO8st7A1wcI+jSV3C+6frF9BdP2BHzE8lJPQKjFbstL00HssyC18p0qgQDteQQNTEvlPT/qhfuWW4z0OttoEFLfGbv6CSuQqmbFe3e1zr5Xmn+Y8bs597e7NkQgAklc2I/NC7JGzMuL2kum+LIpe6x/2mN715nHvPQRQ/i2UidcaS/PFKmcdeMFglQ== 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=RZ7smqYGtEN/LVkpGr+1doIoRs801pV1T2TG6iRfMDY=; b=iqflljj4KPPtbrfOeibjJRHq3jyWeU1mbOCJF4prVoFoPV40xyX//RRfsdSaPJcJvC5uLEWUMxWTgJh0m9DjfIrUbqKVQJg2qa6MuyrUmqZPEDJ0l6iWQWR5PSYzEkB7G62a3OvmL5aB7piwcKv4hVDtOMsqUqRyolQa9Bd61kW4JjvZ7VWFe6DGjN6txCtRtrQmPjSYFfalH78MhCBgJXIbRUtnt/DREF67IvR9Twu5KzO2CIksjSlYVZgTvCYXMH2Ee/iOPoNXX5fc3OfC5Y0bJTTn3310ZykWvdGn4KJoJnahBCg/EsHRG6S8NIiG9wuLFXh7lnx/vBtyiGx+eg== Received: from DS7PR05CA0091.namprd05.prod.outlook.com (2603:10b6:8:56::12) by PH7PR12MB9152.namprd12.prod.outlook.com (2603:10b6:510:2ec::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.31; Tue, 6 Feb 2024 14:40:15 +0000 Received: from DS2PEPF0000343F.namprd02.prod.outlook.com (2603:10b6:8:56:cafe::fc) by DS7PR05CA0091.outlook.office365.com (2603:10b6:8:56::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.14 via Frontend Transport; Tue, 6 Feb 2024 14:40:15 +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 DS2PEPF0000343F.mail.protection.outlook.com (10.167.18.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.19 via Frontend Transport; Tue, 6 Feb 2024 14:40:15 +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; Tue, 6 Feb 2024 06:40:00 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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; Tue, 6 Feb 2024 06:39:59 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41 via Frontend Transport; Tue, 6 Feb 2024 06:39:57 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v1 1/7] common/mlx5: remove enum value duplication Date: Tue, 6 Feb 2024 16:39:44 +0200 Message-ID: <20240206143950.1499532-2-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240206143950.1499532-1-michaelba@nvidia.com> References: <20240206143950.1499532-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343F:EE_|PH7PR12MB9152:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c978b50-43ee-4bcb-d340-08dc27218855 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IFI+F+KsLCjvMp17xzvKwi/xxuURX2r4TPFke2DjEdVUEtXwYj2p+JVsMwIAWQM9F4D/MNcawQ4zqVV0ZcI6asqKgwrbP6QuOoZS2l4VqZ9WR0s564eHCIqVd/nWFEFP52hl1YcdtLLGhbVS5Pot/yb67eFCcXqm+Fb7OG4CgchFqcxdirMHE5ZcWzIjbILquFJbV5pBpEiZA8WmG9/uN/51+JOW1+Y5N54+jT8xO8Hn8/VdWfBPjAMparzGsXQ6w3rBzpaIpIadx5snKIPny8xCuRwX8wf9pNXj01yvhHjRXR0eUErktpw9b8/wYdbq7XSeDBZMvMosxSeWvhXqmp2LwyAgeGuH3UbylZ33j/OeTx0S+W4jIWLJtTd/3z8O8f3eisn1tEdjRg5WC+PPuPe52kf9btK9NsJIfWP3+RxLYwXv6Me2yQ+wvrBmtiUBT4YtAdMNt5IgAlu03LA1fkdgEVZI4R2VcK5mZygoF44ARwK3iAk8Wx4cA+hS7cxhSU31R4k/2g3hkjx7QZY+2KeqD2XhxVUOfR4HTmUOVlnndYkXBo4BnKwLvMFCcPi4pzmBw3nLwPtpmnUeTA+5xqFhm4SToXYbUm9Z4fo31IB3ns6ygnA/wUV+ycQNkwI3Pjhffau4yjGvQnN0t7nCmSCLIVZbPtHwDfZKYCxIAc3jmV5Etqg5i6hR4PWiBOoib3WDrynXNT1f4XWyOQSkpk//ti6E3TJRjOjmxc2NT5fqUHn6GHoEEYCJgGBVGKDe 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)(4636009)(396003)(39860400002)(136003)(376002)(346002)(230922051799003)(64100799003)(186009)(82310400011)(451199024)(1800799012)(36840700001)(46966006)(40470700004)(5660300002)(2616005)(356005)(107886003)(7636003)(426003)(70206006)(8936002)(82740400003)(336012)(6916009)(83380400001)(316002)(36860700001)(26005)(8676002)(70586007)(54906003)(4326008)(2906002)(478600001)(41300700001)(1076003)(6666004)(6286002)(7696005)(47076005)(86362001)(36756003)(55016003)(40460700003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 14:40:15.2935 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c978b50-43ee-4bcb-d340-08dc27218855 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: DS2PEPF0000343F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9152 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 --- 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 3150412580..1f04a35683 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 862ee3e332..2828a82d5b 100644 --- a/drivers/net/mlx5/hws/mlx5dr_action.c +++ b/drivers/net/mlx5/hws/mlx5dr_action.c @@ -2287,7 +2287,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); @@ -2348,7 +2348,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 Tue Feb 6 14:39:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 136426 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 9108643A3A; Tue, 6 Feb 2024 15:40:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 33536402B5; Tue, 6 Feb 2024 15:40:17 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2041.outbound.protection.outlook.com [40.107.223.41]) by mails.dpdk.org (Postfix) with ESMTP id 05C6A4026B for ; Tue, 6 Feb 2024 15:40:14 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JFbeOkElB7S3EPoIkgWoTGVlg6Pm4z8ed7pfe9q1D17LV7myxdgSJg/F+ePcvO8JLCMnmb3BJ3QzA0DW05ZvO1P5wTEC+efdvzoZcQ1G61iHxhdPSBV9+OWLAMY8KpJDuo3TdQ3QUYuo2Lfd+QG/teyyzeJDHLadi7+pSKiWcvNpB6uMGIjvd9XgmRtEnQ25MKfzvt/C69HnpAHmAeVSb2MGa5LzSAjcFbyA5rcbkzdFVzbtc9muvmcu7L4aMX7gzmrSoemTWtp0SuolDU70DTCBMBiSMXmb8vmniSgL6P2WpKYzB4VwGwH8tqCtb/lJcj/eF6n/hnqLuNNlViIgIQ== 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=3OaqGoAOIOMpKakRDGQqLQjvAoe9bMkPy7C6xBXXAOo=; b=VPoW/seqiNpaIC4CSbBL6R1BTsEyTnO6n3uswfWb/LbiYpMO5+5NQimaqNe8IJwBlnlJR9verItcxODmpgqstA9xtII3pEJw5m9tRlYy8TncwIHvwoee+94AoJzugBJJfLS8pxmnS7/3VjMsEJ7BIxdgJcUIqEvph91uq7rVefnLO2mO7Cst9RdcWq97uBuV+Ba/bzdewUitcLzc85XrQOBVZJpg6aShMj7lKXr3EOlA3Ktdn7jrpH70/ufOz6tDo/kwlrtNCMbhE4rRNVHXFJqKAEGvlSCcdsbqFv+QZQiEjX/+xlbR77nA71ov1Epq7YFAvGhxekGMOWLOSPIpTg== 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=3OaqGoAOIOMpKakRDGQqLQjvAoe9bMkPy7C6xBXXAOo=; b=CLSNh2hLba2Uu9D8wXOqadnDUdBbsl5gkQ51xnnHHfHfHPhx8gBREyPlaq+7vzpwrzOEDUUfrFznEAEess3Uk6PUm1qiYuoYj0HBoWxVV2wdLTnuYUXykBl8rogJyl1MrRkzGeEdl5IYHM6Ryeq4tBue6kYdonIZcmL+wJCOEDYoJaxCTP5nwxGHViTR0zb4toAz4t62ddSqr79sXd/gmfPkk8l9nXLKmtnneD2lyyHAmO0OaNGWaR5uMb8kVoyZjPeJtbFAq68Re6YJ3W/G8Oc/inKc+WbWSmWq9CgGrta+vaM6VsdtrKnYy223J0atYFAORK144xhEbQtWZ77J3g== Received: from SJ0PR03CA0169.namprd03.prod.outlook.com (2603:10b6:a03:338::24) by PH7PR12MB5711.namprd12.prod.outlook.com (2603:10b6:510:1e2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.14; Tue, 6 Feb 2024 14:40:11 +0000 Received: from SJ1PEPF00001CE6.namprd03.prod.outlook.com (2603:10b6:a03:338:cafe::54) by SJ0PR03CA0169.outlook.office365.com (2603:10b6:a03:338::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36 via Frontend Transport; Tue, 6 Feb 2024 14:40:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SJ1PEPF00001CE6.mail.protection.outlook.com (10.167.242.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.16 via Frontend Transport; Tue, 6 Feb 2024 14:40:11 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 6 Feb 2024 06:40:03 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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.1258.12; Tue, 6 Feb 2024 06:40:02 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41 via Frontend Transport; Tue, 6 Feb 2024 06:40:00 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v1 2/7] common/mlx5: reorder modification field PRM list Date: Tue, 6 Feb 2024 16:39:45 +0200 Message-ID: <20240206143950.1499532-3-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240206143950.1499532-1-michaelba@nvidia.com> References: <20240206143950.1499532-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE6:EE_|PH7PR12MB5711:EE_ X-MS-Office365-Filtering-Correlation-Id: 99da4768-8904-456e-50a8-08dc272185e0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vEYpRyQd7wZeEHoHvJ3oYee8dVrLcQrIH9KSmmYuiDVQ/RakWxmKC/pEYx7RajlDWPmy8BbWkUWUU5O1IHdvFWz3Bn7zS6v/x6RpssF/yozkoiOkWJWNW3FJGSNphl7BNKAafCMwzet9WOVYCZS4uKXPU8LsL9sqMCx4CKylfyTBGXegXR2Khr+LHPjMfDmiYnQB306vE0hEXnXbvCfRVQrsV8s9mNr6TI72G4ptQRIGlcraJvH00cdt6AUHimpwDBQH1se1dCK795XlipoUHYXxpb3OpBjX5lT6MivWoGtuy3f8iBi0ee4jXNt7CnbcgVaELGL1KPoI+lo7k5H6q4lUCmfuBgsHynq6Jwsfxjc1d6FG22Sfo9Jpd+8otiJqFPAotbgcZHxhQhGSVJn5cLs3USnNMB3+ThRcXjbhlrTLyMoFlWUGxD2j6eKS/apGc52KWIQDktGor3/XvIa50mcivU6DvHRBe+k9f3D3Tor8xyH6IyD/tYSgf0HdFStqFAGB2t8gpU/45ulCBxxYmEYiK6IgO2SbbIlsEbH6X0CD1YJCGXuYiUn5glYyomw1n8SZqbCrGmd21+MsdM90drLxij9Z8bBPgUOMTNmpDTym70VhFz83yk0Paoj/Ukcr5BPkPMXBv9EiICLVGhhQghq33osNxJHBqsRpj6yxUoO3CR2JI8dzLlj8IfKARgDnmSI9z3jp8WBrUmm+GgVCYwNmGg0WNEP02uegasjJViBsAKgzZRXVLozJ/ZRSbkg3 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)(4636009)(346002)(136003)(39860400002)(396003)(376002)(230922051799003)(82310400011)(451199024)(186009)(64100799003)(1800799012)(46966006)(40470700004)(36840700001)(1076003)(2906002)(316002)(8936002)(4326008)(70206006)(8676002)(70586007)(5660300002)(54906003)(6916009)(86362001)(36756003)(41300700001)(36860700001)(356005)(7696005)(7636003)(26005)(83380400001)(6286002)(426003)(82740400003)(6666004)(336012)(478600001)(47076005)(107886003)(40460700003)(40480700001)(2616005)(55016003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 14:40:11.2929 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 99da4768-8904-456e-50a8-08dc272185e0 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: SJ1PEPF00001CE6.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5711 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 --- 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 1f04a35683..a13b5790b0 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 Tue Feb 6 14:39:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 136428 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 55F9B43A3A; Tue, 6 Feb 2024 15:40:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8FAF0427DE; Tue, 6 Feb 2024 15:40:25 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2040.outbound.protection.outlook.com [40.107.94.40]) by mails.dpdk.org (Postfix) with ESMTP id E156A4026B for ; Tue, 6 Feb 2024 15:40:22 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MsAl2qi8l6W+wKuaWBMx44dzJoEJBWnGknHcXxLGkPvkS1f0f5k8C10DoRQONsRfGvQbsgc4yxUpBCildvMj4j+UdCuFEMdf9ilCW0jMxBvr6shXTrb1zpjqqMedaPQxrI1Qp7eqWnHr+t0ijccodCv0azOMAmmCqh8Ty1D6+v6c7eNxi1ijGb3WH/MtNkcU/A7V68GX8KXAONjcBW1A4FeY2mHt5vapZTYlhe7OKWPn7EIul/emTYyse6VQs/KQwn745ahs487KwHb4h0kwo5FWiJ0lumDRbcp4Oto+Ml1UL3l/F7PqFWWNwXtpNy+hlmC39grUuGs6zVofVkHDUA== 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=BqE7E4LoagW57fobompzLpccmy4yqmIjtcmLilaKktg=; b=oDXKHEyn1JsYmw3dtR4NDa2SsEk5yOMPNwEW3AUpP3jw91bCRpB7h8LPuclE0gwAXXhEb7XwV7ItbM2RDZv74imlSMRTjfMa/BEUiWHwslRXyabDVK9dvi08KhwQ3s+0PvVFStHosPbsT5xACYMLMeKi2m+qfaOj+J1NyjetunBojv2TZcL/kHo8yXmE4ZLBbWZPHoHaY7PSD4GQPqEuwItYLDBrYNazdrtlmTMIx3Ue9yL2N4+RZ2RulH0gLeZAsRMQFBTKrMMk8C4jiRsE+Gr0eOPnJqVea6ox7VT9liROLgyxSGmd5eUfzeBekmih3BaHZdchm+i5fgCNscr1kg== 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=BqE7E4LoagW57fobompzLpccmy4yqmIjtcmLilaKktg=; b=dIpuFQhKhNgKac2aaVZRc9G8t2J5qUXYfqyVtGX57iDnvEOybNc+9EjwLQc34ZjaP7OOfdVvMIFreeUP2j/ouxbs3V3KR950N3vmZHrBSKyQnf/PfoYOEWk6ATHjN1IWcR8uU/7itGKVrG0kdVA/kDcP8gvCXE+JcG7CDx44ePZGQXb5uZuMb67EE8EzrhEtjtJ083pdA06S7wLHB2Syrh2rAL9SZZTy7HdO4ywQOh4E1TIQpg8KatOevkwNqmc6gWnVDu+05as/3l/WCbP37p8VZDdtd//aU6qEo6DOjrU7XAb2xp9fWlc4H37VDUgVHHTsKkfrTiOaup+2+h+plg== Received: from CH2PR07CA0012.namprd07.prod.outlook.com (2603:10b6:610:20::25) by PH0PR12MB7079.namprd12.prod.outlook.com (2603:10b6:510:21d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.14; Tue, 6 Feb 2024 14:40:20 +0000 Received: from DS2PEPF00003440.namprd02.prod.outlook.com (2603:10b6:610:20:cafe::73) by CH2PR07CA0012.outlook.office365.com (2603:10b6:610:20::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36 via Frontend Transport; Tue, 6 Feb 2024 14:40:19 +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 DS2PEPF00003440.mail.protection.outlook.com (10.167.18.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.19 via Frontend Transport; Tue, 6 Feb 2024 14:40:19 +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.986.41; Tue, 6 Feb 2024 06:40:05 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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.1258.12; Tue, 6 Feb 2024 06:40:04 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41 via Frontend Transport; Tue, 6 Feb 2024 06:40:02 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v1 3/7] common/mlx5: add inner PRM fields Date: Tue, 6 Feb 2024 16:39:46 +0200 Message-ID: <20240206143950.1499532-4-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240206143950.1499532-1-michaelba@nvidia.com> References: <20240206143950.1499532-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003440:EE_|PH0PR12MB7079:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d210967-b207-4b10-b9de-08dc27218af4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Bt7tQKoyx6oMV/U4uOftc/heV6SV64WO2Bq/vlplY3UxYTlNIDzILeR5zipgXCuKQFb2mziYVsYVfQFlfg4SMQc0n4UGEalcI441ZUQvSCEzPaJWhtg/0+DqhTwXZEk92tvOQ8dPdKYCnh1igKeioshQBgLEq9fxmXhgPGPVIuOHTqBQghl2BvtVYgyG8bwkfSA7vFVZUMnA4j7avM5NhsxWJ812JOphDrvtQjPMyoGPJ+WbN7olxkvA86ID96OgtcLepLrII4oTyHzqKdbzEI0NBEbpaT65DQtZxoA5DZbk280JzsB9eUaHnGNG/4GTks5eNfpAmNvhaUIikXENDzDI4891uJnZPZ6Vcq7JaOc5EbBj5E2TQ3BBxRGp4pctD4saAotN76LYZKB0rw44CaRKUAe4sY02PTHxHBm0aT+r5QmNPTpfFK9oj5iUqFgNvB9WpM0cV7oGbm9LWUjDX2gNPrkrjF/mctUHCHQ4nu9lbVIijFEWoOJQHN2WLGrxhfTS80Sbm1andJNX1QJCjS1RcYcpVz2wXlOLLbPzsXNkW0RVIFv4SnKvvjfXXAie7ZqX6fxUVq5vTpUTqM5swSqNAGyQrDV8NoPQb15dNElRu0VncfgKMtVmw4XyUHRyWC41nodYOjZtm7QDQMX+fAhOqSTkoNFmFpR2sKQFejlht4zbiU75BkjYBxk27lQPdHD8s1l+8u7hYHiT7+enWrTiLnjkkL/70tNPypNv+Zeg6bVR5BR/auIm5YiHCR6B 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)(4636009)(376002)(136003)(346002)(39860400002)(396003)(230922051799003)(82310400011)(186009)(64100799003)(1800799012)(451199024)(36840700001)(40470700004)(46966006)(55016003)(41300700001)(40460700003)(40480700001)(478600001)(86362001)(36756003)(1076003)(70206006)(2616005)(356005)(7636003)(82740400003)(336012)(107886003)(47076005)(83380400001)(26005)(6286002)(2906002)(5660300002)(8676002)(36860700001)(6666004)(54906003)(316002)(4326008)(70586007)(426003)(8936002)(7696005)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 14:40:19.6903 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1d210967-b207-4b10-b9de-08dc27218af4 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: DS2PEPF00003440.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7079 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 --- 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 a13b5790b0..7ac43f42b8 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 Tue Feb 6 14:39:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 136429 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 AD61C43A3A; Tue, 6 Feb 2024 15:40:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CAEEE427E2; Tue, 6 Feb 2024 15:40:26 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2085.outbound.protection.outlook.com [40.107.223.85]) by mails.dpdk.org (Postfix) with ESMTP id B9D2941157 for ; Tue, 6 Feb 2024 15:40:23 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UGa0tC29zpIbejuYxLX3GCzdh1hEwhavcHU+A5kjNlPNDe/SB2ki4yW/ahVx5NyyngOJg0bKj0D1ER+wXN8GEk5WF3aVfSeKxXzyZXxeVdS5IxZEKM41ROJ5wnanbmXTuwwLb6tAsqtla8zc4E1FuzDhfjyEJLYj7iDMr+LZ55ISiWvOJDG8d3mjv7LWjEQJESZDnYbm4V+PkZjRwUu1idwTnA5Z+PemCMWJjvp5mku+mgAYoo2JQ5IE8aGowE9EEEDKGAdybGFeTq4I+924UVZpvHS5HCx1o4hFX/54yk25bH5lNUMfq7BTSbqociG2bpZmDfznbVqYtnOHtGhc8A== 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=kYJpe9snfvocXgatSnYM0BGLAo4+oM64cYUv7ieT/zE=; b=f/YZzZk9kUV8ootnw+JNO03I7kmhl1wSozBVgPlty7pMOukujMbTLF43wu8Obvw5vQ1R92HYTt90bODXTbU14MXKD1HjwKIZCAe0wCQM2xQXGkMzJ4ZAXH42V3RE0bMXpgxjhFLhbV+N+kJ2wCo+ChsuDrzqzfKyIOkV2yCC25cr3N0YRclwQa7IhQxYTPL10RKSXZyGWwzrB48V/iL+39sGSh/JHuQuGXmSmlsbBiIH0HqgFCDYfFlNbVU7AUurLbpsezf673gVQZU0qz5CEyQkBkN5sp8BDRP2MBekuCFMG59wg29TbH6t2uEXlrNHJUIyr7H8fZII7lfqg8YLVQ== 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=kYJpe9snfvocXgatSnYM0BGLAo4+oM64cYUv7ieT/zE=; b=B16Hi21+emN7X3/URv46jb98OPVtfgoQLSiBknBjeTW36Dbn6eqWLlpw1303leWdnHBA4cWUZC69oURtAPRLg5vk39GvW7iHCSV6fdQzr5Ibwk3zPkTiKaDDsx+oCmsJd4er1sPffZn/hvLVcGizf0a6+9CMgrC33XCCAsKNWWrbPqPYlf8ZDRZ5sCgx9ykIhXt6qYE9XQVPA0LtPgZuHGu3Mgx6Bg0QCV4yv0eUzNHqeKUYydjqdbBDJKqb7n/kCbBZ+e1PPkFs3YTKugVGei2TOCCktEK3CttOoptkjKknTtTAhDKQ2Tn1em7QbJY/ZuX8SI6IVgBxtJofya/NIw== Received: from DS7PR03CA0342.namprd03.prod.outlook.com (2603:10b6:8:55::14) by CH2PR12MB4278.namprd12.prod.outlook.com (2603:10b6:610:ab::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.13; Tue, 6 Feb 2024 14:40:21 +0000 Received: from DS2PEPF0000343B.namprd02.prod.outlook.com (2603:10b6:8:55:cafe::97) by DS7PR03CA0342.outlook.office365.com (2603:10b6:8:55::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36 via Frontend Transport; Tue, 6 Feb 2024 14:40:21 +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 DS2PEPF0000343B.mail.protection.outlook.com (10.167.18.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.19 via Frontend Transport; Tue, 6 Feb 2024 14:40:21 +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.986.41; Tue, 6 Feb 2024 06:40:07 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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.1258.12; Tue, 6 Feb 2024 06:40:07 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41 via Frontend Transport; Tue, 6 Feb 2024 06:40:05 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v1 4/7] common/mlx5: add IPv6 flow label PRM field Date: Tue, 6 Feb 2024 16:39:47 +0200 Message-ID: <20240206143950.1499532-5-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240206143950.1499532-1-michaelba@nvidia.com> References: <20240206143950.1499532-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343B:EE_|CH2PR12MB4278:EE_ X-MS-Office365-Filtering-Correlation-Id: 650ee988-c30e-42b8-aa19-08dc27218be6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bvym5o0RKGPiwoyc1wWAx2jxhasMcd0kcFNviGEe+gHgXtOpDDGQolQmmSMXnxWCBgWgagnEGQ22LfR5djYgN9IieA4BHrWN2wi3xDBqIPxeeciOZvsutHSdgHgTaoRU8yM9fGy+LKRyNy4uqirBL1NvUPgQMc7TNwr2RiRBs0pdPSZFV89iNqmYY/w4Vyn1PrUuHbN3X1SU54JENQpPTw4ugDoIHvW/re3he4BsDdlSR/7wwtdByN2ltLbZXVhAbNMx4dUiJh0odXKH/AdpOTmWRMqSj77WrF5qGeXDK5CLvQhvOJg4vg5C8GhJra74RyoANYyWSIXeg8c3FmQenjQoBndacVgop56LYJu/0kLInYnRX9wjHRPNMBWQK31v4QJChArIWXnskFWet6B1anPIKotLK/5gM+vTkmzQbujXce92vRAGUU9XNxksm9DLf5VQZcvwzezm2kTdT3/GR/uCoc1hGOZK2hn9oTMB9KRXcagK7E4IiFcHw/rF9UxDPLF+s/xqbB1B9m00BbNkBTAhPXIuv94UalUCOND7cbv35yt5Y5XR8/xS1xZhZOubtCOJZlio68WhiYhJqEAZwS7ZbtP4vKZJAOnz0JvVa5QTKH8hvz+S0olMKnloifXrc1617mvC4UzXhlJ19DNDGBY1VZbu3xbrwECkUDFYP5We7xoeuBj+3DqjQm47wxtqnohIQhJJaOR8evoGofMkjiIhiRdQGoZA/sWCGNQH3ZZQ8V0RMUVTfpw3VFoVuP5Z 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)(4636009)(346002)(39860400002)(136003)(396003)(376002)(230922051799003)(1800799012)(451199024)(186009)(82310400011)(64100799003)(40470700004)(46966006)(36840700001)(4326008)(5660300002)(478600001)(8936002)(6666004)(107886003)(336012)(70586007)(70206006)(316002)(6916009)(6286002)(47076005)(8676002)(41300700001)(36756003)(82740400003)(26005)(54906003)(426003)(2616005)(36860700001)(7636003)(1076003)(356005)(86362001)(7696005)(55016003)(4744005)(2906002)(40480700001)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 14:40:21.2915 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 650ee988-c30e-42b8-aa19-08dc27218be6 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: DS2PEPF0000343B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4278 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 --- 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 7ac43f42b8..afd0001e8f 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 Tue Feb 6 14:39:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 136430 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 7395443A3A; Tue, 6 Feb 2024 15:40:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D8C8D427E8; Tue, 6 Feb 2024 15:40:27 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2074.outbound.protection.outlook.com [40.107.220.74]) by mails.dpdk.org (Postfix) with ESMTP id EAA58427E4 for ; Tue, 6 Feb 2024 15:40:26 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aD1UtK2K3J19m9lwqk7s8MU2ZmXYf0O2RpluIXOti/D1LTMu6f7Tg9vQVOstKPflCLMOZOXdVAvHq6dPaW/uFRGcIFHN+OUh0/HImJxGBNnLg6Kbr89ss9WEhoE0cvFcRDLl8uObAA9GuEBE0ySoKspcSbmgfJ0OAH/oWMH5eOYcrZ/QBfv0MLZ1uEmew0tdlRwsEmgWejTuqOrXoSqu3tb6T0lyLDxhIBvcE11ozBoSqMyCDVDrny2ZFL3ohB2A+4MtQrxWL2hodGmMxnaYfP6NeyAErXH5KjmQ3y64YLfyR0GJzYfFKaaSnabYiPJLtqEsPHicKOXHXOVmT3KaCA== 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=EUVYK/RmShgBvrMbfRLbEpA4lNBGLl+Z/kcxVEzL/ro=; b=lvdAv0/0DZJd6e4vjJ4OHN/qMhD0d/w8XXfke5eoqbz8FSK0PaXavW9M6gbzjE0AMSUGvIv/Hf3TZ0lxEhLDZk3oc9uKIVc+/GqwggWVecHIIOrJt0Hw0SKBGupcn0KkVhvwpp0EHy/W6IkhK4PbpZtYdyhoYx1C4SUzGtL6Czck50GuSB/qh8Lb7O5Akw0Pf09Yk0E3Jk/JIW15yCzE39uunRULBIFVlsXWABU9OLIWR2Vr6Ifl8uVYqZkw2e6rYCpBN9YUJ436Du6qmvrTLJuKxvLIl27f8SPJlRUTYPBUWqTp0s7V+9gB6xAMywfC01zh6mCd4KArbrDC0EeGkA== 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=EUVYK/RmShgBvrMbfRLbEpA4lNBGLl+Z/kcxVEzL/ro=; b=Lco0eQNRa+56iQqnRZOvez5gN4sFpq9HENjU4bGKxKbDgcrH1/5U3/QVy2ReEucKCTq6R51R/th/r5QO+bTrvkC3C06CKfYeYlLcSp9VwQCFcG2T8vBofx7HOWAzFFuEw6bz7QamHAvNFX27O5Qv0Ek0rx9deBj39A58GpNeUZZYeKXthRqdPclu+gI+NW7xGCx6zoYTbpSFEI9wxxTAVn5LOLWN7a1jTaLKgm5Xdx74kWP4iEaFOBaYWBRi0GUdGi528bomxizmCfc+BKIbQyn/8gnxhR64poroV4VADKJtj9aRDhtc9k/rFncOGQjNR11UlV1ZvY8TuhDFFZxFSw== Received: from CH2PR07CA0007.namprd07.prod.outlook.com (2603:10b6:610:20::20) by CY5PR12MB6454.namprd12.prod.outlook.com (2603:10b6:930:36::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.17; Tue, 6 Feb 2024 14:40:23 +0000 Received: from DS2PEPF00003440.namprd02.prod.outlook.com (2603:10b6:610:20:cafe::c9) by CH2PR07CA0007.outlook.office365.com (2603:10b6:610:20::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36 via Frontend Transport; Tue, 6 Feb 2024 14:40:23 +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 DS2PEPF00003440.mail.protection.outlook.com (10.167.18.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.19 via Frontend Transport; Tue, 6 Feb 2024 14:40:23 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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; Tue, 6 Feb 2024 06:40:10 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 6 Feb 2024 06:40:09 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41 via Frontend Transport; Tue, 6 Feb 2024 06:40:07 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v1 5/7] net/mlx5: add support for modify inner fields Date: Tue, 6 Feb 2024 16:39:48 +0200 Message-ID: <20240206143950.1499532-6-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240206143950.1499532-1-michaelba@nvidia.com> References: <20240206143950.1499532-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003440:EE_|CY5PR12MB6454:EE_ X-MS-Office365-Filtering-Correlation-Id: efe2184f-7f3c-481c-0202-08dc27218d25 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YxWZKQJ1PojTbPvgcBQqXsEkrTJZldwF5slH5OFnNMqrTRvlEAERgNTrcFdDBNLYkr0iCIlu90skgCkvW7I2uGVs55VwtWJsaqv5v/tpwODQkk5dXVNR347oULu9WPTxf82rBX/PQnMwKajc8erJO6weA2t4jxFRz2honuAZZa59xgsAsPFZQEly0BF+OXqOU/Ow4BJ1BuFxLZd3mdKfd2Glog6z8plEP5ILz8GC+9TddWVqGz8Y3MKMyQE0xcIgnGXgOj5Nqxooovpd5sexAZijQqvEWiHqxEVsDKtUnLh31ZxvXVqqiFOKMxoGPK7rj5lb/T+ZF2dcIKpW94wv9wWF58QQKebzZ/pPZWxhwWf6YhQZx+qZAcxa7/TmuKpWR918od6etBlgVTvaLbvygLuvuV2UyFMxZysqq0WYoVLehw4QinxBg2vmxMwxCReAwljHTfImpCSRhwYn3XPuQmzMrLLRFNIP7xggb93iq+wF/PkybSeVvoq3/76/F4UMnWyl8/l6YBrZR7qoEoM84fthYTTOQNp18fF+q/Ko5Cc7JZlc8qLMa1PDl/mtLvpwvwt9I5nJSCzwqnHP4KDfSSDU7SMBIea828RRy2p0u93My8/eAT0cvdKeovC6e7H6jGI0JQAxql1lbWpJKG7nFyWj/y42HkORBQkaOjgwcjd5dy1RFWqrIMVcbSeI8jOZ0N711P07VLKdcGOs4MHi5ygNtJglj2lVoly+SvL+W3fu9Z2qoTHRXof3tACNrE25 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)(4636009)(396003)(346002)(39860400002)(376002)(136003)(230273577357003)(230922051799003)(64100799003)(1800799012)(82310400011)(186009)(451199024)(46966006)(36840700001)(40470700004)(47076005)(83380400001)(1076003)(336012)(6286002)(26005)(426003)(2616005)(86362001)(40480700001)(7696005)(40460700003)(478600001)(55016003)(107886003)(70586007)(4326008)(8676002)(54906003)(316002)(8936002)(6916009)(70206006)(7636003)(356005)(6666004)(36860700001)(82740400003)(36756003)(41300700001)(30864003)(2906002)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 14:40:23.3622 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: efe2184f-7f3c-481c-0202-08dc27218d25 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: DS2PEPF00003440.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6454 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 --- doc/guides/nics/mlx5.rst | 28 ++++++- drivers/net/mlx5/mlx5_flow.c | 12 ++- drivers/net/mlx5/mlx5_flow_dv.c | 113 ++++++++++++++------------- drivers/net/mlx5/mlx5_flow_hw.c | 130 +++++++++++++++++++++++++++++++- 4 files changed, 222 insertions(+), 61 deletions(-) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 6e1e2df79a..030bbe664f 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -595,7 +595,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, @@ -609,6 +608,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/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 5159e8e773..fa85089364 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2507,10 +2507,14 @@ flow_validate_modify_field_level(const struct rte_flow_action_modify_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 90413f4a38..8454d00d4f 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 7510715189..fc0f9dabb3 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4994,6 +4994,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_action_modify_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, @@ -5024,7 +5149,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)) { @@ -5071,7 +5196,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; } @@ -5136,6 +5261,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 Tue Feb 6 14:39:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Baum X-Patchwork-Id: 136431 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 AB2C443A3A; Tue, 6 Feb 2024 15:41:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 614D842D55; Tue, 6 Feb 2024 15:40:31 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2054.outbound.protection.outlook.com [40.107.223.54]) by mails.dpdk.org (Postfix) with ESMTP id BBB2C42D2E for ; Tue, 6 Feb 2024 15:40:29 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fw4UpZ+R6TGudzBhcIxmcKEoKqN8+gau/oEqiXYvPJ45R+ag2BXyemlRJYBJnHCZOoMkwf+ntHXjEyD0+0iMCj26Dr8YD4m6TbJSj3jOlCXZC3x8TdDwkNmRoyLSq6oXg25spIq2OazOAquuAjCYqoMR5V2ChRnVgvIDnM5GFfYxPiOJhKHlAcUCCWm0L/f08utPPrK1mvBQz4Ymxf96ep2+u8oMceZuUV6JNEC9TsvBb4Vdq+T6klYTpS4fOu/0k5jILNJ8H2Th68iAeFfVw4dYWyE4cvRTlO/bItG4d/z654OHkNkleaQA6V/J6UFh/2mBAsH36u0O5ijWylE+8A== 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=sxwpUoMLrqhcb/ekBCqceEZrUvOBJ/Af6z/uuQylXsA=; b=CCviN+dJNaBSGlticGv4Co7lltPJRTdW3ueLAZHfqsnNEJ93WS5SRwFsQlwHloGCVmH1gocFNCTav+xjwzDZJkp7uCyJ4DttgTx1QeJXtP2U9NXXl1znKjscOTjGi8jNbsjEqQbf1ECTeLkhzjE0lVhSlbAX3nYXg1Zqv/epvw3la4U9CCZWtLxAPXDvXDWWUgulEEd9fsLEDGQ0+QJUfJAI2ppUCaK8VQ4vyme9X2upNHi0sWzsPXvUc0ZgOYUIq0+u8L4NDfXDI5FLZg+hBCOMVi/mI6ybrSSbDHvlEEIkZMcptIKTHcZOzxNwPVna9vjv+wlmVtOwvfzlPD0sBA== 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=sxwpUoMLrqhcb/ekBCqceEZrUvOBJ/Af6z/uuQylXsA=; b=CeILeUpGfRgSPCP5GBXenm1PzumDc4lTS49cYHg2P+RjVH/2EmRGJrpgTL6PieQ2zN0L5o/v8k/Cf2TdnSR3M6eTeL9aZy4AWU1Xr9Ed3H+QWVcfec6NuiY1AdbzR/WwpWE3MlcbXesyjzM9JytMcnSBrPbvLr4DY8MWZE1p+9tn6/qnYZV1V/+PWc/MplVF7OW13YabqPj3S5oV6E/Xk3xZ7f4NYtUBttKCvm/p556iuw4yU04T3qjesDRcfBXVil3Zk3zYM0k9HSfLrgDAnMkNSfqlLrKPSRK0Zab9gKoFpqWwUeWf1+dMWpvjFeOr0XCfnO36Jiyvkg8/ZemhCA== Received: from DS7PR03CA0332.namprd03.prod.outlook.com (2603:10b6:8:55::19) by DM8PR12MB5494.namprd12.prod.outlook.com (2603:10b6:8:24::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.16; Tue, 6 Feb 2024 14:40:26 +0000 Received: from DS2PEPF0000343B.namprd02.prod.outlook.com (2603:10b6:8:55:cafe::56) by DS7PR03CA0332.outlook.office365.com (2603:10b6:8:55::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36 via Frontend Transport; Tue, 6 Feb 2024 14:40:25 +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 DS2PEPF0000343B.mail.protection.outlook.com (10.167.18.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.19 via Frontend Transport; Tue, 6 Feb 2024 14:40:24 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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; Tue, 6 Feb 2024 06:40:13 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 6 Feb 2024 06:40:12 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41 via Frontend Transport; Tue, 6 Feb 2024 06:40:10 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v1 6/7] net/mlx5: support modify IPv6 traffic class field Date: Tue, 6 Feb 2024 16:39:49 +0200 Message-ID: <20240206143950.1499532-7-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240206143950.1499532-1-michaelba@nvidia.com> References: <20240206143950.1499532-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343B:EE_|DM8PR12MB5494:EE_ X-MS-Office365-Filtering-Correlation-Id: bb18fe2e-1bb7-4d39-4141-08dc27218e06 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TO+sx1t0mX0Nrkyl6Q1+JMrNw5M2HSK+T4/n/poMv4ZjYuXc3LkDeSCHb1iKpZIDPdsciIjlZW4BNN3ArrOtXx99x4i+rPFcZgfSGnj4kODQo9oglN1eEup+G/GwHphg6Cx5gOsN1WEMa7SwEoPSCYH/3POXSG5qqIzQKaJQ7fI4v7mXuzLMa54IVkNLEj0nIaxIeiv9f3q5WkQVcx5oM8apkpAkl5oNfQDzhZUux86/rvQbjM6pFyEiIsw7OangAZn20DPErndHfKPIxAwk1TogjN7X9Sd5t7SFQoWVlisXnV5LWmi7MM5NUX8tl4rQHsFVVCLazhtsIS8sD/HKTeRB4WlNCzavtzJVTnfSwtaP7nCqFWYVOF+PsPEmvvcbnORW5hM5i+deSNubCYtCxupS44iHYKpMWC6SvUMTvaDMH72ks6NBAZrVOwv5pmMlC3NufzzTKDHgZ5CjKLqx6fyG1WIMrQ5gwOsctx/iSehT3+vpbnc/kz7vAa+tirmhXr1cUdM/eXSzbgjNPN/WjfwqNCWhbdNeqJTwSzsGRuwubV/tk7p4HJsCxuUW5OOgMl7SI0kRjP685k9OLy/Hd3va8sRwWO/X5IHoYt9tpRWzK2iVA7KBdJgQqtPwVzdnQzZ1tNNB8BaKiy24IS5lqeAKOg+e0l1hI+LwmADjzbX/9ro4PAeURFS5EnzLSS0VYEqx5gnd8UkwUQl6mx7VTU1CglUfhHzsZXcGgukdh4oqEkX4IEHsRPIbxcFNiCiK 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)(4636009)(396003)(346002)(376002)(136003)(39860400002)(230922051799003)(1800799012)(82310400011)(64100799003)(451199024)(186009)(40470700004)(46966006)(36840700001)(40480700001)(55016003)(36756003)(40460700003)(478600001)(7636003)(1076003)(107886003)(83380400001)(336012)(41300700001)(356005)(426003)(82740400003)(6286002)(47076005)(26005)(2616005)(70206006)(7696005)(6916009)(2906002)(4326008)(5660300002)(86362001)(54906003)(70586007)(8936002)(6666004)(8676002)(316002)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 14:40:24.8383 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bb18fe2e-1bb7-4d39-4141-08dc27218e06 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: DS2PEPF0000343B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR12MB5494 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 --- 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 10268b7879..272bc9d056 100644 --- a/doc/guides/rel_notes/release_24_03.rst +++ b/doc/guides/rel_notes/release_24_03.rst @@ -100,6 +100,7 @@ New Features * Added HW steering support for modify field ``RTE_FLOW_FIELD_ESP_SPI`` flow action. * Added HW steering support for modify field ``RTE_FLOW_FIELD_ESP_SEQ_NUM`` flow action. * Added HW steering support for modify field ``RTE_FLOW_FIELD_ESP_PROTO`` flow action. + * Added HW steering support for modify field ``RTE_FLOW_FIELD_IPV6_TRAFFIC_CLASS`` flow action. Removed Items diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 8454d00d4f..90ef21d75b 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 fc0f9dabb3..90e3cf2555 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -2871,7 +2871,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); @@ -5058,6 +5058,7 @@ flow_hw_validate_modify_field_level(const struct rte_flow_action_modify_data *da 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 Tue Feb 6 14:39: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: 136432 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 CB9A343A3A; Tue, 6 Feb 2024 15:41:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4929F42D2E; Tue, 6 Feb 2024 15:40:36 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2041.outbound.protection.outlook.com [40.107.237.41]) by mails.dpdk.org (Postfix) with ESMTP id 9E1B642C24 for ; Tue, 6 Feb 2024 15:40:34 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dg1tguTkjsAUHeEpQOnIhS2Gh4o6QBeiiVn5SaqTZxezTdxaBeYT5ylBpP46vrfW4x+zbHfGd9wyGe+FLZQpmoCZ04Qa5SvYt6rqL9kjt5t5q2JDp7VL4zHwMUPHwbzw2fC8RCTqe52L3R6hP2gqfu042axmyHmSeoATJR5yxBpH9ajLpk1Ew8Se9v/ayU0ebNfQD0z8pY7bV914vTBHUTs34cUvwzBFvJFvJaschyKb+m1CVRA5sUlJcWItuX8USjqyj/y/QLlqrR3fms7um4zOKWkLWQDz9YNJfrnJ0fon0a0i4DiAnmUAPZjD57m54lHV86GIWTViOYdiIIj5ZQ== 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=NPKILEXOfqjJmNqBYU5IBcRVY/hGAafA0+FZJV17e3Y=; b=LQvP9Jh+7/7XuUxx2/EhYZytjFmN1Ic8guTrPYqA/jV8Zyt5eP6IWdyoZdFm44GHLEh4YofgHuZzPWPqea0nlzF7YF+16PaLIBPwblTAWPGRHtkM/zvLmpQPUW9q1+5n2yJYpokI7TIZLrZ+vK4Et/oycqo8Kpq3yAV4qJScpocTU82wB/5SUTcR5dOkZR/cIJKoaKNuEId8QEOUscPyMMfvgbe1HxEl/M9XUgQwrUOzXReq6iYQ8D5w2+4aid1YD169P+p9Dze3BffDxXXzzZ6WRlallCwxQMDdNIuTiEMNNPJwWwYy6vKqJ1Y0oJ3PngZtCiOcNQuRJH2bsvrkNw== 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=NPKILEXOfqjJmNqBYU5IBcRVY/hGAafA0+FZJV17e3Y=; b=eZTqKTCG8EKYhqmAFnD3HfMDZT53DpeSZESfF81r7d//bK20OSpMh9B/MxYday5JuJAyJn9FV4PZ29MMNYAlUCf+vco+/zb+0KuyvafSoi8hJE9S/05pVo6NcsfxMOJ5gJuaYnUwxH80na4bgY+eF26d+4VbBZzdacxCfXsliOwEul9Ozuyejwt6C5dmUSIjlWeLbMWE5r1ZbMDk5IjHByXPglFDBK5WTDVhlxActfiDx7yor/+YvRnCM/921ScCJRAkfdqjlzVlxa7yIMt49VhKCjrdCMexLmxuF91voAwCQDA7WRzjIU13sTIEL9IppeWqlJoWnkc+oCs+sE0GZg== Received: from DS7PR03CA0334.namprd03.prod.outlook.com (2603:10b6:8:55::11) by SJ2PR12MB7848.namprd12.prod.outlook.com (2603:10b6:a03:4ca::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.16; Tue, 6 Feb 2024 14:40:28 +0000 Received: from DS2PEPF0000343B.namprd02.prod.outlook.com (2603:10b6:8:55:cafe::c5) by DS7PR03CA0334.outlook.office365.com (2603:10b6:8:55::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36 via Frontend Transport; Tue, 6 Feb 2024 14:40:28 +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 DS2PEPF0000343B.mail.protection.outlook.com (10.167.18.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.19 via Frontend Transport; Tue, 6 Feb 2024 14:40:28 +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.986.41; Tue, 6 Feb 2024 06:40:15 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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.1258.12; Tue, 6 Feb 2024 06:40:15 -0800 Received: from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41 via Frontend Transport; Tue, 6 Feb 2024 06:40:13 -0800 From: Michael Baum To: CC: Matan Azrad , Dariusz Sosnowski , Raslan Darawsheh , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v1 7/7] net/mlx5: support modify IPv6 flow label field Date: Tue, 6 Feb 2024 16:39:50 +0200 Message-ID: <20240206143950.1499532-8-michaelba@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240206143950.1499532-1-michaelba@nvidia.com> References: <20240206143950.1499532-1-michaelba@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343B:EE_|SJ2PR12MB7848:EE_ X-MS-Office365-Filtering-Correlation-Id: 01fd0d11-0a47-440c-8a24-08dc27219017 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oslBwsMEaGaqlDmqRAVBVOpIB8trrB1t16Y6ekwupRft6KG7jUcP2pysUglFkGuPYaha5VzvAEenC/nKnL3qaorVmP250OuN/W1+7i1hS/u4wKn6rXpCWh4esXEapmcYP2dgYOfpCJLGleNMKpgWKZrD2SIzjnow8+HRze0AvgCLL0Y+aV1C2XRgorSmUzTo7g82ulDSrG0Rqma6SrlsfJVsn8OAduvMEfrOQ26W7D6ATN6SX1yziRO+zuITXMuzrp0b3IkSih4nINSfBYXupVPi4R2qelaKevg1ZtvofkllXf4UDOvHLWR+c4RAbnaqmz51H3ydomBWwqH5PvPjdDcQqR8bi4OxEkMJX6oN1IAjVvVaWQ9i9Dik4eaNLn108WGv5luVmMXNAmV5astoeHBJsqKL0ZcPN+A/42dZV2eoBjnz2JJg4QJOlyLdagffYDq5G6k/57tOIH+ow9ZeQ1KpACjZYywFDz+rB4YRKgcxHy+RC6XgTVyM1fMYGXgqydCSHjiSexooNwRAjXTNDKLuLE0h9VAftX83nrXdwQypVQr/T4UpafY/6rH4N4oDydXCd7LEps1mP/e8N1pc4AxPmskyO0Toc7a+fxqDrdhEv0LxFSPWCMv063yOUrKMIxdhFzNUu9wNOxEU+rVdsvSODkHDQS7sKK0w2RJQjkpufv9dVGUmoZalboMZNk1tbMOxORAfY/QAY/kgQG0aa9/89ldWMY7YDsQEqrvIYygifPW9Vl68YqXEUl5XbEFL 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)(4636009)(346002)(39860400002)(396003)(376002)(136003)(230922051799003)(1800799012)(82310400011)(451199024)(64100799003)(186009)(40470700004)(36840700001)(46966006)(82740400003)(2906002)(40480700001)(7636003)(356005)(36860700001)(40460700003)(83380400001)(86362001)(55016003)(2616005)(6286002)(47076005)(1076003)(26005)(426003)(336012)(107886003)(8936002)(6916009)(316002)(36756003)(5660300002)(478600001)(7696005)(6666004)(4326008)(70206006)(54906003)(70586007)(8676002)(41300700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 14:40:28.3227 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01fd0d11-0a47-440c-8a24-08dc27219017 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: DS2PEPF0000343B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7848 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 --- 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 272bc9d056..4cb45ba439 100644 --- a/doc/guides/rel_notes/release_24_03.rst +++ b/doc/guides/rel_notes/release_24_03.rst @@ -101,6 +101,7 @@ New Features * Added HW steering support for modify field ``RTE_FLOW_FIELD_ESP_SEQ_NUM`` flow action. * Added HW steering support for modify field ``RTE_FLOW_FIELD_ESP_PROTO`` flow action. * Added HW steering support for modify field ``RTE_FLOW_FIELD_IPV6_TRAFFIC_CLASS`` flow action. + * Added HW steering support for modify field ``RTE_FLOW_FIELD_IPV6_FLOW_LABEL`` flow action. Removed Items diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 90ef21d75b..418e0c0998 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 90e3cf2555..90a06e7b44 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -5059,6 +5059,7 @@ flow_hw_validate_modify_field_level(const struct rte_flow_action_modify_data *da 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: