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 6E45D42D88; Thu, 29 Jun 2023 09:27:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 135E642D20; Thu, 29 Jun 2023 09:26:50 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2074.outbound.protection.outlook.com [40.107.92.74]) by mails.dpdk.org (Postfix) with ESMTP id 348D341104 for ; Thu, 29 Jun 2023 09:22:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ShxexqFuZz1iAzGX+qfcO6t2VyIkTtmj3SbUwIuZnxK+E8DTEm+ooCFR3MQ9fkV8KBMeCRiiFBIntQqLi5lPSbVWs6K7GFX7A2AfXpS8Zt+d4KebZcrdvoUNpayRNeDZM93AOdsXWhtWfY3/MS01Z8ZoxSoRbO2JL7/ZKFY2tTWpSaIr2tuYMe+wMQqEf1CsnWAph6huFlh6DPhWgMlPM0G5vmwFmea4ULCHWUvmt9fUeJ5kBG60KQhjtDwKd80rjND396YY69Lj8bT5FP5vShNfMIDZLrzhLVdfvyq7yOTSCbFgCNGNtULEMQkziy+jrlGXcxEe1wgwFJI/gqLdgg== 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=X7R8/Iv9jPkmZRAe7Yrbf2/pexYuzvoiQ9cTzIcAd+w=; b=NduZKxVuKbHvPBCBkqWNeRpet4qX8KpFgXs+NpiCU+5+8wM3yuNg2uN4qFyZkZSeF9+o2BMytSY2KGPDuyfpJakg/TJHuz/Op6h7bL/DEdEYGh108aYocorjPygIlK9kGtLCtNYr4a/qZYZafK+GoubjSIs10PYFAG6XTKJ5gNjUvaslL0l1DykR0ikKAjg7K4W/EdNAL8oClkBc9iRp8AAGKHrUKm016xygwFBm0e9xcKSt+nTSvIDtuFphhXeEewxfV23rWR9HSbpSZuoVseHrGkcztzpqJfHeoYjNMgPMpYOWLi3GyUvsiCwmrINNRCGou0aNtFY1orbGUeP/Kg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=X7R8/Iv9jPkmZRAe7Yrbf2/pexYuzvoiQ9cTzIcAd+w=; b=TndXEJmzpFd2xUhteDhrpzReI8D8rwPLa/o11Fm4VLex13Lahu56a4hgZnUchA7XDtC36+Y8sM1LndBM5L0UpalWb4YlolcvEFty5+Al6wuvStdguMTkRIVipGu/1zG++nM7w6JjoxZwPV2FvFlLbcT8GpVD3yUKOZ+KOslKaHEJe6WWYgf8G9ciZW70ejhu588+IY2tthS8226+H3rnZLVK9HYk4ZzXR06KYM2Qw09Br1bysC1QbPQ/t+vr7RAAjwQzBCF4xxqUkHWbpLnZYHZUOVPIqSa/2waWhgH1PlZCv0eexkAQk5ewn2XvNoDVG6fzA9rKMVrauIaEiiu4Gg== Received: from BN9PR03CA0296.namprd03.prod.outlook.com (2603:10b6:408:f5::31) by SJ2PR12MB7918.namprd12.prod.outlook.com (2603:10b6:a03:4cc::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Thu, 29 Jun 2023 07:22:20 +0000 Received: from BN8NAM11FT063.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f5:cafe::e) by BN9PR03CA0296.outlook.office365.com (2603:10b6:408:f5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.34 via Frontend Transport; Thu, 29 Jun 2023 07:22: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 BN8NAM11FT063.mail.protection.outlook.com (10.13.177.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.49 via Frontend Transport; Thu, 29 Jun 2023 07:22:19 +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.5; Thu, 29 Jun 2023 00:22:03 -0700 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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; Thu, 29 Jun 2023 00:22:03 -0700 Received: from nvidia.com (10.127.8.12) by mail.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 via Frontend Transport; Thu, 29 Jun 2023 00:22:01 -0700 From: Itamar Gozlan To: , , , , , Ori Kam CC: Subject: [PATCH 4/5] net/mlx5/hws: renaming FT to TBL Date: Thu, 29 Jun 2023 10:21:24 +0300 Message-ID: <20230629072125.20369-4-igozlan@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20230629072125.20369-1-igozlan@nvidia.com> References: <20230629072125.20369-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: BN8NAM11FT063:EE_|SJ2PR12MB7918:EE_ X-MS-Office365-Filtering-Correlation-Id: 60bc6758-25f6-40a1-98db-08db78719317 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: jAeRsP6jlh9VGJ15fJYwqpbIxEcl0+MAHkoTLMNib+8Pc8FefbnSQyvAtz2CdI+/0WHjc8bDqr/S3wLYJ9UjZZlz/4ohxs71l7PDud66SJkQ3wzoPTQJOau0RUbbPZ4aANfETTw5xSlicGjpnz2gi50bLXK6rhxywG+DwGau7aV+VtTTyXGoNFSrtWBC7jOc9VgI6lsJrh6nNZSYE+0nRonQdxBVDXU5IyQYHl7S6YeR8cJTKhnLIuCBviQ1zNEtppp2A2u4VD4xwfUJNpn8yzM2iE+s9wdr53cUneAjHD2ieJ+sqSBjzdaKIS+7MMTI1Ud+tiSZhpnqKoMrud6s1+t1F7kFJj/PENAtDzgB8UPkL7BUzvmn2lCShFGpsKEcokmeFKYIpOPy7VyWc7AyfVQwFq9aYu1roAOQ4zIoVVXBPtdy6VeaQiDhC7elJw+8AY3zgVyB8NLCC2nOLIAIm3+/sz39+1mvUTrbs2CsRd2alqX6bNKZ83I112lXHDBROEIY6wZ44mRKtmz0/UsHPiNbhsNGRnFLq6g8+on721i0LDvlH05z9avN+736UDQQYNkhNbTYEVnOlYUr5hXSJRsrNlBLNgegEATphpRs4MqeL/Cj5MFIS7wYhfk2BJ8ODEQmYKMitUUdGpab5IeLfKv34dgWAaHV98mbCR/nWubB2qaoLHgLgdvvPkTli1GFAh2J9k1kEk52SpRMKGS6lANSXtdeBH1s3fsjytuO+6i7dhDfPNxQiaFY1N60UR9a 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:(13230028)(4636009)(136003)(396003)(376002)(39860400002)(346002)(451199021)(36840700001)(46966006)(40470700004)(6286002)(5660300002)(2906002)(26005)(1076003)(7636003)(356005)(82740400003)(83380400001)(2616005)(426003)(47076005)(336012)(36860700001)(186003)(8676002)(41300700001)(8936002)(36756003)(316002)(478600001)(55016003)(86362001)(40480700001)(4326008)(6666004)(70206006)(40460700003)(6636002)(82310400005)(7696005)(70586007)(110136005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2023 07:22:19.5617 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60bc6758-25f6-40a1-98db-08db78719317 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: BN8NAM11FT063.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7918 X-Mailman-Approved-At: Thu, 29 Jun 2023 09:26:43 +0200 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 --- 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 e274fbf34d..bbe0c5ec8a 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4514,7 +4514,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, @@ -4659,7 +4659,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