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 C9E3842DAE; Tue, 4 Jul 2023 18:06:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6F6E842D16; Tue, 4 Jul 2023 18:06:29 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2072.outbound.protection.outlook.com [40.107.92.72]) by mails.dpdk.org (Postfix) with ESMTP id 1161342D31 for ; Tue, 4 Jul 2023 18:06:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FA2V6rR3BTjTHyrIxieT9d02Kn51KCDXnbpPyeOl16ytDzWHBaw2e02GEOGbgdWZkODHeMIvIfr9Jd0LOGqZn7QKbATPdn6ynAh5ZqIymObUAFYOMyLTSHDcqxRvBIFsDjhO8MnsJjFS4S2pGYaNQHNZeRiF6xfqyBx61rWpbtrU+ePv5KdKPNGT7eCrrmVWnqXA1e08e6oAs6S2fYmVC0dro5qM9gETk4vj04fMn4PX4v8K4af24Ssq60jXCKzwBMTnzgjf1tPPbLzSCtJwWvXtJCCbR5glLRlmTm6WRG6Mx1aemy+2QNYS+WaRDtUNb20H1pIgSWP6rr9oE1so0w== 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=W8Q9wtRR+DnMQ58q6GC3842cteYDrz2eyH9ufcUf8Z9/arDqKpWtUVRzBLlVo4LWjO17P0QaZySMPwyzMORtkGJlzNdnCyRlhYBfe7gtkX1H5RHIihMS36DY0idvekw0egC6V/efMSNjt8190PPg/V5dQZdI3w4Bw53aStmZkU8UYtYM8SKh/WUWxhTsBUVL8HEh0AGdCZeEVv47CvQdVZvTokFbrPdY3dr6kOSyU2HA5l+0wKwh9pPVzrJLRVHVOylLB/cb+t3kyHR5YEHAFEM8XBesZ9M9RGhtEiiFntYir7+zlon0r8nSmIOyzEIZDXjn+FUSMRwgLR4i1kx1fw== 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=WI75l7Ah6JM3LXEhRde99HHJ/r2LjJMdeNKvNjYQ7QXzRY4SAnewwWc9nG788VC9WHyOXQjfW2bgzc51PyZJPPQ3jgGe0H1/K2dnq5zA79Fdy1FTXsHXJliMjeiFBHRzp9VZBXefO56tmmCNNG36za9+1GrmeTU+4fLur6QXpUsdsO7zz/yy3zYDTr47gyLVvToMDFf0LHAPvILheXV1wmoAznMGBRd4csXMlWjymHf4xX8XpvQ4yk4irXtLxqBvLR3jo6ZoCmAGGwatCE7LzIwK2hTjsuoYM8lwfJyWJSIndFnZjDMlfwzIxsTvCChLrQqqSEzaNtD7G8XvBYLlLw== Received: from DM6PR07CA0098.namprd07.prod.outlook.com (2603:10b6:5:337::31) by CH3PR12MB9342.namprd12.prod.outlook.com (2603:10b6:610:1cb::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.8; Tue, 4 Jul 2023 16:06:26 +0000 Received: from DM6NAM11FT104.eop-nam11.prod.protection.outlook.com (2603:10b6:5:337:cafe::f9) by DM6PR07CA0098.outlook.office365.com (2603:10b6:5:337::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.30 via Frontend Transport; Tue, 4 Jul 2023 16:06:26 +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 DM6NAM11FT104.mail.protection.outlook.com (10.13.173.232) 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 16:06:26 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Tue, 4 Jul 2023 09:06:16 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Tue, 4 Jul 2023 09:06:16 -0700 Received: from nvidia.com (10.127.8.12) by mail.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.986.37 via Frontend Transport; Tue, 4 Jul 2023 09:06:14 -0700 From: Itamar Gozlan To: , , , , , Ori Kam CC: Subject: [v3 4/5] net/mlx5/hws: renaming FT to TBL Date: Tue, 4 Jul 2023 19:04:52 +0300 Message-ID: <20230704160454.4187-4-igozlan@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20230704160454.4187-1-igozlan@nvidia.com> References: <20230704104645.19800-5-igozlan@nvidia.com> <20230704160454.4187-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: DM6NAM11FT104:EE_|CH3PR12MB9342:EE_ X-MS-Office365-Filtering-Correlation-Id: fd959860-7028-429e-6062-08db7ca89ec6 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: TYkmW7q/+t9oAl6xR14JOPrzkO7NnDRqqc3XChlUiLswX0Sk0ZPlF4zSP+CCBSwxDsFJlcGEdUS87BAn9Zhw+VB4QQzxJb8GJfa2bu5ypJNnlIBHCUuPPMeH/EAN8eC2azHfT3OauA5Lcd3yR46EBp62LZZ3ssxHKOV4aUszfATZJdsFJyoP6GASk9ebc4rLWvN/5hrwvPJoUdIjgSpI/cJMajTfZBdWgJ2Kt+vd72uGXFfXIdsANCFiWfBKtnqqRQ24TjgZShMcdmDdzj4ecw9aIGorf3CVE9hzH6S9RKOQmhDuMnJ/VvMEEykM55ZWeZQDBQ5Ityy48j7pjcyoM5CgYiwe9iAciSM9HJezaAmGsd45E3DRBSel5jjTnmDAXFFcq/C7NT7EbmjJahiD0q1uxFnmfDSDDl8MQxjXwRu8r5bBjlIzhsXk5Hp1Rolar7q7cmNhbYYuWngqG44ppma+yd1mzLLV4UU1glg/X/vXmHH3lj4NoZ5t4RuQ3Uob3wp555gO7sqIGcnGO4t3kirGsvVke8q2+t3ghoVDFCEnQL6/Tn9YGGX9UGpDnJVuuPuegh7fqwMrVa/6VKE5A3AGSBzHMZ3s+oeKTAn1leARjK6qDACOdTerTxhVB+sTcKL/3ahWROQIUZgXvtm19Yq4slfTqGOx2o85VfbIbVzUWKgSQgUYLMPddyIqxPj9YP7SkFIoklOw4qQUbUjXWzSLpotU8Aaf9ozS77R6TJO78rs2HmP/PVQFqFrSxcFM 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)(136003)(376002)(346002)(396003)(39860400002)(451199021)(40470700004)(36840700001)(46966006)(26005)(478600001)(1076003)(6666004)(82740400003)(86362001)(2616005)(6286002)(186003)(7636003)(4326008)(6636002)(36860700001)(70586007)(83380400001)(356005)(336012)(426003)(110136005)(70206006)(7696005)(316002)(47076005)(5660300002)(8936002)(40460700003)(41300700001)(2906002)(55016003)(40480700001)(8676002)(82310400005)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2023 16:06:26.1645 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fd959860-7028-429e-6062-08db7ca89ec6 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: DM6NAM11FT104.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9342 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