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 9C52441F50; Sun, 9 Jun 2024 10:56:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2453640280; Sun, 9 Jun 2024 10:56:22 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2067.outbound.protection.outlook.com [40.107.220.67]) by mails.dpdk.org (Postfix) with ESMTP id 6ED4440264 for ; Sun, 9 Jun 2024 10:56:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lzJNV+DNfc6Cvoao7tZXTJMJHVajIfG2CwtjSmcELQ2tHWzinAGGPqowV2/PJb1l9g2KL+oZr8t3rk4IniLP0FPKcBA0f17HtH/zuAJ9RHc+0eM+DXRMq5t4wWiotcUftbEAq9bs+Mh8XpOv1Sequk5zs69P+PcUbfergqlZWVHhwPfF+Gyuq5u+hiI2CKgh8yGNjiTPlecoCdDDmN0vY8OThtot7MIbW0U2JoI94eNUj32DjOGuuZefEPc0Yzqh+6/bJpyCGNc4iY7Ev5OTZczMv5WnM/yHG0/44mGEnIBkiSt1xPshfl/zbczv63uaZDi0lox1sZ+kHeb+2hLcbA== 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=nVEKR0Y6LnvftW+O6CXYhvWtCHZI/Ov5iZnEJ22oeAw=; b=c/LxkYhDaXshymUH05Qq09nOafWQDfTQWBRkW638rY9V0Q2S/z6nz8x0GmXyas3Tqopp0GVO2QYjStrP7RHQV73FQ5gp74UMchEc9BiSMGfjKsybIViplHLStnMV9wUtKRfRb95pG00gqIWmDYFCxKMIxdXX6oXnxXCndodc3mGZ248b7mXHh5rrNf5+6e3hzdhd75Wsq3ctUo6MFidSEfMjVPunaOtJ5ocTQBfbG8ApC4EDRfHoOAXWcIFy6OrQGIoHQ6naQP2858fYjJj0qFO2kZAciV77b//GtQWDjbuwLTq9cJUVBgS5LG1JizKKgjEMZm1Qts9zT2Ckc1MkPA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=nVEKR0Y6LnvftW+O6CXYhvWtCHZI/Ov5iZnEJ22oeAw=; b=VkFGuqYNFHsHKIKWp/+EvKHw/tuyfs6khQt8BWSdAYzUROAneLj2P4wlLJ4lyESqlHYPtzzdl2HMfMmH1ciVv/AOH4c2/5O921askNzcH7Tn2R2G6Qzh+aFOstSmAIv+gN00vtsCPcfiAjfsROkvhFC0luJ1sV3L66vGw4HgVJx6H2G3im2Acj98CHCWx9/pdCM/YcuFQwuKPlr9vzutqLYT4ngsTZkf9Qewyx7v4J61MnSp/VIpyb3fI/oknfgNOLtu4GZrn6ujRv0n5MfkxphxXE6F58ODBSrC3Fir/KWw9eld/vvs62b5bI0/TJOoXw5tCohEGTK8BxSJHUXqig== Received: from CH3P220CA0008.NAMP220.PROD.OUTLOOK.COM (2603:10b6:610:1e8::19) by CH2PR12MB4326.namprd12.prod.outlook.com (2603:10b6:610:af::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Sun, 9 Jun 2024 08:56:17 +0000 Received: from CH3PEPF0000000A.namprd04.prod.outlook.com (2603:10b6:610:1e8:cafe::f1) by CH3P220CA0008.outlook.office365.com (2603:10b6:610:1e8::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36 via Frontend Transport; Sun, 9 Jun 2024 08:56:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by CH3PEPF0000000A.mail.protection.outlook.com (10.167.244.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.15 via Frontend Transport; Sun, 9 Jun 2024 08:56:17 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 9 Jun 2024 01:56:14 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 9 Jun 2024 01:56:14 -0700 Received: from nvidia.com (10.127.8.14) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4 via Frontend Transport; Sun, 9 Jun 2024 01:56:11 -0700 From: Maayan Kashani To: CC: , , , "Bing Zhao" , Viacheslav Ovsiienko , "Ori Kam" , Suanming Mou , Matan Azrad Subject: [PATCH v6 03/11] net/mlx5: add basic actions support for non-template API Date: Sun, 9 Jun 2024 11:55:52 +0300 Message-ID: <20240609085600.87274-3-mkashani@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240609085600.87274-1-mkashani@nvidia.com> References: <20240606123256.177947-1-mkashani@nvidia.com> <20240609085600.87274-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: CH3PEPF0000000A:EE_|CH2PR12MB4326:EE_ X-MS-Office365-Filtering-Correlation-Id: c353037d-270f-49c0-2e83-08dc88620657 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|82310400017|1800799015|376005|36860700004; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?mpnGf0tvEyHmutGMQh3VO8H0fFJw74BI6Kj91ocbnv6pd0igDEtEXVjgNM9l?= =?us-ascii?Q?3scBVL45fFQKszNLLSJwIMOP5fkpWxn5AH6M4KOGcwhIPsAIr29WENjDVRz+?= =?us-ascii?Q?ddOtIeD+ubIyEwnU1vtj26fxxk/xQPE/9lUXmfmr7czkJFDV/8s00ftREMcZ?= =?us-ascii?Q?9gjw7InH0yIJB8Cz0rXdkE/B2qey5ZrVxWXSI22CDKx0IhJ+ExnvDRRiXxxL?= =?us-ascii?Q?F5Wk13p1q2eDt9tKJjemyjgt2AtgPG+AIsjSbJWQaZVnRhKPEmj+HUruxoY5?= =?us-ascii?Q?uqI8nNqTfBZE1GZdN6X6zY/5mHwLUYWLLEAfP733s4dNOvJEsPGQauOYTlT8?= =?us-ascii?Q?5B/7YmauZEHyRvc+9rwMvN4S2qc5rN5EeN5qkpudRXE9J/0Ps2BRZt8136pr?= =?us-ascii?Q?ur681/ATJ+40D4vWnVaCP0/sl6nJj15muH7lsTtuB7MddML/jhEK7Fg8L39l?= =?us-ascii?Q?XZeUHmVbymWZ8Xz/GdVVFXJ/4fY70nu1DNIPIvRuNbE05+ZfQvmW4QWWxgBj?= =?us-ascii?Q?VQeWsEKKg4j9OcvSSIblBtz6HWn6bBUk5eu4PTOWFZ8vz4eUblRZQyb2AT5y?= =?us-ascii?Q?sTjhJG9v99nL3s0lYvjqkwuvzyfiWUM5DBZNQg00Ns1dOVgGgBe60Xfpkgy7?= =?us-ascii?Q?PheeI/Zr7G2/qlPtPL7P87ob5SzKoSyKhygb8ghIzVOG9kucWtGwmgNE654u?= =?us-ascii?Q?eiqnQh7S5re4k9pz+nLlogGArwJdvvN9KkHD9d6PEJX3asxoRj8vD2mftgYp?= =?us-ascii?Q?u/7y0dD5r1LguL6+n3ChHrsjtR58WnnHDNHfuTMO3ZVuy5LwDWxFvtsSE7wG?= =?us-ascii?Q?3Zf8XpyWstYq45lCsGE2bimU7RXWjJuKncLNCxM/ez5o2uycKJCHwFCgJnrZ?= =?us-ascii?Q?BqBEzNXVS49oPWSAnyfQSFqEl5ZmLtFKMak6hAJLE1UZI2upQwjnvdDixNal?= =?us-ascii?Q?pC7O+zXGD+yd11LC8QquzFOnDULYdC+g9oAYPWo3M3RXfv98m3dsCqxyxYmJ?= =?us-ascii?Q?IlwtswbO1zF7yo7HZzcy/g9PsiVJsyPsBK2iAO+ccQpCvC13Y12i1Mj/qnxP?= =?us-ascii?Q?EFdoHSxVQIQgQVNDvWF4Vj2VzCtpSYNgIf3d1J2Va3nMi2CBht1Vu06LU2Qt?= =?us-ascii?Q?/pZT+FrxCSsN8ejXHtH1wE2txyPybUiNCjjjRjflHOuouXWXEIR02CqtDLdT?= =?us-ascii?Q?mNLAkWT7F/mA08gqEadATC8jBuzow9E8y++UvmQQe+EZ6VzisddY1HjdpttE?= =?us-ascii?Q?lrKrxmdIMfNZ8x+x2SNlztUD/08Zoe3I1FZLEGMsLUJx0xXp839LnpRXAAy8?= =?us-ascii?Q?jUtFqeel/ZyrqLu/wunuyha/coFIKbI3TJ85t1MF5062wT5iYfYiBrMmyY1D?= =?us-ascii?Q?I+pmBJpO6scUYRJ3n0OdQDRe+FgBIW9SWO766SL813jLwDEN5g=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230031)(82310400017)(1800799015)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2024 08:56:17.2754 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c353037d-270f-49c0-2e83-08dc88620657 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH3PEPF0000000A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4326 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 5f1e93c3aad..b5cf51ec58d 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -546,8 +546,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); } @@ -647,17 +646,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, @@ -702,6 +693,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. * @@ -12690,14 +12707,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, @@ -12891,7 +13007,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