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 1F62D44173; Thu, 6 Jun 2024 12:24:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 92CC342E51; Thu, 6 Jun 2024 12:23:57 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2052.outbound.protection.outlook.com [40.107.100.52]) by mails.dpdk.org (Postfix) with ESMTP id D552C42E4D for ; Thu, 6 Jun 2024 12:23:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y1E5ALXHPYVuA7WdgMv376ZO/erDYOIhXM6LJFtBkvi77MQ80p/nVVu4voLangyfF7yDZntO6zL6rMKZ1M1MsvkcwtRRtPyhojhLPKKw2RNB5DLCBhFJOIytFxFrRSpxUYHp7xsh/0NlrneGvLsL7iIxkmYgHSfleBm0yAmu+UjPNT/RR0AaqM1aUfqrKf9tyhe0DN5xPJL3l3WTS86NQSelxzwnhxgJTCHhx+52iobBYs7Mgk0T8LMTFE9+GGSLnR7rTR+UJHXRjXbxNxVHmSW8zGkD/8cROwdB2QCmYlDvDpWR7EbKUksIeILV0PzDWACWEuBxxFLPtrsnA2EfVg== 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=yIFqc0jma8IQktnFybiJXmsSekMPzwpGtoMv0JRq8LI=; b=TmAAH+yur4GD8sTHHSovRlmis6ev/Evs+XqGSdwIZRwBhZeUm3HooiPM6hOMOIJDWoKtxUAmCBQRK+mueBcoKzt0ECsIY/JxXnwJHF3x7jsO0DwdvBnIbvsTED5nnuDrbk7KSWPDtNJIIFUUvbVFNSjRCiSROl1m//arQQ3PaI7DUqfrukqbVoWurt2E7JBrkR1ZajgZZfVS+kWnHNC+5lHR7WlFJRFd+ZUv1IbG5OZZDzL+RKo92WfqgZW7P26ozYAnV2UZOFsvlV+hHclJmyUEkGsWFLmOqZxcTavzYeb0fkCGDAcriEHq7vDHsT4wCXdk5cPE+meAgCZ04L+oQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=yIFqc0jma8IQktnFybiJXmsSekMPzwpGtoMv0JRq8LI=; b=OKcVxb5Nb7zF9/C5DupEpoZlDWUxIT4I6XVssOfpE1E+fbKbd1YJHVTAMAhEYRDe4t4WheMpAiHesKOcAm6BMcktA4Hd7rr3IhUWeqoPxV2b82M8OKXqqSuMKhE5Yi4EF7RsbugIY69tsiY+o5A7Q691p4w58DjCXTmPV5xPWbP/7KFJSOBHZMnyRwvhsIRO23cdq4MPlmd6+3GFr0a6dLerlac5r9Az0WjDm+a/wzPCQlPsKwG+WR7D9VjQCFKGE6yMoZtQJJhYT/MZbsC/L9T4JNKBhE2slva9zRBakjwkIBXJcCIy3+nYgXCQP3T8HhrPRwtuoSBd6Xz8zAg5+w== Received: from MWH0EPF000554DF.namprd21.prod.outlook.com (2603:10b6:30f:fff2:0:1:0:4) by DM6PR12MB4108.namprd12.prod.outlook.com (2603:10b6:5:220::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.34; Thu, 6 Jun 2024 10:23:53 +0000 Received: from CO1PEPF000044F5.namprd05.prod.outlook.com (2a01:111:f403:f807::) by MWH0EPF000554DF.outlook.office365.com (2603:1036:d20::b) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.11 via Frontend Transport; Thu, 6 Jun 2024 10:23:53 +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 CO1PEPF000044F5.mail.protection.outlook.com (10.167.241.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.15 via Frontend Transport; Thu, 6 Jun 2024 10:23:53 +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.1544.4; Thu, 6 Jun 2024 03:23:40 -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.1544.4; Thu, 6 Jun 2024 03:23:39 -0700 Received: from nvidia.com (10.127.8.14) 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.1544.4 via Frontend Transport; Thu, 6 Jun 2024 03:23:37 -0700 From: Maayan Kashani To: CC: , , , "Bing Zhao" , Viacheslav Ovsiienko , "Ori Kam" , Suanming Mou , Matan Azrad Subject: [PATCH v4 03/11] net/mlx5: add basic actions support for non-template API Date: Thu, 6 Jun 2024 13:23:08 +0300 Message-ID: <20240606102317.172553-4-mkashani@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240606102317.172553-1-mkashani@nvidia.com> References: <20240603104850.9935-1-mkashani@nvidia.com> <20240606102317.172553-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: CO1PEPF000044F5:EE_|DM6PR12MB4108:EE_ X-MS-Office365-Filtering-Correlation-Id: 3ecb566e-9276-4dee-96f7-08dc8612c3ed 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?cPxKkaS0zuIb7T5Lucs7TjbwOOaXHHTyQsxL0DHhwtBkCkAQCky4LioPetTf?= =?us-ascii?Q?H6FlDO85UEDM2Y+5V2LDO1AXjicHLerkMdHsUld9F2NltJ0BtET5xey3JS5J?= =?us-ascii?Q?Et9Sb2LcmrrFwqCb5l5jIW3vFvxKcRp4mtfVrKcwUHA2hDoertCNUsz1OqWp?= =?us-ascii?Q?qQiik8cVtMo6xXtOyo4MC7nKOsYB8Dx7FD8/arS8CBpLZ7fbYD9PFS3EbZQE?= =?us-ascii?Q?geSd3RgbHENYG3K6cnRDAa53nDQOvTWbZJMVlkVxlk/5RfLJKD04eQOunSuB?= =?us-ascii?Q?OD6aWlQkNDKeyipTXAXe8y/6mMcGGpfq8NT/KHeKopTBAbhlsc8GQPr69Zp8?= =?us-ascii?Q?idu7OO7fFCn0MUHHQbZOHF5f1zsBnpvkijlKYHJi0PFL7823d9uLVz8OPTTy?= =?us-ascii?Q?l52nXXxBJ84tSl/qEB3srlt1AaSJ/KaNvOUMufb7AZUlvahbKHxdyeoUMHiD?= =?us-ascii?Q?7e/L4fXA44MmwIx4Dzl7OkoQ3tEnLkVQFSl+iYsnhxg4Rd892umB3LvRvuES?= =?us-ascii?Q?LBYtRr/UioWRl56wMUBOf4c4SjVgNxoOmWfysaFfRlYp87KH0KLVIfxODimm?= =?us-ascii?Q?36nCezRVWxs0RxSr83OBUcujIZoKqPvucsweQojELxVP4HbFfvdlqrNhj2qe?= =?us-ascii?Q?Z2QgYdrLgWO9fPamg/1BxoPim8PIOSpvDTrD4SFqoPpGmkwP5mczstNBqx7a?= =?us-ascii?Q?Ozu1VHsQ8xXc20PTQlnxDp3HRypYPolPqB7DKB6aNZABa3LeXAH//YAYJX9M?= =?us-ascii?Q?PjCSHkFXMxSQk4d5touGTgLbhONfl4lAXY/8ELyr706IGSs3xXjoBcnCK5lp?= =?us-ascii?Q?wbWMpIY2qH4wAtDX/MGf21l69rsLycDERJylOWsdC/AiVsWIVkYMDtb+zN+/?= =?us-ascii?Q?VlnuyipW/rFcl6Snb2228FJH2OTnxYTDfqvTgTuk4IpeQJIIv54lxxzVg58Q?= =?us-ascii?Q?E3v3KoDk29fXDW1XqTE5qZH2whchlMz7vQue0AkGWXI/WlxkNgP22ZfSE8Bg?= =?us-ascii?Q?yto/peKSZEEojikNkM2FLtABspahAQYE7A64WGsEocU2ubLkhO20kxUcmnXO?= =?us-ascii?Q?6b+EIKxvM54S8YAO1lH3NFPq+2wjMcDNdgOjZxrD0WsWQ+bs9i9OYZ1wjaHZ?= =?us-ascii?Q?+ZH091LPly0XZU/jANHv2epOg4Rpg2xKV1O5viqXjFm/q5eRei6aU3tNBZqu?= =?us-ascii?Q?mIfmSkmBM0rVDXxRcxVkA9glb98QvdQN59R3eXN9n8QdWJ7sH35uBjgjGZ5L?= =?us-ascii?Q?Dz/IBkZJV47UdscPeW1Uz6DR9tkhUIAnbYLbK1it71FBxWwTNx84a5k+qwCk?= =?us-ascii?Q?64vSKKOg93pVTH0kzJiRUlwVM2QdC/8qm1NiQBnRJe6fDyH/mct1JGBLDGzr?= =?us-ascii?Q?2fgSvEoV7uAM8fC7Ndoc1fp+XLR+IPNA5lA9E8g+ARpo4rriTA=3D=3D?= 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:(13230031)(82310400017)(1800799015)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2024 10:23:53.3491 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3ecb566e-9276-4dee-96f7-08dc8612c3ed 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: CO1PEPF000044F5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4108 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 Acked-by: Dariusz Sosnowski --- 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.21.0