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 7E60444145; Mon, 3 Jun 2024 12:53:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA48C42E3F; Mon, 3 Jun 2024 12:53:06 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2066.outbound.protection.outlook.com [40.107.92.66]) by mails.dpdk.org (Postfix) with ESMTP id D9D3B42E1C for ; Mon, 3 Jun 2024 12:53:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q1Hc4/UBgv9Z38kJaQaFOVVPpnjY12J+KyVZwO9wDtZfI0O+FQ5qgMUGtX+tSKnf1eUfylLqxehWtbNzemv8KX4HCwJzLgGNvLs41fMHMlc8Tr9a54IIEf8ZSfR6A26nAgcDczweTgt4pzrvmFbtojTU6MP2dFMcttmQBvN0tbBlclBb8wKQifIW5b3uel/kxYeQWNZ6JNItoMBrChI5/GiILSyu6xGl0uhny+yenMAFatBKioILWIye686Ts7hRNxq9JC66fsYJnsM9bWKdK5d8CaaDnJphYmYa3pixllqqAzBvxoZS9VA4Jj4wwDj8kgAAIY83vMrA9UQqwbS8Mg== 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=RGabouu2C0UEamLTTjLL/Gcj1VIcpJIwugNIIQCiui4=; b=OeC52ZI3rouUXvz7ultXU2tzBYYRIXa73blsY9w2Fb1X3qFMVNeyez21nPtyb0/ILks8LTJw8acOaXpPG+5XyRyCCRyojaPo0+QT3c4j6rHO2n/goFVou+6chC7r6xxkHoANFVOIalXHhcWf1J7kW3VFZPk89lxRYSbajr2TyVVZgu4SkW8jtyAh9sXWNGjVEEFCRbHM94Z5O5uMzb5yWM4ssEJFu/X+zZiRW0XP/7JTh81x8DnsBUbKdOvxj6dTOVrwaOrS45i89FJMRaEXH9Qe40LbXl3JiN5DgP9XGbUUexcO1YAgYZJ17n5y4wnVV+z5ptf1m8iGExF8y18hrA== 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=RGabouu2C0UEamLTTjLL/Gcj1VIcpJIwugNIIQCiui4=; b=e7TbMPX7tCGAWp1etrZtT2+jKN7Y1kW7HpKu75a7iylA7Ts02SAclU5ona6L7LCx7WyujJ2lCbQg1ixr8Co4WGrdgehUePPyGn/splTKYQuBo1aVMkxbqOJHfDBXMVZCoYAj+hnqhOBV4QeksUpNKVvjMCSMQg5IxtQpiUH0Wq/+qi07F6DZNrTMVp6GCjgbH1vsVh61McbbVJR4K018FXnPu2zCdDfR1/JJ0zaKI6Z5oxk2z/lI2fvads545AwSN00fVixOkVq5Lox5KdlRyVoStkZr+MaOudPlwnn7rHKK0MiDGxdr/UOkRzDwKwTiDv13R/+CCxNCwtFZb9sj+A== Received: from BYAPR11CA0063.namprd11.prod.outlook.com (2603:10b6:a03:80::40) by DS0PR12MB6533.namprd12.prod.outlook.com (2603:10b6:8:c2::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.30; Mon, 3 Jun 2024 10:53:01 +0000 Received: from MWH0EPF000A6730.namprd04.prod.outlook.com (2603:10b6:a03:80:cafe::5) by BYAPR11CA0063.outlook.office365.com (2603:10b6:a03:80::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.30 via Frontend Transport; Mon, 3 Jun 2024 10:53:01 +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 MWH0EPF000A6730.mail.protection.outlook.com (10.167.249.22) 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:53:01 +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 03:52:48 -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 03:52:47 -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 03:52:45 -0700 From: Maayan Kashani To: CC: , , , Gregory Etelson , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH v3 1/6] net/mlx5: update NTA rule pattern and actions flags Date: Mon, 3 Jun 2024 13:52:36 +0300 Message-ID: <20240603105241.10482-1-mkashani@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240602102841.196990-1-mkashani@nvidia.com> References: <20240602102841.196990-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: MWH0EPF000A6730:EE_|DS0PR12MB6533:EE_ X-MS-Office365-Filtering-Correlation-Id: ad55cf4a-2447-45c3-a0c1-08dc83bb568a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|36860700004|1800799015|82310400017|376005; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Et44/HX58lVeKd+tuwA59zMcHonJ7IbBCZysHYEtKDTI/HPjgbbtBMZkSRMn?= =?us-ascii?Q?iRHH37Pk5zA8y/Dy8+CIsP5KSIQZ4FTcmR0YATepZxEAI4YkIK38/DhtuMoF?= =?us-ascii?Q?Fbn+UN1BE1PKNlISgHfJzayNtxbpAnpq4FN10qOY0VeAGeRcLk7TSnStO8p+?= =?us-ascii?Q?9SpzYLLMcavzg97u9eK/vsozSmaxelBChWddUFCkxhz+/zwU03Zvu+p6/Uv0?= =?us-ascii?Q?NweXF+Ny4hp+2szqXIn3hRuSxkHD3f5oirAaa4kAL3aZUbSilf+D4+XV1Qio?= =?us-ascii?Q?esN+PL+7M1oiew6//btv6OfzgEfSMvhhVe18Td/9qVImn/NQkDY2FrX1B6FA?= =?us-ascii?Q?Fi0wP6CIqHGoZA84JgyMMr+beawzawWV6T+s7WyDrbsWqmDPRYSUrR7ExHW6?= =?us-ascii?Q?O+nF8VsahN/xTKBPQiyQVduCk6jPQ7V/65+MofV6vWaWNmH2bXoKIeSbKOXH?= =?us-ascii?Q?fbQgRr8/Y/nb/QhE/QLmw1okkSmXv1wzG14lF+LxFg249Q0PgTuV08+1KiRO?= =?us-ascii?Q?/bcSm7Re4nkj8LrqU097jEt1VGtDH7w90em5KZubFBvkH6PdGlWgHuV0ShOb?= =?us-ascii?Q?Sm8IBnTVmjVXllA1OdrLAkX6aUvfeNYcHrL3jHSvLmH4lSUVDI6sdqYFvKWd?= =?us-ascii?Q?zjZ4aH1l+NoGXO8Qe8o5fGGRbGQdd5QS8E0pu7TjSKPonU0kSXifm8NAKGld?= =?us-ascii?Q?5ArqHWlxHI4pDNZi4yJ4YyXXmW1dPBQtLoWqljWQn1xmLxi4dlxVMBukOV1Y?= =?us-ascii?Q?HFh1Ikmt1wvLhJZ6y+dPQ5+6tuUU5Wlq1zSKQ69wsqizvjU4r/oGtOqfhTqf?= =?us-ascii?Q?wXHDw/IUndI98hSuPY/j1yWMNKfK1zr9t3G1vBn6cwUZi3Sqb1C7VwHI2mwn?= =?us-ascii?Q?3pUqlCcCxDiozmVTJTQPu35WKEeNR3GTT7bJgxMWx2aX4JSEPUaowgO2s7gd?= =?us-ascii?Q?I2DQ/EiwfSBaFYF97E6pxyTsz/WmOMwXx0MKZMkF0oC1HYUAINFTFVip9rxr?= =?us-ascii?Q?XKUVI8OyOw6LzxeyMi8PBl16Wm9dZmoKdfHyBBjSEOTvy+P4ej4qdL+99wnm?= =?us-ascii?Q?0hjwJArjnW4Xkw9OP0Ln4hA/5US/zzC8qlH4/GpE8UbSbyS8CsU6TXYZW7GB?= =?us-ascii?Q?ygj9aUhN1+xXS3Pil0PhIBSCA6tfUsgwmWfgZ+fBnbsMHEPtDO2bJ5S2XM6l?= =?us-ascii?Q?HpZGjIdL7oUJxYU2AbfqJ/mhQe/JSFz78eVCeq0O0VX86gXS57eBevC+el5E?= =?us-ascii?Q?H4/DVxB0dnEyNr8IxAHhLUOh9QVuQCXnOV6Ggpc9l0/lamNKM+8xtC3uwf8S?= =?us-ascii?Q?kOvTKr/O01Mj3Z69vB6sUs6nk1V5pP62ElrX2eH7mg4n3XwwafRFQvqcxVIu?= =?us-ascii?Q?zgBRY9s=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)(36860700004)(1800799015)(82310400017)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 10:53:01.2879 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad55cf4a-2447-45c3-a0c1-08dc83bb568a 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: MWH0EPF000A6730.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6533 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: Gregory Etelson Move pattern flags bitmap to flow_hw_list_create. Create actions flags bitmap in flow_hw_list_create. PMD uses pattern and actions bitmaps for direct queries instead of iterating arrays. Signed-off-by: Gregory Etelson --- drivers/net/mlx5/mlx5_flow_hw.c | 147 +++++++++++++++++++++++++++----- 1 file changed, 126 insertions(+), 21 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index d938b5976a..696f675f63 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -568,6 +568,111 @@ flow_hw_matching_item_flags_get(const struct rte_flow_item items[]) return item_flags; } +static uint64_t +flow_hw_action_flags_get(const struct rte_flow_action actions[], + struct rte_flow_error *error) +{ + uint64_t action_flags = 0; + const struct rte_flow_action *action; + + for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; action++) { + int type = (int)action->type; + switch (type) { + case RTE_FLOW_ACTION_TYPE_INDIRECT: + switch (MLX5_INDIRECT_ACTION_TYPE_GET(action->conf)) { + case MLX5_INDIRECT_ACTION_TYPE_RSS: + goto rss; + case MLX5_INDIRECT_ACTION_TYPE_AGE: + goto age; + case MLX5_INDIRECT_ACTION_TYPE_COUNT: + goto count; + case MLX5_INDIRECT_ACTION_TYPE_CT: + goto ct; + case MLX5_INDIRECT_ACTION_TYPE_METER_MARK: + goto meter; + default: + goto error; + } + break; + case RTE_FLOW_ACTION_TYPE_DROP: + action_flags |= MLX5_FLOW_ACTION_DROP; + break; + case RTE_FLOW_ACTION_TYPE_MARK: + action_flags |= MLX5_FLOW_ACTION_MARK; + break; + case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: + action_flags |= MLX5_FLOW_ACTION_OF_PUSH_VLAN; + break; + case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN: + action_flags |= MLX5_FLOW_ACTION_OF_POP_VLAN; + break; + case RTE_FLOW_ACTION_TYPE_JUMP: + action_flags |= MLX5_FLOW_ACTION_JUMP; + break; + case RTE_FLOW_ACTION_TYPE_QUEUE: + action_flags |= MLX5_FLOW_ACTION_QUEUE; + break; + case RTE_FLOW_ACTION_TYPE_RSS: +rss: + action_flags |= MLX5_FLOW_ACTION_RSS; + break; + case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: + case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP: + action_flags |= MLX5_FLOW_ACTION_ENCAP; + break; + case RTE_FLOW_ACTION_TYPE_RAW_ENCAP: + action_flags |= MLX5_FLOW_ACTION_ENCAP; + break; + case RTE_FLOW_ACTION_TYPE_VXLAN_DECAP: + case RTE_FLOW_ACTION_TYPE_NVGRE_DECAP: + action_flags |= MLX5_FLOW_ACTION_DECAP; + break; + case RTE_FLOW_ACTION_TYPE_RAW_DECAP: + action_flags |= MLX5_FLOW_ACTION_DECAP; + break; + case RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL: + action_flags |= MLX5_FLOW_ACTION_SEND_TO_KERNEL; + break; + case RTE_FLOW_ACTION_TYPE_MODIFY_FIELD: + action_flags |= MLX5_FLOW_ACTION_MODIFY_FIELD; + break; + case RTE_FLOW_ACTION_TYPE_PORT_ID: + case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT: + action_flags |= MLX5_FLOW_ACTION_PORT_ID; + break; + case RTE_FLOW_ACTION_TYPE_AGE: +age: + action_flags |= MLX5_FLOW_ACTION_AGE; + break; + case RTE_FLOW_ACTION_TYPE_COUNT: +count: + action_flags |= MLX5_FLOW_ACTION_COUNT; + break; + case RTE_FLOW_ACTION_TYPE_CONNTRACK: +ct: + action_flags |= MLX5_FLOW_ACTION_CT; + break; + case RTE_FLOW_ACTION_TYPE_METER_MARK: +meter: + action_flags |= MLX5_FLOW_ACTION_METER; + break; + case MLX5_RTE_FLOW_ACTION_TYPE_DEFAULT_MISS: + action_flags |= MLX5_FLOW_ACTION_DEFAULT_MISS; + break; + case RTE_FLOW_ACTION_TYPE_VOID: + case RTE_FLOW_ACTION_TYPE_END: + break; + default: + goto error; + } + } + return action_flags; +error: + rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, + action, "invalid flow action"); + return 0; +} + /** * Register destination table DR jump action. * @@ -12339,21 +12444,20 @@ flow_hw_encap_decap_resource_register static int flow_hw_translate_flow_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_flow_hw_action_params *ap, - struct mlx5_hw_actions *hw_acts, - uint64_t item_flags, - bool external, - struct rte_flow_error *error) + const struct rte_flow_attr *attr, + const struct rte_flow_action actions[], + struct rte_flow_hw *flow, + struct mlx5_flow_hw_action_params *ap, + struct mlx5_hw_actions *hw_acts, + uint64_t item_flags, uint64_t action_flags, + bool external, + struct rte_flow_error *error) { int ret = 0; uint32_t src_group = 0; enum mlx5dr_table_type table_type; struct rte_flow_template_table *table = NULL; struct mlx5_flow_group grp; - uint64_t action_flags = 0; struct rte_flow_actions_template *at = NULL; struct rte_flow_actions_template_attr template_attr = { .egress = attr->egress, @@ -12631,14 +12735,13 @@ static int flow_hw_apply(struct rte_eth_dev *dev __rte_unused, * @return * 0 on success, negative errno value otherwise and rte_errno set. */ -static int flow_hw_create_flow(struct rte_eth_dev *dev, - enum mlx5_flow_type type, - const struct rte_flow_attr *attr, - const struct rte_flow_item items[], - const struct rte_flow_action actions[], - bool external, - struct rte_flow_hw **flow, - struct rte_flow_error *error) +static int +flow_hw_create_flow(struct rte_eth_dev *dev, enum mlx5_flow_type type, + const struct rte_flow_attr *attr, + const struct rte_flow_item items[], + const struct rte_flow_action actions[], + uint64_t item_flags, uint64_t action_flags, bool external, + struct rte_flow_hw **flow, struct rte_flow_error *error) { int ret; struct mlx5_hw_actions hw_act; @@ -12668,8 +12771,6 @@ static int flow_hw_create_flow(struct rte_eth_dev *dev, .tbl_type = 0, }; - uint64_t item_flags = 0; - memset(&hw_act, 0, sizeof(hw_act)); if (attr->transfer) tbl_type = MLX5DR_TABLE_TYPE_FDB; @@ -12710,7 +12811,7 @@ static int flow_hw_create_flow(struct rte_eth_dev *dev, /* Note: the actions should be saved in the sub-flow rule itself for reference. */ ret = flow_hw_translate_flow_actions(dev, attr, actions, *flow, &ap, &hw_act, - item_flags, external, error); + item_flags, action_flags, external, error); if (ret) goto error; @@ -12848,11 +12949,15 @@ static uintptr_t flow_hw_list_create(struct rte_eth_dev *dev, { int ret; struct rte_flow_hw *flow = NULL; + uint64_t item_flags = flow_hw_matching_item_flags_get(items); + uint64_t action_flags = flow_hw_action_flags_get(actions, error); /*TODO: Handle split/expand to num_flows. */ /* Create single flow. */ - ret = flow_hw_create_flow(dev, type, attr, items, actions, external, &flow, error); + ret = flow_hw_create_flow(dev, type, attr, items, actions, + item_flags, action_flags, + external, &flow, error); if (ret) goto free; if (flow) -- 2.25.1