From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7CBD842DD1; Tue, 4 Jul 2023 12:48:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 67FE042D10; Tue, 4 Jul 2023 12:48:35 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2089.outbound.protection.outlook.com [40.107.244.89]) by mails.dpdk.org (Postfix) with ESMTP id D4BC242D20 for ; Tue, 4 Jul 2023 12:48:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A7OAKW4GmQStcuLvjKiNQ2kGfT/vO7uc1Ljv5GrCx9UwOaJZKrv2CNhMRHV6Bx0uqig04Zz/lNCD1+UvpAd44IYNplJkWNTE8Cbx5IZeSDbwiERIdVWwYhNSv9AJbcIgtXc3yJgAlR1dZWNUJep+NEypEc1jFl9NXyW+K7FtW2CIBrmOxUNjSK3w/P4ZJ4ZjosLyxUhlJlP0T4mOanyWhAMS1tjkj8u7m8TJgz3aVwKc8iw+aX7i7CIX8Kd4mzdLMA1YoK/vyDiFjwC3p3acIKVQ2zXRku7NLQm9y6OATRjeA5Org8nSQlyskVdPg9gR/XUhNpee/bVVs0SBy+cFWQ== 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=GMxZjpBQPQZmU9nbtVcE/zi/wJ9+03qTuSLVyC82A+w=; b=RFV3AUPjOyQy+spSU3JE7HSPsIGp3VOcdVBPoj9LIXydO8SX8tMxSVt+saAV+KhPim31kGaDq4EMln/0wNaO0vJY6AzkqtNnwcdBGnjqOldesD5+PyIQdmhZPT3BpjVLhB6pg4viS8/CEd2nZElINC9heVhwchBVHgqje+YBZXFcGfdwYfc5jLjoqG9YCWAhGoIxHEvIdtM3LQd5eA5jNGAYoeZ1HopuqVekU75ggCIjCXXdcJUQH/XHARnse4e+eaVsY0azMdeYSev5TEoOeQX7JETiA4HACECK5mTIkSVqoDSJIibYPXXCFnuXpWhwrLgh9dn7b+dt9CuhOqLvHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net 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 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=GMxZjpBQPQZmU9nbtVcE/zi/wJ9+03qTuSLVyC82A+w=; b=Zq4aKb1g4scA2fm5Nyxpwb//xn/I/IwS08SS3Y2aufa3gs6GQThhsqh7PVhV8+8eiZPEGRr6PVrjrCEP7eIDGSjqhXS+Pj3109gvB7DwbeCPVpEnqh3tfTebtyVI4OCnFp1m7/GCrlEtJzH2yFh9cXP97ErrUQ23cIs9fiXCralIg3kHedNmnm/iDz+bCVAA0xR1aiticxMwGcZphc2wkA5N6xV0xR9/vStQ15OV1+S7JWttbdJ5TUBvFkUURarhIOxcXcWNS21vbPWiCnWsmCKr8TZ7YvpjOpSt8seyJXRVLaeIliFRlx82SYgxGw+hkYD/qZCf5sSTSUbDgLSGBg== Received: from MW4PR04CA0303.namprd04.prod.outlook.com (2603:10b6:303:82::8) by DM4PR12MB5842.namprd12.prod.outlook.com (2603:10b6:8:65::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.19; Tue, 4 Jul 2023 10:48:31 +0000 Received: from CO1NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:303:82:cafe::7) by MW4PR04CA0303.outlook.office365.com (2603:10b6:303:82::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.31 via Frontend Transport; Tue, 4 Jul 2023 10:48:30 +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 CO1NAM11FT019.mail.protection.outlook.com (10.13.175.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.44 via Frontend Transport; Tue, 4 Jul 2023 10:48:30 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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.5; Tue, 4 Jul 2023 03:48:19 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.37; Tue, 4 Jul 2023 03:48:18 -0700 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37 via Frontend Transport; Tue, 4 Jul 2023 03:48:16 -0700 From: Itamar Gozlan To: , , , , , Ori Kam CC: Subject: [v1 4/5] net/mlx5/hws: renaming FT to TBL Date: Tue, 4 Jul 2023 13:46:44 +0300 Message-ID: <20230704104645.19800-4-igozlan@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20230704104645.19800-1-igozlan@nvidia.com> References: <20230702045758.23244-4-igozlan@nvidia.com> <20230704104645.19800-1-igozlan@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT019:EE_|DM4PR12MB5842:EE_ X-MS-Office365-Filtering-Correlation-Id: b7418193-9730-46d6-0ac6-08db7c7c34ae X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yo9p884FCbnVYNU+NhqD9B8KNLALtPCrhc0YLvMjDtuy5EDr4RDXbo+X/5Su5LO8YqCOMM6F1KAUlw7bIJbOuwuvhq99cdBGTNb40gvDVsaD47dQU8KTEHDEp+aFGcMslkhDi67Jd7jfx0+0HNDJBAE2mEN241cGAKH+Y4lwJGX6Krs2wUxVdWVwoCRJPUb15eC5au8DN47z9zQmWhOHPPrAExoXaEiBhZzwyOsv/KiFOtNfoKSFXeyxPm9FzMQe6xKxtJeiwsVQllkf6YVBLnINi9srI0q/nfKbCqzC6N9pBpSJXABxibxeO7wTs8v25FWBxfIuvu9khmbi4x9E/DxuyoO85Rcn+7PD1p2UuNRgGdznE3nRW+ohdGJh68KfEoF9G1w5g19i/5vjTVV/d8tOtCzUOk541oRUai5dxy4N9yrXQiFDhfBHHn8QP8jXtt8WZ9det66Ot83OCOp/HUYCGpR1JhloJ8Cew3vYvy6M2bOyYx4oV1sRmsfv+jCsHxWssMkeCxe0q544w7a8N/d7nh0w1w9J7Z3BSy2mnDx2Rnyr54VsVcjwxNZA9UsvB8EOUFt8Zo8iKeNLm3Nxx9IpOdQ1uZXIm8dzmgesCNjuGSEkGHjuFJPTKmvi4MYapn3vlGK1BiSEMPdj6vn84IsYO18IVowrNZm4U3CE/oHJno5bAhG6KMkI9egTsx7rMzqeBnGMqLkfZWDU9HE5PmD9Ude0Mb/YEJxFNKFnbGWIXv8k2w01n+EkzsrV++j6 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:(13230028)(4636009)(346002)(396003)(39860400002)(136003)(376002)(451199021)(46966006)(36840700001)(40470700004)(55016003)(426003)(83380400001)(40460700003)(336012)(47076005)(2616005)(2906002)(82740400003)(7636003)(356005)(36860700001)(36756003)(40480700001)(8936002)(8676002)(82310400005)(110136005)(5660300002)(86362001)(4326008)(41300700001)(70586007)(6666004)(316002)(70206006)(7696005)(478600001)(186003)(6286002)(6636002)(1076003)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2023 10:48:30.3104 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b7418193-9730-46d6-0ac6-08db7c7c34ae 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: CO1NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5842 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 An action naming change is made to describe the action better and avoid implicit meaning. Signed-off-by: Itamar Gozlan Acked-by: Matan Azrad --- drivers/net/mlx5/hws/mlx5dr.h | 2 +- drivers/net/mlx5/hws/mlx5dr_action.c | 16 ++++++++-------- drivers/net/mlx5/hws/mlx5dr_debug.c | 2 +- drivers/net/mlx5/mlx5_flow_hw.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr.h b/drivers/net/mlx5/hws/mlx5dr.h index 7d5af4c9bb..ec2230d136 100644 --- a/drivers/net/mlx5/hws/mlx5dr.h +++ b/drivers/net/mlx5/hws/mlx5dr.h @@ -35,7 +35,7 @@ enum mlx5dr_action_type { MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3, MLX5DR_ACTION_TYP_DROP, MLX5DR_ACTION_TYP_TIR, - MLX5DR_ACTION_TYP_FT, + MLX5DR_ACTION_TYP_TBL, MLX5DR_ACTION_TYP_CTR, MLX5DR_ACTION_TYP_TAG, MLX5DR_ACTION_TYP_MODIFY_HDR, diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c b/drivers/net/mlx5/hws/mlx5dr_action.c index 851cee8802..74f4e60863 100644 --- a/drivers/net/mlx5/hws/mlx5dr_action.c +++ b/drivers/net/mlx5/hws/mlx5dr_action.c @@ -30,7 +30,7 @@ static const uint32_t action_order_arr[MLX5DR_TABLE_TYPE_MAX][MLX5DR_ACTION_TYP_ BIT(MLX5DR_ACTION_TYP_MODIFY_HDR), BIT(MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2) | BIT(MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3), - BIT(MLX5DR_ACTION_TYP_FT) | + BIT(MLX5DR_ACTION_TYP_TBL) | BIT(MLX5DR_ACTION_TYP_MISS) | BIT(MLX5DR_ACTION_TYP_TIR) | BIT(MLX5DR_ACTION_TYP_DROP) | @@ -48,7 +48,7 @@ static const uint32_t action_order_arr[MLX5DR_TABLE_TYPE_MAX][MLX5DR_ACTION_TYP_ BIT(MLX5DR_ACTION_TYP_MODIFY_HDR), BIT(MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2) | BIT(MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3), - BIT(MLX5DR_ACTION_TYP_FT) | + BIT(MLX5DR_ACTION_TYP_TBL) | BIT(MLX5DR_ACTION_TYP_MISS) | BIT(MLX5DR_ACTION_TYP_DROP) | BIT(MLX5DR_ACTION_TYP_DEST_ROOT), @@ -67,7 +67,7 @@ static const uint32_t action_order_arr[MLX5DR_TABLE_TYPE_MAX][MLX5DR_ACTION_TYP_ BIT(MLX5DR_ACTION_TYP_MODIFY_HDR), BIT(MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2) | BIT(MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3), - BIT(MLX5DR_ACTION_TYP_FT) | + BIT(MLX5DR_ACTION_TYP_TBL) | BIT(MLX5DR_ACTION_TYP_MISS) | BIT(MLX5DR_ACTION_TYP_VPORT) | BIT(MLX5DR_ACTION_TYP_DROP) | @@ -275,7 +275,7 @@ int mlx5dr_action_root_build_attr(struct mlx5dr_rule_action rule_actions[], action = rule_actions[i].action; switch (action->type) { - case MLX5DR_ACTION_TYP_FT: + case MLX5DR_ACTION_TYP_TBL: case MLX5DR_ACTION_TYP_TIR: attr[i].type = MLX5DV_FLOW_ACTION_DEST_DEVX; attr[i].obj = action->devx_obj; @@ -519,7 +519,7 @@ static void mlx5dr_action_fill_stc_attr(struct mlx5dr_action *action, attr->modify_header.pattern_id = action->modify_header.pattern_obj->id; } break; - case MLX5DR_ACTION_TYP_FT: + case MLX5DR_ACTION_TYP_TBL: attr->action_type = MLX5_IFC_STC_ACTION_TYPE_JUMP_TO_FT; attr->action_offset = MLX5DR_ACTION_OFFSET_HIT; attr->dest_table_id = obj->id; @@ -747,7 +747,7 @@ mlx5dr_action_create_dest_table(struct mlx5dr_context *ctx, return NULL; } - action = mlx5dr_action_create_generic(ctx, flags, MLX5DR_ACTION_TYP_FT); + action = mlx5dr_action_create_generic(ctx, flags, MLX5DR_ACTION_TYP_TBL); if (!action) return NULL; @@ -1681,7 +1681,7 @@ static void mlx5dr_action_destroy_hws(struct mlx5dr_action *action) case MLX5DR_ACTION_TYP_TAG: case MLX5DR_ACTION_TYP_DROP: case MLX5DR_ACTION_TYP_CTR: - case MLX5DR_ACTION_TYP_FT: + case MLX5DR_ACTION_TYP_TBL: case MLX5DR_ACTION_TYP_REFORMAT_TNL_L2_TO_L2: case MLX5DR_ACTION_TYP_ASO_METER: case MLX5DR_ACTION_TYP_ASO_CT: @@ -2178,7 +2178,7 @@ int mlx5dr_action_template_process(struct mlx5dr_action_template *at) switch (action_type[i]) { case MLX5DR_ACTION_TYP_DROP: case MLX5DR_ACTION_TYP_TIR: - case MLX5DR_ACTION_TYP_FT: + case MLX5DR_ACTION_TYP_TBL: case MLX5DR_ACTION_TYP_DEST_ROOT: case MLX5DR_ACTION_TYP_VPORT: case MLX5DR_ACTION_TYP_MISS: diff --git a/drivers/net/mlx5/hws/mlx5dr_debug.c b/drivers/net/mlx5/hws/mlx5dr_debug.c index 5064b23b7d..48810142a0 100644 --- a/drivers/net/mlx5/hws/mlx5dr_debug.c +++ b/drivers/net/mlx5/hws/mlx5dr_debug.c @@ -12,7 +12,7 @@ const char *mlx5dr_debug_action_type_str[] = { [MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3] = "L2_TO_TNL_L3", [MLX5DR_ACTION_TYP_DROP] = "DROP", [MLX5DR_ACTION_TYP_TIR] = "TIR", - [MLX5DR_ACTION_TYP_FT] = "FT", + [MLX5DR_ACTION_TYP_TBL] = "TBL", [MLX5DR_ACTION_TYP_CTR] = "CTR", [MLX5DR_ACTION_TYP_TAG] = "TAG", [MLX5DR_ACTION_TYP_MODIFY_HDR] = "MODIFY_HDR", diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index e1adc081c1..521df9ff40 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4520,7 +4520,7 @@ flow_hw_actions_validate(struct rte_eth_dev *dev, static enum mlx5dr_action_type mlx5_hw_dr_action_types[] = { [RTE_FLOW_ACTION_TYPE_MARK] = MLX5DR_ACTION_TYP_TAG, [RTE_FLOW_ACTION_TYPE_DROP] = MLX5DR_ACTION_TYP_DROP, - [RTE_FLOW_ACTION_TYPE_JUMP] = MLX5DR_ACTION_TYP_FT, + [RTE_FLOW_ACTION_TYPE_JUMP] = MLX5DR_ACTION_TYP_TBL, [RTE_FLOW_ACTION_TYPE_QUEUE] = MLX5DR_ACTION_TYP_TIR, [RTE_FLOW_ACTION_TYPE_RSS] = MLX5DR_ACTION_TYP_TIR, [RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP] = MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2, @@ -4665,7 +4665,7 @@ flow_hw_dr_actions_template_create(struct rte_flow_actions_template *at) action_types[curr_off++] = MLX5DR_ACTION_TYP_ASO_METER; if (curr_off >= MLX5_HW_MAX_ACTS) goto err_actions_num; - action_types[curr_off++] = MLX5DR_ACTION_TYP_FT; + action_types[curr_off++] = MLX5DR_ACTION_TYP_TBL; break; case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: type = mlx5_hw_dr_action_types[at->actions[i].type]; -- 2.18.1