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 F03F244145; Mon, 3 Jun 2024 12:49:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2904742E1C; Mon, 3 Jun 2024 12:49:24 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2079.outbound.protection.outlook.com [40.107.100.79]) by mails.dpdk.org (Postfix) with ESMTP id 28AC042E17 for ; Mon, 3 Jun 2024 12:49:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fascms4lFTVDB3WzGfOk1G6ysPjyeD1cscVCch4hLZEodw5rLiNCjyihi5BD7jxhDnQPtxOoc3miW1A4QhnOob5W/zfO1BnIpiR37t24wr/4tYtM1c8cc2lOjrrTW3K767dwa6bhJFp5XkxvgGGdBLEChA9nAKELdPNkj7zAdifyePoUPAYocl2oWkZSN4EW1QMcfJxgM93FhCtc5jDe9d3AgTC2Ostu+yZ0eWF9uaCKftIF69IWkQWvWgynHHMeuZjdYB0DvFtMiX6qhCG+aR1IForSI8pJKAd7tseuZ+Xb/CZ6anxfrsSGNVCSb7shqR8ORACW1sRRfyRFaCj7qg== 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=98hQ9qVQOtSg0K1Cns79MdUqTiF6ot0I5079az3DP30=; b=aZTW0/3EbGJfkyUrtBQtjQ/FLO28bBd2x/A/P+jLMYcrKJSQCnzUiAFOqO+QCztcts+zsknH/sGGjF+MmQ46aiaCZEa9M1jwHMMc/O4LxTWnCiHfdAMBPvRvNaakxYGO2C9jEKRZlCvHNWapMmZQS4ksYceuO0Pns3eRISEFTEaMakqacpGTXivxi0NkBN1uq9esbqn1Ft4cLEzmCu2AH/G+2k+Mh0RiwZRIvYiGP0NPSuxOUORpfJzqK/lfV+wEkGKZKvri0LVEgYMqe4eICW4D7Bz4W936OqvbudV+XNJITf1OPdjilATshhAOpvPdV2z9Fivl1gLSsRcGIUggTQ== 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=98hQ9qVQOtSg0K1Cns79MdUqTiF6ot0I5079az3DP30=; b=dSDrDz1i2AK5dX/UsUDkSE6gLdM96dixNtSP7QVbtg7B/HVNEaRMZkDohBPmgDVo8zPbCJ+bddI1edgz9WogTg3A+yPWUqNdb/qe/D8+FjbVcmIMbzxgVrRpG2VADeJ6ZbGWl28I+GRM/pfrS07kkvCZaO4NU6AKvBiWE3T3wGoC/v7mvmwVxqPTdSkQSqmJMa7kx1cCW0MyRNUZrVDiNqraOqL1kgcruoCVQ9leZ1XxjwHyNQ6ALgVkc5CsdWTzeH7QyziVBJvnwV6k7sTk260KK3nhiQMekKpQd+v6/JJZn7D4M+AaSqZC6mCRQMlMaAdZsNlScO1WrwWhDGgLIg== Received: from SA9PR13CA0055.namprd13.prod.outlook.com (2603:10b6:806:22::30) by CH2PR12MB4165.namprd12.prod.outlook.com (2603:10b6:610:a4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.27; Mon, 3 Jun 2024 10:49:19 +0000 Received: from SN1PEPF000397B3.namprd05.prod.outlook.com (2603:10b6:806:22:cafe::7a) by SA9PR13CA0055.outlook.office365.com (2603:10b6:806:22::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7656.14 via Frontend Transport; Mon, 3 Jun 2024 10:49: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 SN1PEPF000397B3.mail.protection.outlook.com (10.167.248.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.15 via Frontend Transport; Mon, 3 Jun 2024 10:49:19 +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.1544.4; Mon, 3 Jun 2024 03:49:07 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.1544.4; Mon, 3 Jun 2024 03:49:06 -0700 Received: from nvidia.com (10.127.8.14) 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.1544.4 via Frontend Transport; Mon, 3 Jun 2024 03:49:04 -0700 From: Maayan Kashani To: CC: , , , "Bing Zhao" , Viacheslav Ovsiienko , "Ori Kam" , Suanming Mou , Matan Azrad Subject: [PATCH v3 03/11] net/mlx5: add basic actions support for non-template API Date: Mon, 3 Jun 2024 13:48:42 +0300 Message-ID: <20240603104850.9935-3-mkashani@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240603104850.9935-1-mkashani@nvidia.com> References: <20240602102802.196920-1-mkashani@nvidia.com> <20240603104850.9935-1-mkashani@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000397B3:EE_|CH2PR12MB4165:EE_ X-MS-Office365-Filtering-Correlation-Id: 801838e7-8527-4753-1969-08dc83bad223 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|82310400017|1800799015|36860700004|376005; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?xTj7BQPEzx+rKqlY1HvgoeRIm6PNbujX7QV6FaM0SZkfWNW9hA4FVSGyTDe0?= =?us-ascii?Q?ZtqKhqk44nEsAvgHGKu6yzuYsidzc87TFpyIEu5ThdVomn9NuYDoXkANjZWw?= =?us-ascii?Q?zMb8WRqoK3NkOn5e1Vaw1cRqm+slnCoGR+tRKCare/lFz23k3ivNylcO1zv2?= =?us-ascii?Q?cq7hyQcvZfJyPGfc5jFfOLCVb5g/qK/quDvRzM/sft3XHMVyqHscgLzLpM7v?= =?us-ascii?Q?PDWZZZUlPDVjwdGvXNvBI3NrH/Irhx8X9XZg0jza8q0FTFYeRkCXXUSnbbKq?= =?us-ascii?Q?t+KF6WqSvLYsJ4wqSj1+pgYKdKU6HsRz3P9dBmLUbOLiA6b8YtOsQV3EaojN?= =?us-ascii?Q?en69n2g+kruo0g9LC/+zG1YiKYe+NFhlFtTB7brFbvd110jMtQ8kscmmetPa?= =?us-ascii?Q?llb//PompK4FxSuoRH0zinFd5mj2xjWWX3HKATAKpNqhDK8H2yfH9Q6VX8xr?= =?us-ascii?Q?DzLeMZo/lHmd5PDb4+JfCRR6T33cX1BfJMW5gRHb3gpgR0lLsw0/rT+6X6On?= =?us-ascii?Q?1rZR9oAKCwpyHXZWZP7Xyvpi8c8ooLoC0+52MpAn4TNOvXoowVrOTnEBGwSk?= =?us-ascii?Q?rxu3SGpUpdBFXZFZ7RO8N3iO6IwtjggWnsT8OmFmpM2lWDqnq/R7W0GstPDJ?= =?us-ascii?Q?uG2cgdbJuu+VuLkzLWh2VmY09KkOefsmVM4vKwpUcYkOoV8+JPPEOsTau5fN?= =?us-ascii?Q?eGxtHdXNYOawH/wWiWFg9JpIBw+PjN8YY6UQwjBdaztPAZN+HE9fP3JVCBAT?= =?us-ascii?Q?6jkQsdD66umkAxc3QgQ92h41uqIn+7quX/duhXs20OOVCZ4ajBp7/s2+Nt/O?= =?us-ascii?Q?zI9skwzaf1fmccRDGR3qXb/f4SbH33qGhswUb92eUi+vemFuFL1FTfO8kXne?= =?us-ascii?Q?wuc4urUfMVP9i6VSQc7PYkHnYLldThtv3Q4rYUNQUJg9bkhmV7zfQSCqZnaa?= =?us-ascii?Q?t4IXf9/Qe1wtIwQFQ12YXs4/vvRuN1/oJgzTIOBeePI+0bkhMcQk5YY1+Et5?= =?us-ascii?Q?ykv8OA108obL2fzDOUrL7Un7tdkpv+eHlqaZSLPQCviL7Z4cwTQaFnQfgkqm?= =?us-ascii?Q?48+qXCGvmyQeEy5CWSotjGGEhe8sER9GsoDcbe7yIW+OaeMv5u+tI4BdFs4A?= =?us-ascii?Q?l7SYMyJ8cXpuDuSlMj36QoCgetUCz0WRdiXFz/HweONrVBD5UVNqYy1gSnep?= =?us-ascii?Q?kPBQFiraAXLGdkVT+b5uOIJ/Eg4dBtxRvkrc/T1Osj0d+xfEpP8rEYSeAQk5?= =?us-ascii?Q?SaqNHiWX4FK5tuRTd0K34bR1aEX46exqpsDlSVS4vxXt6gxVDMwNARWh/jiw?= =?us-ascii?Q?HHCLuGLOZpF0Rt4DIdec7OhZQFg4RBP+JO4F5LCchTG3TrV/p7y/lWWQNHwj?= =?us-ascii?Q?OmREDuw=3D?= 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)(82310400017)(1800799015)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 10:49:19.1032 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 801838e7-8527-4753-1969-08dc83bad223 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: SN1PEPF000397B3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4165 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 From: Bing Zhao Support JUMP / DROP / QUEUE / MARK / FLAG now. Signed-off-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow_hw.c | 153 ++++++++++++++++++++++++++++---- 1 file changed, 135 insertions(+), 18 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 015622f3bf..38112ef1a7 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -604,8 +604,7 @@ flow_hw_jump_release(struct rte_eth_dev *dev, struct mlx5_hw_jump_action *jump) struct mlx5_priv *priv = dev->data->dev_private; struct mlx5_flow_group *grp; - grp = container_of - (jump, struct mlx5_flow_group, jump); + grp = container_of(jump, struct mlx5_flow_group, jump); mlx5_hlist_unregister(priv->sh->flow_tbls, &grp->entry); } @@ -705,17 +704,9 @@ flow_hw_template_destroy_mhdr_action(struct mlx5_hw_modify_header_action *mhdr) * Pointer to the template HW steering DR actions. */ static void -__flow_hw_action_template_destroy(struct rte_eth_dev *dev, - struct mlx5_hw_actions *acts) +__flow_hw_actions_release(struct rte_eth_dev *dev, struct mlx5_hw_actions *acts) { struct mlx5_priv *priv = dev->data->dev_private; - struct mlx5_action_construct_data *data; - - while (!LIST_EMPTY(&acts->act_list)) { - data = LIST_FIRST(&acts->act_list); - LIST_REMOVE(data, next); - mlx5_ipool_free(priv->acts_ipool, data->idx); - } if (acts->mark) if (!(rte_atomic_fetch_sub_explicit(&priv->hws_mark_refcnt, 1, @@ -760,6 +751,32 @@ __flow_hw_action_template_destroy(struct rte_eth_dev *dev, } } +/** + * Destroy DR actions created by action template. + * + * For DR actions created during table creation's action translate. + * Need to destroy the DR action when destroying the table. + * + * @param[in] dev + * Pointer to the rte_eth_dev structure. + * @param[in] acts + * Pointer to the template HW steering DR actions. + */ +static void +__flow_hw_action_template_destroy(struct rte_eth_dev *dev, struct mlx5_hw_actions *acts) +{ + struct mlx5_priv *priv = dev->data->dev_private; + struct mlx5_action_construct_data *data; + + while (!LIST_EMPTY(&acts->act_list)) { + data = LIST_FIRST(&acts->act_list); + LIST_REMOVE(data, next); + mlx5_ipool_free(priv->acts_ipool, data->idx); + } + + __flow_hw_actions_release(dev, acts); +} + /** * Append dynamic action to the dynamic action list. * @@ -12098,14 +12115,113 @@ static int flow_hw_prepare(struct rte_eth_dev *dev, return 0; } -static int flow_hw_translate_actions(struct rte_eth_dev *dev __rte_unused, - const struct rte_flow_attr *attr __rte_unused, - const struct rte_flow_action actions[] __rte_unused, - struct rte_flow_hw *flow __rte_unused, - struct rte_flow_error *error __rte_unused) +static int +flow_hw_translate_actions(struct rte_eth_dev *dev, + const struct rte_flow_attr *attr, + const struct rte_flow_action actions[], + struct rte_flow_hw *flow, + struct mlx5_hw_actions *hw_acts, + bool external, + struct rte_flow_error *error) { - /* TODO implement */ + struct mlx5_priv *priv = dev->data->dev_private; + enum mlx5dr_table_type type; + enum mlx5_hw_action_flag_type flag_type; + bool actions_end = false; + uint64_t action_flags = 0; /* to be used when needed */ + uint32_t actions_n = 0; + uint32_t mark_id; + uint32_t jump_group; + bool is_mark; + struct mlx5_flow_template_table_cfg tbl_cfg; + enum mlx5_flow_fate_type fate_type = MLX5_FLOW_FATE_NONE; + + if (attr->transfer) + type = MLX5DR_TABLE_TYPE_FDB; + else if (attr->egress) + type = MLX5DR_TABLE_TYPE_NIC_TX; + else + type = MLX5DR_TABLE_TYPE_NIC_RX; + /* The group in the attribute translation was done in advance. */ + flag_type = (attr->group == 0) ? MLX5_HW_ACTION_FLAG_ROOT : + MLX5_HW_ACTION_FLAG_NONE_ROOT; + for (; !actions_end; actions++) { + switch (actions->type) { + case RTE_FLOW_ACTION_TYPE_VOID: + break; + case RTE_FLOW_ACTION_TYPE_DROP: + hw_acts->rule_acts[actions_n++].action = priv->hw_drop[flag_type]; + fate_type = MLX5_FLOW_FATE_DROP; + break; + case RTE_FLOW_ACTION_TYPE_FLAG: + case RTE_FLOW_ACTION_TYPE_MARK: + is_mark = actions->type == RTE_FLOW_ACTION_TYPE_MARK; + mark_id = is_mark ? + ((const struct rte_flow_action_mark *)(actions->conf))->id : + MLX5_FLOW_MARK_DEFAULT; + hw_acts->rule_acts[actions_n].tag.value = mlx5_flow_mark_set(mark_id); + hw_acts->rule_acts[actions_n].action = priv->hw_tag[flag_type]; + actions_n++; + action_flags |= is_mark ? MLX5_FLOW_ACTION_MARK : MLX5_FLOW_ACTION_FLAG; + hw_acts->mark = true; + rte_atomic_fetch_add_explicit(&priv->hws_mark_refcnt, 1, + rte_memory_order_relaxed); + flow_hw_rxq_flag_set(dev, true); + break; + case RTE_FLOW_ACTION_TYPE_JUMP: + jump_group = ((const struct rte_flow_action_jump *)actions->conf)->group; + tbl_cfg.attr.flow_attr = *attr; + tbl_cfg.external = external; + /* The flow_hw_jump_action_register() can be refactored. */ + hw_acts->jump = flow_hw_jump_action_register(dev, &tbl_cfg, + jump_group, error); + if (hw_acts->jump == NULL) + goto clean_up; + hw_acts->rule_acts[actions_n++].action = + (flag_type == MLX5_HW_ACTION_FLAG_NONE_ROOT) ? + hw_acts->jump->hws_action : hw_acts->jump->root_action; + action_flags |= MLX5_FLOW_ACTION_JUMP; + fate_type = MLX5_FLOW_FATE_JUMP; + break; + case RTE_FLOW_ACTION_TYPE_QUEUE: + /* Right now, only Rx supports the TIR, validation is needed. */ + hw_acts->tir = flow_hw_tir_action_register(dev, + mlx5_hw_act_flag[flag_type][type], actions); + if (hw_acts->tir == NULL) { + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, + "Failed to translate queue."); + goto clean_up; + } + action_flags |= MLX5_FLOW_ACTION_QUEUE; + fate_type = MLX5_FLOW_FATE_QUEUE; + break; + case RTE_FLOW_ACTION_TYPE_END: + /* + * Using NULL action right now, maybe a new API can be used + * to create a dummy action with type MLX5DR_ACTION_TYP_LAST. + */ + hw_acts->rule_acts[actions_n++].action = priv->sh->hw_dummy_last; + actions_end = true; + break; + default: + break; + } + } + if (fate_type == MLX5_FLOW_FATE_QUEUE) { + hw_acts->rule_acts[actions_n++].action = hw_acts->tir->action; + flow->hrxq = hw_acts->tir; + } else { + if (fate_type == MLX5_FLOW_FATE_JUMP) + flow->jump = hw_acts->jump; + } + /* Total actions number should be validated before. */ + MLX5_ASSERT(actions_n <= MLX5_HW_MAX_ACTS); return 0; +clean_up: + /* Make sure that there is no garbage in the actions. */ + __flow_hw_actions_release(dev, hw_acts); + return -rte_errno; } static int flow_hw_register_matcher(struct rte_eth_dev *dev, @@ -12299,7 +12415,8 @@ static int flow_hw_create_flow(struct rte_eth_dev *dev, if (ret) goto error; - ret = flow_hw_translate_actions(dev, attr, actions, *flow, error); + /* Note: the actions should be saved in the sub-flow rule itself for reference. */ + ret = flow_hw_translate_actions(dev, attr, actions, *flow, &hw_act, external, error); if (ret) goto error; -- 2.25.1