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 91CD644144; Mon, 3 Jun 2024 10:05:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9677B42DF0; Mon, 3 Jun 2024 10:05:43 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2055.outbound.protection.outlook.com [40.107.237.55]) by mails.dpdk.org (Postfix) with ESMTP id 41BA942DDF for ; Mon, 3 Jun 2024 10:05:41 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QUdW4Yqq++S11lZx7Jg3onHTBWrX+fc2naaadqxk7cxrWas2VoijRGNlOPyNuJUyGilBfubADQc0KmabiLrXuRZwN+aNlwxYcvJTO7LA/y3swSi2R+OMUFu5HgihDjGqud4baauFh8Z/QXMhG6WAVHHmcEIe4qvK14/NFq62PvSA8fDkUxM9UDvCqK/PvUB2GXdB3gFjZ4gmKHSh7HjL87wVxvx8AvXtPFXPrv4c0vO/mlzV0acwRZP1PPCFaY+7wupkDxpLYlHsBj3pjldZGKDqBd03Wx0hAfRpAan/PSItuFrs7a8N2DbyySTKeYT5lCEeIKk0YSFNM3FpR6VnKA== 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=Y07scGf5ClrGDAJLwGdYRQrhhu86NYyBunM1E3d4YF/5WY5pCh+2++ynvwn/YBu0E5t50wDoOtZO1gdaIiLsT/MiMcmS5D7NX2kM8Bw+tCo6NGKIEvMGRdegS9ULHyYYtI6E81uxg9/m+GoZtuXisgM+HJPkcFqWdIN6C9yHTCvqeWZUrC4d4w/b4ImwL6NJfdWU4AkRiE5Psd1QZKFBoY4m57WuhgL/somUO+YgO27qHfMLp+Ttm5BV+UsyanvlIDL0vezwUXnwwmHY1epJ8d50QIk5pgevttOdxMr3Q+35CRognlpjmMEx0WynbtHM3mZzNrfv7B37bu3WdllbGQ== 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=98hQ9qVQOtSg0K1Cns79MdUqTiF6ot0I5079az3DP30=; b=Jifqj5Sd8gIHlrCvDlOoOUELez6U558ssauhc23BhRBIL502WgaypC9T2DeyWQr+y5wnsFNZR3DzLidi1twY6Ap3+ECHvmT1gqxu2l5YEH6Sll8htYD6QJdJgnKgsNAn0XZFEXYvtGCgZgYUKsYObjByotTsQdAaqwUFziYo28pk7Qoy8W2jVqoDA08IVGdoHSn10Btu1P60YBXhg0dqivAqxYY/yngAdp0LGHCcCBFAA1lxrP81CpAxnxQi7IXXXeLQvmUbm4zJr342tnb5ksZ4Zyx0YKy2Jd8Qhv3m9dE9cdpxfgnUk4tSqPOARnCw0suPUtJPqBLDwNv/aIQ2LQ== Received: from PH2PEPF00003859.namprd17.prod.outlook.com (2603:10b6:518:1::7b) by DS0PR12MB8018.namprd12.prod.outlook.com (2603:10b6:8:149::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.21; Mon, 3 Jun 2024 08:05:37 +0000 Received: from SJ1PEPF00002323.namprd03.prod.outlook.com (2a01:111:f403:c902::4) by PH2PEPF00003859.outlook.office365.com (2603:1036:903:48::3) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.29 via Frontend Transport; Mon, 3 Jun 2024 08:05:36 +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 SJ1PEPF00002323.mail.protection.outlook.com (10.167.242.85) 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 08:05:36 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) 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; Mon, 3 Jun 2024 01:05:20 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail202.nvidia.com (10.126.190.181) 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 01:05:19 -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; Mon, 3 Jun 2024 01:05:17 -0700 From: Maayan Kashani To: CC: , , , "Bing Zhao" , Viacheslav Ovsiienko , "Ori Kam" , Suanming Mou , Matan Azrad Subject: [PATCH v2 07/34] net/mlx5: add basic actions support for non-template API Date: Mon, 3 Jun 2024 11:04:56 +0300 Message-ID: <20240603080505.2641-3-mkashani@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240603080505.2641-1-mkashani@nvidia.com> References: <20240602102802.196920-1-mkashani@nvidia.com> <20240603080505.2641-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: SJ1PEPF00002323:EE_|DS0PR12MB8018:EE_ X-MS-Office365-Filtering-Correlation-Id: a94989a1-5c0f-4416-9c3e-08dc83a3f38b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|36860700004|1800799015|82310400017; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?wbcoprEhcWKp45sxX7/7FkCJj4JTtqXwcrREheyTJG2Vt47xIdAK4iGinFp5?= =?us-ascii?Q?aZyd1xXhdVjYGr32g6ZR4NTlYR1wtfwzAJhY6fT8oB9elOOBs6Kg75u1SwI5?= =?us-ascii?Q?yQNVXlt3KmJUrg61xOo+csH7njObGHC7s8pMVbsVFLt2BzIMztYTQ3LZqHgT?= =?us-ascii?Q?YFNH4q+MPHV7CAR+RHjxo1hwXDv1eQ0umB5ubtHPpw8lVTAROUrb9/dvJvON?= =?us-ascii?Q?KEKSggb1z48oCVzousLXzEuh8b6IT/umZRIADeKeOQIt/KE8vjZvdplUI9z6?= =?us-ascii?Q?pt4JqG3/t9EdXb97oVA+4dQRwlnyauI1qJGDZcjKd6sY8OpmdomcwE+zqt7Z?= =?us-ascii?Q?AUGrkt0vvVn1dOcXdm62tL5Nj/pXRgv78cU1u79A0Omwx3QJ/1ggymXGsKeP?= =?us-ascii?Q?RnDAG5FeXCa+sx8rE3u1Yx/RDzzaVXz452j/4V1fIz908hXzLDmXXHW0lKGb?= =?us-ascii?Q?NQZRyejxBkYvB0ImpibPcy/wMr/ol6j8dpzYFn85tvWI2fko3YTFoHCf+/sI?= =?us-ascii?Q?GJ3NG/mIazagDekWN/x57LkTQcQeS/q6KOB2M85yJRmj9vjoms793e4K4yVH?= =?us-ascii?Q?DuKPls86k2KLNNupHwDvUnCOWkspvDd2bUmWl/5ksNbfP4J+gwoXext+0+57?= =?us-ascii?Q?g46xp4J/BjW3y6uio7jG3rz99GYs0vZAwe3kQqE4A6vPWz4I8KjR16hlMUjY?= =?us-ascii?Q?df+A+XefbO8LqXmidRH1nhHcMOTOFlQ+Ghd1+qJbGBDiUT25FHsgVtjX93VN?= =?us-ascii?Q?QmuqxwuUcXl8W5oWsBnm8Tva8ISp4MXDiPpOQMLI+xvuZZ+b3EEC5XMavtVW?= =?us-ascii?Q?cuLu7bv8qLFzzS1fOtjRG2ugsOc6CSVZ94ITcsTeeceNDixGB1VdzQ3LEwwd?= =?us-ascii?Q?GWKIRWyxdnyK2n+KRJa96BN82RPM002e8aEfelWEIC+mk2B3MAdYVeqGj61Z?= =?us-ascii?Q?g5U4vra0WhhGw79fLbKYznH01+H0UreIIUiizM9smPi7PMKicjxpT3iYC+ew?= =?us-ascii?Q?/FM7gqNG3FidmVleTTD6NzEql+gLhbF6eyNJt2F2af/kaLf9nAC8edr8iRHn?= =?us-ascii?Q?FaWgropm7NRNjjSEuPpKT7DaAFG729/XwswfgPCFZXsZwLC9z3WU/41dNUlg?= =?us-ascii?Q?P0tuFUpdqX/veONKMfMtnTiyYvi0jALFVJI6b+bUw35F6ZFrinrG8xCURKMn?= =?us-ascii?Q?22tspWI0qTTYh3tlZkpR56pkf7qGJKAqnqNnx0GJQXEpS5BNoZiMw86yyoF6?= =?us-ascii?Q?W7e5OuDY9KhsU8AnEbCyIT562kIMMgneVkdQV2Qp/wmqCSSc3dGPFVJreIh3?= =?us-ascii?Q?YmyEHMf517dSz/E9nIuhtnvk+iZqn2Ir8Xu8yQI2YIqq/NA2lzIVLtixHvYm?= =?us-ascii?Q?wzgNUuY=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)(376005)(36860700004)(1800799015)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 08:05:36.8531 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a94989a1-5c0f-4416-9c3e-08dc83a3f38b 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: SJ1PEPF00002323.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8018 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