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 079FA44144; Mon, 3 Jun 2024 10:11:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6D13842E1A; Mon, 3 Jun 2024 10:11:17 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2089.outbound.protection.outlook.com [40.107.92.89]) by mails.dpdk.org (Postfix) with ESMTP id 58C2B42E15 for ; Mon, 3 Jun 2024 10:11:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ap0aU2NvncC1VJO3k7p4KlePRKhcno1MDflNyhF/4OJTutaSuXuaXl3EtfwydSFiThOnHiHLGAvG+LhfPITV/yKZdC9+61R7vspL7gqCKV1sFjImRaxEVuzGf3coW2dKF+XSVFsFWr1MjZy7uQmNMA4fvcE95djGQE2oCmXGKCVd/eVFHBMzHRP4nneZePon4RLcUvms3Q560HCG/jDgc0CCsfRGmmHYho2aO0ErbIaYE9rOpe53BDGTeTGgQ+IP47o13M9CgTlc2BIlPvwXtmRUwtafOFUivD45vFfUXpwbl40+a8eXblEZEqNL/rrA90llS/5ogACrTeInS0BF7A== 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=LL9OzaxmdWYlUPkq12YOGw+iCSIJh8qugEx6lCoekEU=; b=Ekw+wqu7fljyKe1dac2BdhndBAm6eZ4DhSLfiJVCPAWxgZgtX5bznz8AUVxk5qbY13LuolMkwfsuhnP9zBJAuA0nhsbN//UFC1UK1z8ne2NZQGuWRxFIS/OOxt9LnNUxPrChtNlCuN51L5QWvhVr557DbW7RH6cXf86/vfIycr4ndk5MnEZmK4yU4tShwj3uKHxoe8uxdRHrWreu+eYtfpSAo3eIlng7Bq+FQm7+94X/+m2kh3fgQfl5c1na4WndWVrpFFzhiPDUv7CGXtYNn7bK7sJN0cJm/zfcCPTM03Con2Y5lLIyEbNketxYiEGVHT6hFmGQ1qJ6jFIl5+YRsQ== 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=LL9OzaxmdWYlUPkq12YOGw+iCSIJh8qugEx6lCoekEU=; b=mjJxWBrwgMPUzZdSxWn6iAlw34KzxQV9yr4zbYbRYDCMPf7Su8A4XP2/WjpqM+P0bmR+k+N27zzqdoYO5gehJYVtbXwq15GQGq9BEYYgL0VPHx1kRGszcU6oOo7I2ldPfjrBLlpePDk+BQAVZjYv+B35IIGg8FsjmXcIXqHjOV1y3vq/hZ9VJigjolzEBbGIXPfhXm7vblVp7G2+4WnhZuqgJY7nbEbuErhoLVu/VKfyTe1kdaC3WvTb0mKTxrlN9CbyGGg9YOlY4di3bjPa46jUaO6I0dAvSzwCeRg4+Pphin38Fg+ElvaQi3i/rYgsHirQkx9VN1WgFXMGDgpgyQ== Received: from PH7PR17CA0050.namprd17.prod.outlook.com (2603:10b6:510:325::22) by PH7PR12MB6695.namprd12.prod.outlook.com (2603:10b6:510:1b2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.25; Mon, 3 Jun 2024 08:11:13 +0000 Received: from CY4PEPF0000EE3D.namprd03.prod.outlook.com (2603:10b6:510:325:cafe::b9) by PH7PR17CA0050.outlook.office365.com (2603:10b6:510:325::22) 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:13 +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:11:13 +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:11:03 -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:11:02 -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:11:00 -0700 From: Maayan Kashani To: CC: , , , Gregory Etelson , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH v2 19/34] net/mlx5: update ASO resources in non-template setup Date: Mon, 3 Jun 2024 11:10:40 +0300 Message-ID: <20240603081042.3109-4-mkashani@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240603081042.3109-1-mkashani@nvidia.com> References: <20240602102841.196990-1-mkashani@nvidia.com> <20240603081042.3109-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_|PH7PR12MB6695:EE_ X-MS-Office365-Filtering-Correlation-Id: 08b3db73-ed8e-45cf-28a7-08dc83a4bc10 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?vdiSVFMirwmIHep7odzSsWpIQHWhjcMF1B+oWi8Dj727e7feHcV22unTMAoC?= =?us-ascii?Q?ZaeOpqJWuUuIJKjsv8dIc3ifN8EE+FMtVPSY3dDNyXRvlTe3Cf47AZ7dVSgN?= =?us-ascii?Q?ZTlMHyXstvYgFmOhJORchyexGO5WfTzBgscL4P5EmelH7tiIXhvxw7kdkZtZ?= =?us-ascii?Q?NxDjM0t0RQnF/ye2gQ5q9YxyX13cuF5xl4Iv4JzKTprVlqFcltp6Ft9mL6Ye?= =?us-ascii?Q?hKQhQZNlp4W1Fwc8yDitP3epOMwOs59vKsZOXo5Hmh+yIhyQv2d9Qr6DELKf?= =?us-ascii?Q?HPCdg1jV3OMvWV4JUEhcPip1KQ49fRuoCF5+UZDLqqLhmh3S+45UH6VRAEAl?= =?us-ascii?Q?I3Pc+uTtxL2sffdgiL5LiUCP/ea1Rw9HDWtTbZj0blwPHnnNN5QHUIRxL082?= =?us-ascii?Q?xv34IRV95eELdwjdDwAuTmCwlqXPlpix9iMi190kxqJW9y4whrKOvS4kH/ei?= =?us-ascii?Q?b9PKxV9COYZip8gYXPP+kHuhVOjegFBhqQWDC3NeV3Di4Y+6sCkr4KCRyY1g?= =?us-ascii?Q?pfWiN79Afv6qGmy3cwJipFAFyhXdAoZfGy2VeD8mPjthk/c+FFcQpnBAHzE+?= =?us-ascii?Q?Owm0gCMBXorLEy+rx9axU9bTTS+pWOl83eDWGF81VOabmh1YU4F7IxX2cdpf?= =?us-ascii?Q?zjeaEjUUbzoFgVMIqgoC8M1WI5t7PBojZmdSsmnktprr+e3wTTXLDboXyrGB?= =?us-ascii?Q?84jHOUq9Vx6fCOMISzP/NRULU0nfq28fKp0idTJL1pzEkY8sC5fLTuekBAhY?= =?us-ascii?Q?pDZP2RMaJLIFJbWFfsoAUUTlb9kU1yetdpxmLk7oo6XKADRPkQ3EbyHbUezC?= =?us-ascii?Q?Ao1FMUWlsvjkQBT8TImAua61pKjvVljYNnQHO/LlWo5K7sczaV47ELTOesqs?= =?us-ascii?Q?ioumcdOM1AOzBG9T0KqM8e7Wqg9v/NiQj3wwmXCIZi41/C4SDqzPeMnvpbtZ?= =?us-ascii?Q?07h1a9lhK3yT4P6cfxK2BH3a1wP3wv0CqW0C6fQE7h8ph6USMX+z67U+iDSh?= =?us-ascii?Q?6SLATTfDU+hCtcc6lVCW7geea9RCTC4hK4+Tx8SY8bX/ffIG9tGc0/Fhsveo?= =?us-ascii?Q?FqsEzq+XY+n9e87qcHhg0tXM9tAaTmkZEZwA2hITZL1+GFv4V6Di9YuWIktb?= =?us-ascii?Q?r4kQL+7UqA06Ewb8oUZjtfxC/gpmbBQ0CC/5rfxe/bX41KT6vnzc/pMUBRDG?= =?us-ascii?Q?Fa/i2ckSqMXwzA3AKMQBuwV7EO6jgd+X//usTxLPGqG3JErTQi85n7lcfSz0?= =?us-ascii?Q?sK8CPbLejY25d7hR29h7f2rglRNAM9uFa6SkC0/ah3/wvgriJebcnNDRtYgI?= =?us-ascii?Q?d8OrLrZZ4w3ohgBSZbzw58rxz7zJM+LDb1u30saeSNb4zq/C2ivzblJblL58?= =?us-ascii?Q?150NoFDRCQG9oJRohztop/zmMJI1?= 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)(376005)(36860700004)(1800799015)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 08:11:13.1568 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 08b3db73-ed8e-45cf-28a7-08dc83a4bc10 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: PH7PR12MB6695 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 Non-template PMD implementation allocates ASO flow actions resources on-demand. Current PMD implementation iterated over actions array in search for actions that required ASO resources allocations. The patch replaced the iteration with actions flags bitmap queries. Signed-off-by: Gregory Etelson --- drivers/net/mlx5/mlx5_flow_hw.c | 102 ++++++++++++++------------------ 1 file changed, 45 insertions(+), 57 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 9f43fbfb35..f2ed2d8e46 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -12671,79 +12671,67 @@ static int flow_hw_register_matcher(struct rte_eth_dev *dev, NULL, "fail to register matcher"); } -static int flow_hw_ensure_action_pools_allocated(struct rte_eth_dev *dev, - const struct rte_flow_action actions[], - struct rte_flow_error *error) +static int +flow_hw_allocate_actions(struct rte_eth_dev *dev, + uint64_t action_flags, + struct rte_flow_error *error) { - bool actions_end = false; struct mlx5_priv *priv = dev->data->dev_private; int ret; uint obj_num; - for (; !actions_end; actions++) { - switch ((int)actions->type) { - case RTE_FLOW_ACTION_TYPE_AGE: - /* If no age objects were previously allocated. */ - if (!priv->hws_age_req) { - /* If no counters were previously allocated. */ - if (!priv->hws_cpool) { - obj_num = MLX5_CNT_NT_MAX(priv); - ret = mlx5_hws_cnt_pool_create(dev, obj_num, - priv->nb_queue, NULL); - if (ret) - goto err; - } - if (priv->hws_cpool) { - /* Allocate same number of counters. */ - ret = mlx5_hws_age_pool_init(dev, - priv->hws_cpool->cfg.request_num, - priv->nb_queue, false); - if (ret) - goto err; - } - } - break; - case RTE_FLOW_ACTION_TYPE_COUNT: + if (action_flags & MLX5_FLOW_ACTION_AGE) { + /* If no age objects were previously allocated. */ + if (!priv->hws_age_req) { /* If no counters were previously allocated. */ if (!priv->hws_cpool) { obj_num = MLX5_CNT_NT_MAX(priv); ret = mlx5_hws_cnt_pool_create(dev, obj_num, - priv->nb_queue, NULL); - if (ret) - goto err; - } - break; - case RTE_FLOW_ACTION_TYPE_CONNTRACK: - /* If no CT were previously allocated. */ - if (!priv->hws_ctpool) { - obj_num = MLX5_CT_NT_MAX(priv); - ret = mlx5_flow_ct_init(dev, obj_num, priv->nb_queue); - if (ret) - goto err; - } - break; - case RTE_FLOW_ACTION_TYPE_METER_MARK: - /* If no meters were previously allocated. */ - if (!priv->hws_mpool) { - obj_num = MLX5_MTR_NT_MAX(priv); - ret = mlx5_flow_meter_init(dev, obj_num, 0, 0, - priv->nb_queue); + priv->nb_queue, NULL); if (ret) goto err; } - break; - case RTE_FLOW_ACTION_TYPE_END: - actions_end = true; - break; - default: - break; + /* Allocate same number of counters. */ + ret = mlx5_hws_age_pool_init(dev, priv->hws_cpool->cfg.request_num, + priv->nb_queue, false); + if (ret) + goto err; + } + } + if (action_flags & MLX5_FLOW_ACTION_COUNT) { + /* If no counters were previously allocated. */ + if (!priv->hws_cpool) { + obj_num = MLX5_CNT_NT_MAX(priv); + ret = mlx5_hws_cnt_pool_create(dev, obj_num, + priv->nb_queue, NULL); + if (ret) + goto err; + } + } + if (action_flags & MLX5_FLOW_ACTION_CT) { + /* If no CT were previously allocated. */ + if (!priv->hws_ctpool) { + obj_num = MLX5_CT_NT_MAX(priv); + ret = mlx5_flow_ct_init(dev, obj_num, priv->nb_queue); + if (ret) + goto err; + } + } + if (action_flags & MLX5_FLOW_ACTION_METER) { + /* If no meters were previously allocated. */ + if (!priv->hws_mpool) { + obj_num = MLX5_MTR_NT_MAX(priv); + ret = mlx5_flow_meter_init(dev, obj_num, 0, 0, + priv->nb_queue); + if (ret) + goto err; } } return 0; err: return rte_flow_error_set(error, ret, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, - NULL, "fail to allocate actions"); + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "fail to allocate actions"); } /* TODO: remove dev if not used */ @@ -12861,7 +12849,7 @@ flow_hw_create_flow(struct rte_eth_dev *dev, enum mlx5_flow_type type, * The output actions bit mask instead of * looping on the actions array twice. */ - ret = flow_hw_ensure_action_pools_allocated(dev, actions, error); + ret = flow_hw_allocate_actions(dev, action_flags, error); if (ret) goto error; -- 2.25.1