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; }