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 10F7F44144; Mon, 3 Jun 2024 10:11:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9DB5C42DDF; Mon, 3 Jun 2024 10:11:04 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2046.outbound.protection.outlook.com [40.107.223.46]) by mails.dpdk.org (Postfix) with ESMTP id E7B3E42DC5 for ; Mon, 3 Jun 2024 10:11:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WloPZZ6wkKREIRGB/oDQhKpcnEJC/WDDwcL81T4cbnvCLeZ+SbxfvakrpRH6DRP/7PaMBVarwKUE5uzgf/rhVVclTbir4jarsMYijZjZeLKudYmsOlxAnc8P0dm8f5mj8I8TMMwFQRSe3yTeWJlYVoSHNiHRoWU4Vd32VpLXJcNyFCP2Hi2rtm09Q3XuX6MU47GXg3x+DNdqlMPwVtQfU55hsDcbxkvuGzy6KEccjzOKx5tpG/nQYs3+wMjeuCjo0ry9p/KLV2Lsdy4HcHTzyLlrP+AnCw+Hzf+wqwY0DBVTIXhgvoZ/txBo3IqiOcPU2AGWTFVJ/bZspvxsmM1Fng== 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=AFlG4AqXL4vb+MeKSzaf+eW8pjdfe4cA4p91F7kmKYRG11BmIsA+2VsCa0BmWWQiLPHC4xAcoSuKltj8Ct9MJX/CYnmpMf/FX00CmCzBanxZnCTYPsunFC2qAJBeL+aCDkm/QZlhBjEYXtVjZFQPN86+ky2tt/cxsSXLbf7MbI9CJJExZZNbrEHE426aK4FcFTiNOwTytTGBGy6cFvhrsNyKY+cn6xN7Qb8l4z/1I1E6B8a8j/y20/88oKIC6JoAtCfGsIDxkRD73VPWvL5EeQQMF4SXgaiF4mwGYtGLiXQOOX1kCol0yzeDK3xI812WWT78um2ZjdZdsDyn4RmqTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=pXDT5O0ZgeRjEW5rMj1z1D6RR8V9Gw4pBFO5NHauWwV4Gn3emJL2z5B1+2I0Xh58AbVO1SHkNDeP6TbXtsSH2HuazXc7ElCMiIi/r/bZ/OYNSJOsExM5URKM9XmR8YYkGp6EBAQIfB817Kh6D5m0EWVR55sEEcqFZnenaa36ZpPZ0hN1LB81ZF2ShKVHN8TUuH1eMIIst4k8lcuxCUrvflwxFfNNGNaIxoNgpXKrEEJGPo3auEEPoX+ZvS7K0sxtQKWw8ytbJLqjo7ybImwRqx9lauKUczxVWNMdipFMFvYN61jOA7UPMP96Sw0p9pOjfABahFciZnVs+0tNscCIcQ== Received: from PH7PR17CA0059.namprd17.prod.outlook.com (2603:10b6:510:325::25) by LV8PR12MB9084.namprd12.prod.outlook.com (2603:10b6:408:18e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.22; Mon, 3 Jun 2024 08:11:00 +0000 Received: from CY4PEPF0000EE3D.namprd03.prod.outlook.com (2603:10b6:510:325:cafe::92) by PH7PR17CA0059.outlook.office365.com (2603:10b6:510:325::25) 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 08:11:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by CY4PEPF0000EE3D.mail.protection.outlook.com (10.167.242.15) 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:10:59 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.5) 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:10:48 -0700 Received: from drhqmail202.nvidia.com (10.126.190.181) 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:10:48 -0700 Received: from nvidia.com (10.127.8.14) by mail.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 via Frontend Transport; Mon, 3 Jun 2024 01:10:45 -0700 From: Maayan Kashani To: CC: , , , Gregory Etelson , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH v2 16/34] net/mlx5: update NTA rule pattern and actions flags Date: Mon, 3 Jun 2024 11:10:37 +0300 Message-ID: <20240603081042.3109-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: CY4PEPF0000EE3D:EE_|LV8PR12MB9084:EE_ X-MS-Office365-Filtering-Correlation-Id: af6ee75a-f9d5-4de2-1375-08dc83a4b41c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|82310400017|376005|1800799015|36860700004; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?qn89y3w61wh9Iyk+izUSCpDenxC/NfztVLyXxLEuwAplwS5m+3gysPE9QR9H?= =?us-ascii?Q?PhnNWqkiBrVck4kZg4DK59g5Lctcj1NSJf4yrAXuO7bZmTUvVnyKx/mMmEb6?= =?us-ascii?Q?xkRmDkmxqkjSV6gnVag2lbjdSh4Eaf3EoEqEheNXICTaasc/ChipVxEw7Qry?= =?us-ascii?Q?QwcEpilrK+4uz7VUepMOfsMb7L5rqmR7eN+HtWZe2jEL59/WgtLk6+GmYKtn?= =?us-ascii?Q?AuY8SH2GaG67j4g0rf/iO/afX1J0DPzcvQp4KgK96/8m8qTPy+GRIzCMeqGq?= =?us-ascii?Q?tf1tjzyEEKMPrM6OqtOg8kwal0FR/GsWdJdIXegpPpwSDlIZ9eRIMjvUovUM?= =?us-ascii?Q?p/Zd8a2LWy4x5AJ2apA6g/B7GhLjHR/kNnfjxORJdEOHlTLkUqph7cIBfVJy?= =?us-ascii?Q?2fl4eQTeRdCSfEQ6RRoFv57+MQHnI1+EvNQ7SyqRVJ0l1MjlkYl/kJ998lpu?= =?us-ascii?Q?mbtBftK+MMfNRx/aoQjhEDEUkt/TB/SYp4QsE+1bAYlzbDZSy5veWPlBp9b3?= =?us-ascii?Q?pzKhErWJ1GPB7oBJh6js+PPF3Nn5GgXJBphCNpfomv6bW2ylhcSXIviV6DF4?= =?us-ascii?Q?Zx+mcR+Xc68bh55IuF1XB1KMDpEsgrS/oYcFqZRmjTlJ+LgK0PlxOGobQvGD?= =?us-ascii?Q?mHAxu8gs6zvP14l33BSw3I6JaOZMq86fEmVJ1+NVv6NmFANqxFn/G1I/UdwG?= =?us-ascii?Q?k0BSlmSTLbrUCoo7/t7fNF3+EsMoXSC8lg+TO9BtH3GkN13wIWksJC2vaZxA?= =?us-ascii?Q?CmEDB1BiOIp53StnWJKvNbGCBsWuCqOjlTmQekNAoP7BQiGTH+nrdgoE0LHI?= =?us-ascii?Q?ecs0Y0w13U1iSuqSGR80eSw+GQgIzJFLiOYhCsG0IbYvIPMnOnNFrRhAJxi+?= =?us-ascii?Q?8VIYhzsbabO/GGNzBs0KuUe3WTlTd7jHyWhh74g4PDCnU5ZkROz37rdO993b?= =?us-ascii?Q?CuPV2fYdt3uec5uZqdkLYcLrTIA7K0xIgXbKudt6XKbWlWron4U1oX/5KEcZ?= =?us-ascii?Q?ONEjWtxz6d/YmxJkxQh0ntk5I3uPzj2RTCzRpHdqAqMuaewVTnuAxgf1tpEa?= =?us-ascii?Q?DkHjP0OUrAZB3ua+HyLH1VRbJ3Tk1fFgqkC3dbYFgw31foyc7d/qFYWme/JG?= =?us-ascii?Q?coh7JDl1U59eZGtTkhCYcDkTwkmGxkG1LakIE4JGDAv9RnOW7HNnwrmrdjXc?= =?us-ascii?Q?X8tsECN43v6JFokNTjQsS5k2ZGfv36szVx6i5S4hTffXQUTYelfnfW8k6hps?= =?us-ascii?Q?xA5a7QiF49LxZsjDqb9lWHPw8Wrj+4buD/HGm2F8Jvip0HDGExzxQVFfw259?= =?us-ascii?Q?SD6YQBoetsfHpCt/V+keMEsD/cR9eeH5yTfJ24NhPchtMJxCCMYWjXK5MPiO?= =?us-ascii?Q?77e4j4g=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230031)(82310400017)(376005)(1800799015)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 08:10:59.8288 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: af6ee75a-f9d5-4de2-1375-08dc83a4b41c 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.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE3D.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9084 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