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 0882244173; Thu, 6 Jun 2024 12:13:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 16B1C42E1D; Thu, 6 Jun 2024 12:12:52 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2080.outbound.protection.outlook.com [40.107.93.80]) by mails.dpdk.org (Postfix) with ESMTP id 03A5142E0C for ; Thu, 6 Jun 2024 12:12:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y5JTVcyFBuHmVZTNaVOsJhBSnrCykfgiOWdc2h/hZv002ICNkVekPqVgPC+y6ZLftUrC+wQ7k+ScA13jICPfqXCbSn4lNwG+u/DLeTqqjpT1T+8EzPOVALWMPqWtJjt8YIm/Z1fAmwzyhJvBHPDszhjVvvM+t+cVimDOM1YiKIIO6QqRtO3LZ+yjr7pt3G9IBMQG26mPTDyLfiIWXPSDeRvHEfowZehAd9hvUAQooiEO0CXAn4Y1RUBi6/ZOL349E3FBkEKC7pL3zYdhz1BJM3vXN9u3IpTB3J6cMTM39lB6LzuBZC8U0SFkPrAiGmIb/HGvYGjR90cIVQmK2cR+pA== 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=ItTQKKkNLdWvCKH1TEr85v4cP+7K3XapGOVi5xKclZs=; b=Bd1EMcwM4Hg47bZ5iVzHHozKy80F2N4+d19MtUmuSf605LYTnN+07zPeWXvCnAKw3OgJAoXz7h8We97dec0tMlWXmLXpAUg2qnrfAy7Q+f6gN4FcGDO1z/cwfJ1q+t+UXXk9tWSvX3/cM79X2BwvDhl4PUxn+XmOXgfuzF26XqP/Pr7FW/IZjOBCoe8EFY/7LiDYraCa9ftYQwuj+EJkZlxdF/ebmLTPQtKuDNxJioN2K7hrcI57/9V9HnRWOEB64ucHHQLrFKouH8XvW0cO6nfZxSsp/KDYiRC4IOKNUjqQNo9BAuD2tSfjpogRpC49IuW61SllaIinKZydKh9b9w== 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=ItTQKKkNLdWvCKH1TEr85v4cP+7K3XapGOVi5xKclZs=; b=dnpALkXegGal6wjjKmxfBrqUWkUAvsqG4gzoKhkEPRlqGFC/cOKm7YJ+OYBWBb+e2kDb5Lyh8nAIRV2bwdbecyyStAyv6BkWlBLjjrVk3xQsuOpUQXnwPwnUt0k2emp/eOvKPNFUNn/8jCAu32RaooFw6lIotd1V0tbNxIeHnR+aWxRrnMvCiLKdXCYQ2ioCFTQsXbcL6IZRlGMUhY5ApSrMdYoN2MhKQUbZXZvv2HE932PmC+esN6GE4I2JEn1Z7sRbXp/q/ygYUT6js5iEYYsCe8Vq1dHmev5bHn0W331tlInf8/9uEvgoUczzLLezkAfoE7f3M/8BFu7AarJr2w== Received: from PH7PR13CA0008.namprd13.prod.outlook.com (2603:10b6:510:174::15) by IA0PR12MB8907.namprd12.prod.outlook.com (2603:10b6:208:492::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.22; Thu, 6 Jun 2024 10:12:47 +0000 Received: from CY4PEPF0000E9CD.namprd03.prod.outlook.com (2603:10b6:510:174:cafe::ca) by PH7PR13CA0008.outlook.office365.com (2603:10b6:510:174::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.12 via Frontend Transport; Thu, 6 Jun 2024 10:12:47 +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 CY4PEPF0000E9CD.mail.protection.outlook.com (10.167.241.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.15 via Frontend Transport; Thu, 6 Jun 2024 10:12:47 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) 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; Thu, 6 Jun 2024 03:12:44 -0700 Received: from drhqmail202.nvidia.com (10.126.190.181) 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; Thu, 6 Jun 2024 03:12:44 -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; Thu, 6 Jun 2024 03:12:41 -0700 From: Maayan Kashani To: CC: , , , Gregory Etelson , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH v4 6/6] net/mlx5: support FDB in non-template mode Date: Thu, 6 Jun 2024 13:12:14 +0300 Message-ID: <20240606101214.172057-7-mkashani@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240606101214.172057-1-mkashani@nvidia.com> References: <20240603105241.10482-1-mkashani@nvidia.com> <20240606101214.172057-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: CY4PEPF0000E9CD:EE_|IA0PR12MB8907:EE_ X-MS-Office365-Filtering-Correlation-Id: c7bb7862-98aa-4fe2-4e43-08dc86113702 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?YnmEWclsJ11TDlRSKN0p99ntfT4Mo+ql2UbN/G4SY52BVIw78a1z3KrDxkHI?= =?us-ascii?Q?ZVvl3gsjXCRMLwkDcmZQ9msRHiQxCOp/uOvuFDzVvnsWs4+++Hf2MVEZe9qS?= =?us-ascii?Q?Z4h14XKC7LLOyLmK3jf2IEnk4EHbo4bM9FoDXMlWkZcdfLjKxKN/C6tsQkr1?= =?us-ascii?Q?TMCjte5jkZlzsU/ac7GVTaeSsBYFuGJ9t0flY8wjqGgAudK6tqjEP2x7Y2HV?= =?us-ascii?Q?Xp/bQJsluoUYehXsJGmOwIy5JP7Wzlet/hpaYfBqoH9jrT5XuOUtSaGBow6t?= =?us-ascii?Q?F+0ySAspU+Q+8jWR4e28Ts+k1qbZaxMYu8NWnmRjgfDujqqFJr7mquG4NON7?= =?us-ascii?Q?4MHJPvfCARaqfULZEcXBOdlk27eSl9ZXd5Is/HpjYPpr0cwe3uhsclhO88HI?= =?us-ascii?Q?U+FD+REk/dJVtiCnafFw3QSGJH7lo04JEPQp2z0HikI4lGMO7r/aRVk6a9My?= =?us-ascii?Q?IJ5LV2mKyeaVE8SZ/EVo1FqDbOEunQQVYxc15BwfrPfjPSeHalI+WjalslCT?= =?us-ascii?Q?3DrmQg+16q7dDCbRBgKCMmXQdLhz9VAZFxoJ4V14mDQUQhL7SC6c1nzigezd?= =?us-ascii?Q?a14cTgIX9xFodKFL9Ir+uAxX6WJs/lV5bxH9+siVexmTELrpAPmVEDYIPNfu?= =?us-ascii?Q?XKUzpI/lM7d/HPDaGq8HF3urj0d2ZpBsKFjUydW2LW6aXWjRGdjr3rCoEcLV?= =?us-ascii?Q?WUrXfZj4CxG12P9TaO74AgyVRzzocGXdDesRnWT+MKFUcKc3T5wHBw3fmFQU?= =?us-ascii?Q?oMce/sr0uFgzvuBh/qHhguW8KeOUe4VtI6zV3vVqQ4Xg8X1QsayLJr9O9mYQ?= =?us-ascii?Q?6c4x6dOxiC6i18dRNGsAtPOPbepD6jro+QNfqIQSKCzGbPcI3hcOEh4RT2xb?= =?us-ascii?Q?c35m+CVupIuvJ6Yfsc68q5yHZdMzCL0/NimwXRJm28RS54AcbnNEWRdkdW2v?= =?us-ascii?Q?/zT8XqMZqXq/w0tJ2IdyLxvR2udeUvtFdsgmWJJGC5MrBgUqlbKJC4zCNdwY?= =?us-ascii?Q?Ib5Lrfhk7m9mxbp/Zc0GUrg18VX14LcqNWYgerIdkF6kL+3yzYS0utRzv3cL?= =?us-ascii?Q?/e8EM2NnF2LpDAzEwxjZDfrqw1uX0oOc57ZB01RkOti/M/mvNpuq5AxoZ1Lh?= =?us-ascii?Q?wOPFpUkESmuWu24T1k8rFFTUbhgvqsItgbNgnjHrL9rdLVX+ooE0gz3WsEDk?= =?us-ascii?Q?M56NOwhVQ2Ng1klnYu7wCKfSRY+B5AArpK9RoY4hWf9jBOzFFmyzNjdYPDuV?= =?us-ascii?Q?7jjOhWuzsbAbn56apmuwEg3P1Sh/+ayWAnYBa998EwchoE1D/NPWfeVdSfS/?= =?us-ascii?Q?Ca3z/NgIsAT19NH6Ijojt7+XRasB/97P85A+owTW+8kDlJZ8bFYsrWljfK5n?= =?us-ascii?Q?G1AdwLT8NIEZi1XqIMWi0PVnKXmX2ctFTdZutlyuzxWRuyk+hw=3D=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)(1800799015)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2024 10:12:47.4138 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c7bb7862-98aa-4fe2-4e43-08dc86113702 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: CY4PEPF0000E9CD.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8907 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 66e0b46f9b..43bcaab592 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -12614,6 +12614,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[], @@ -12640,24 +12662,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); @@ -12668,15 +12689,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"); @@ -12899,6 +12921,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 @@ -12945,6 +12973,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