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 61CFD41F67; Mon, 10 Jun 2024 10:51:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A88F40A77; Mon, 10 Jun 2024 10:51:37 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2087.outbound.protection.outlook.com [40.107.92.87]) by mails.dpdk.org (Postfix) with ESMTP id 4E7BC40B9B for ; Mon, 10 Jun 2024 10:51:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MjN9KQ1ycLpuhs8L51UxHQTSGR+WMOhK75s9JwJh34pyf1IoCqoMblolXED+zFNOSfLu7ozS2OOOScFoWe40IQPV6f1oxh42VQ2L4OBjnW0SoyloFRZuYGVBoNO6mu9Q+D7BplC2o31sEGOQ5Z6MH3vZtU0MFB6MIMmPCOKGjFl/DcAAaSl1DkYmpOL8X7kMQdjj8ZcFsQpZx2Fc1PxQ8LsgkFBdf9UI5UhTxc1br5aqcVr+bMAkFl16kj7io9185n0lUkYKiIiQWrUVf4qgvKe28aMSmwQWcwc20bjFfuUx6MoRxR6O2SuR3+k5kxzLlMzbICCxXD3Oej4KIjwglg== 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=ja09f7S2KuNSDhCFDAO0EBOaWIBP5S/AE5h2+H8v8es=; b=QuJI2FRz7qTHtOzPQKBTfJ5ufZuOPTz02WyUuIOVAXOo+hE0rVH8f+YJOoSTU9ktSpPXcIxV7glqkrKgU3jQWKVHzvRAZIF1zOFV41SFbR5/C4CjNZUnSux6Z7sb3GGLPvwJRH9vTj46E56fckI1Uz362O4a/EkNwcuUO2KvAR66k7ihmJHb0ZWSgUbR5DjbOXxJ6JXOh2q3jy+N8HB+DkZahezr0UCkSfjgpr0TlJ974AvqC++S2NF4FsNtJIMCVyXmKswN9FkTD0RsyLjK8ka9Bpppaz2eKdVJyMTpoOnTgU+8iFY4BCx4ff2XZaH4R5jWqEemn9MuSWITjOgatw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=ja09f7S2KuNSDhCFDAO0EBOaWIBP5S/AE5h2+H8v8es=; b=JcDpHvuKh5AnMQ3gXudDxtu2g3pkfNjt4yiM0LkSIbHu0fVYvslWQ7hgo7GfhpOhQI1B7I9xunsSPIQGKLmEjIGAP//7qVEQAg8xuiZW3ExJVxUFwNPvk9vRjoXiHZQC6PUYq2Wz91rZCkqOtFJSDuEQ9kBj2JEzJdqSSHkr+GnW5W9pyRtxZpXpP7zFzitimLGXeD/m6nn+sSeay102hWTtmquNAbn0IYMeQMXh11+ZDmPYqatDdBG2mLTp0XA9hj+Rn6UmTuccJQLtdYnNxXhpjuoRfdwf1spa/2xH5vsET4lSdDUX1tCGNda6czFdmDQpZdp2PY3pvFL5akV1Eg== Received: from MW4PR04CA0347.namprd04.prod.outlook.com (2603:10b6:303:8a::22) by MN0PR12MB5977.namprd12.prod.outlook.com (2603:10b6:208:37c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Mon, 10 Jun 2024 08:51:32 +0000 Received: from CO1PEPF000044FA.namprd21.prod.outlook.com (2603:10b6:303:8a:cafe::88) by MW4PR04CA0347.outlook.office365.com (2603:10b6:303:8a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7656.25 via Frontend Transport; Mon, 10 Jun 2024 08:51:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1PEPF000044FA.mail.protection.outlook.com (10.167.241.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.0 via Frontend Transport; Mon, 10 Jun 2024 08:51:32 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 10 Jun 2024 01:51:21 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 10 Jun 2024 01:51:20 -0700 Received: from nvidia.com (10.127.8.14) by mail.nvidia.com (10.129.68.8) 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, 10 Jun 2024 01:51:18 -0700 From: Maayan Kashani To: CC: , , , Gregory Etelson , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH v5 6/6] net/mlx5: support FDB in non-template mode Date: Mon, 10 Jun 2024 11:50:39 +0300 Message-ID: <20240610085039.146356-6-mkashani@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240610085039.146356-1-mkashani@nvidia.com> References: <20240606101214.172057-1-mkashani@nvidia.com> <20240610085039.146356-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: CO1PEPF000044FA:EE_|MN0PR12MB5977:EE_ X-MS-Office365-Filtering-Correlation-Id: 231d795b-61b5-4e5d-5c6b-08dc892a86da X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|82310400017|36860700004|376005|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?2bT/vLFl58AMKYxndk50+qZITEqtTEtDoxxikxbS3z8vIWPYS/cNE4meusXh?= =?us-ascii?Q?OdimvX+Zau95NN6WkGGj6oMrsjG2/oP7/ry8q/3G9RNlLrfyecvDj3Qb/xxK?= =?us-ascii?Q?OBKL1INUJpeBFn7YsMlgh70DKOnWr3fbkn9gmwz/hRiylb6L4w3vEV+DhKhJ?= =?us-ascii?Q?ESO8zdk267Bn8PQ1ezQjjfF6Jdg3AM95OBggefPuQXYxekyTzpafYnWsO8v+?= =?us-ascii?Q?GcUqtj0p+f4SQ9CX9+8kEpbFOCduR7A1z5H7NkqmJjRQl1s6C8N1voV87R/Y?= =?us-ascii?Q?27VHEhMcO6czRIOYhpSqEWuvvR+xLoArOvwNseUeq8ZohbB8p2IanUWNnVlv?= =?us-ascii?Q?yZ8xl+gMAZGM/ua68zXGR/6+V9kB6cXeIubnaWnB8bfOsu+vB8KN0FFa69Ks?= =?us-ascii?Q?ZUMmtTbdThyTkLG9JsZY/9u3fPUBC1wjPEsOz6t1BNIVqp9+C/70kYAHFWAH?= =?us-ascii?Q?RbaBhnNhDYmZws8+7NcOhbD6cMmqcDM7LLozZ35MqQE8KUGSqKxLfTfYMgaT?= =?us-ascii?Q?3AaYn0B++ZLmMqR98walgV78zaEWlCxKUnr5hK3WB8ixuYx/oOuk4LBU+Qgd?= =?us-ascii?Q?m8Nxj1FGwrAoZd9xO6S3C+eTIOgpHttEFHAYfN/LeIh56VGm/8gs+nMFGDCJ?= =?us-ascii?Q?8kzEz1MbeikJLIJX1pUaqU9cRSuqceI++2MMmSe/ra78lhtS47STqEOx/0Qv?= =?us-ascii?Q?p6XbYdcdaInrb5eetp2tWEEH+Jh2htc6bGpS5IUrdMBYPVCvMmI1ZexqRm0O?= =?us-ascii?Q?elVfifrEHp/D4rDfkRputQmm30gsNL7hWJ3OD1Ml4lwffaryqKN7+xeYhsqK?= =?us-ascii?Q?0VSN4kmwcq+5Jh5pFA2P3RBRtOcJ+78jZa0JS9tLpIJYitS0TeKJ+3ZKIhef?= =?us-ascii?Q?jd5iUvk2c8L4/3C0knHKxqzcSZ1uT7eBQmY6g+wknntYTFKwbqftxP/55omW?= =?us-ascii?Q?DXQ/W3ipXzYrqmZ+jrZcNJZCCt8rrKvDpM20uOYL4h7mY+s2562i/5sPLeW1?= =?us-ascii?Q?dh8QCJWGQQL09cjcD9ggLvAQ7vGHGzsDJst4NixgbnL/LmVXQxBffwEBLOai?= =?us-ascii?Q?/kvYvJsrXZN+jx2DcnZJPsArn0msqkuXwnCUGB/OPgmCO5mZP8uH4Z42ge4P?= =?us-ascii?Q?RgIlVfO6NxzBlFYtidmW2YT/nXzCYKDsXT7lqZDFF0NSbrJjYuAJV4ggJ0nm?= =?us-ascii?Q?hMmiTwiJ98yt8pVj81ghOYwnlDsqJoDGtmwXfttjM18RC2nRvykXxnrScSgn?= =?us-ascii?Q?25MJbhOBduPZdzpXKJ/W/gHOSekccsx4OPohfc3aF2pWtuZIHDqCrnfWBLVW?= =?us-ascii?Q?v+AZH9O78qxd6b43TeUuj91zfVwAIh2T2GJS/IZny7AYCRRj4leAmAVq2ap0?= =?us-ascii?Q?zftZgVH8QslfOo3zIwgg0KTWmFVutIi6O2Zr3YAP2SKiqZHy0w=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(82310400017)(36860700004)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2024 08:51:32.2919 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 231d795b-61b5-4e5d-5c6b-08dc892a86da 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044FA.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5977 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 Support non-template flows API in FDB mode: dpdk-testpmd -a $PCI,dv_flow_en=2,representor=vf0-1 -- -i testpmd> flow create 0 group 0 transfer \ pattern eth / end \ actions count / drop / end Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 46 +++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 2cb67180a60..35f3b0ca83c 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -13279,6 +13279,28 @@ flow_hw_translate_flow_actions(struct rte_eth_dev *dev, return ret; } +static int +flow_hw_unregister_matcher(struct rte_eth_dev *dev, + struct mlx5_flow_dv_matcher *matcher) +{ + int ret; + struct mlx5_priv *priv = dev->data->dev_private; + + if (matcher->matcher_object) { + ret = mlx5_hlist_unregister(priv->sh->groups, &matcher->group->entry); + if (ret) + goto error; + if (matcher->group) { + ret = mlx5_list_unregister(matcher->group->matchers, &matcher->entry); + if (ret) + goto error; + } + } + return 0; +error: + return -EINVAL; +} + static int flow_hw_register_matcher(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, const struct rte_flow_item items[], @@ -13305,24 +13327,23 @@ static int flow_hw_register_matcher(struct rte_eth_dev *dev, .data = matcher, .data2 = items_ptr, }; - struct mlx5_list_entry *group_entry; - struct mlx5_list_entry *matcher_entry; + struct mlx5_list_entry *group_entry = NULL; + struct mlx5_list_entry *matcher_entry = NULL; struct mlx5_flow_dv_matcher *resource; struct mlx5_list *matchers_list; struct mlx5_flow_group *flow_group; - uint32_t group = 0; int ret; matcher->crc = rte_raw_cksum((const void *)matcher->mask.buf, matcher->mask.size); matcher->priority = attr->priority; - ret = __translate_group(dev, attr, external, attr->group, &group, error); + ret = __translate_group(dev, attr, external, attr->group, &flow_attr.group, error); if (ret) return ret; /* Register the flow group. */ - group_entry = mlx5_hlist_register(priv->sh->groups, group, &ctx); + group_entry = mlx5_hlist_register(priv->sh->groups, flow_attr.group, &ctx); if (!group_entry) goto error; flow_group = container_of(group_entry, struct mlx5_flow_group, entry); @@ -13333,15 +13354,16 @@ static int flow_hw_register_matcher(struct rte_eth_dev *dev, if (!matcher_entry) goto error; resource = container_of(matcher_entry, typeof(*resource), entry); - if (!resource) - goto error; flow->nt2hws->matcher = resource; return 0; error: - if (error) + if (group_entry) + mlx5_hlist_unregister(priv->sh->groups, group_entry); + if (error) { if (sub_error.type != RTE_FLOW_ERROR_TYPE_NONE) rte_memcpy(error, &sub_error, sizeof(sub_error)); + } return rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "fail to register matcher"); @@ -13564,6 +13586,12 @@ flow_hw_create_flow(struct rte_eth_dev *dev, enum mlx5_flow_type type, mlx5_free(hw_act.push_remove); if (hw_act.mhdr) mlx5_free(hw_act.mhdr); + if (ret) { + /* release after actual error */ + if ((*flow)->nt2hws && (*flow)->nt2hws->matcher) + flow_hw_unregister_matcher(dev, + (*flow)->nt2hws->matcher); + } return ret; } #endif @@ -13610,6 +13638,8 @@ flow_hw_destroy(struct rte_eth_dev *dev, struct rte_flow_hw *flow) if (ret) DRV_LOG(ERR, "failed to release modify action."); } + if (flow->nt2hws->matcher) + flow_hw_unregister_matcher(dev, flow->nt2hws->matcher); } #ifdef HAVE_MLX5_HWS_SUPPORT -- 2.21.0