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 AC43D44173; Thu, 6 Jun 2024 12:13:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A787F42DFF; Thu, 6 Jun 2024 12:12:45 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2062.outbound.protection.outlook.com [40.107.223.62]) by mails.dpdk.org (Postfix) with ESMTP id AD5E042DFF for ; Thu, 6 Jun 2024 12:12:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L+6chFMbwdWZqvAV2EqzaQF1cp8o+68kRnabaaX3KlgLSwAcg+LsjtWJkyxZqI2QBctNQ4Au/08wreO1Ov2Q2EXcZE3EUsLFIQLQvAmBhLLhUNhEyqIgOKfAPjNKDhZgY1etVvkWAkKkD+E9Uug/xEhJ3umciKq7WfevE2u6Vm2Y84S7X/6w3bPY5SS7uqpibZX6L/B6jVJIQx+pg6OM87bn6NKuqncaO+OqXL0vuSwtum7qf1RVubQT3MrVY8n+T+7kUWwkoRf+8xPnYoav4FbTFntaNdIadW+DCPGaVlBsSCUY/t3gG3hNM+Aejxg0Ch++WIFi8GuRdiCXBRNh1g== 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=oCA+NZ67NaSubrYEK0q/tqZ5Brjl9GLWH6hnVe0tAlE=; b=frv+/uLPahJKwEj+6WJyBniyI9rGvxiMFyGlc8EVNaZ/LXmbz9aMDnF4ShCFq31m92jLPyd9BxQwJIny6WzORINFFcqRBuhJxU7XS7FESnJ/liicPcdQ3Nihqrtql4+VvEuRaKCWgDtEXxD05Z3TsL540iLm5yD/fFZ3VUnwgydALVjlnWabfmOCsMk/nS6n4npLq5dsqRBuXF6WfzoyGJthY0x6J22ef+Z9oYC4XLraHrxbQtvolm3PAjBQGzjqXwqy5T8b4ySG1fTZ3m96Nu9WsVlj335vhYUOms4JFfR82tuKgtzIJmOXTy6NIhebXRY44xKkskFt7/OUK1HyXw== 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=oCA+NZ67NaSubrYEK0q/tqZ5Brjl9GLWH6hnVe0tAlE=; b=FDpeBK0q3gX/PHbG6hhqspvPjymPO4VKOVGEYrqgRi5SYCCwSkjWZ/qTWFjW4y7BqSsUQDZETJtdBBEFqL1ySLFqwfO87dqo9ee6Aqpv91+H3/6DJ6Z0bzRFAewyqB9SZIPhwQ2vEv7iIeBI5vOkDBjoOCvRp+OGBsGcuj5fnJoJSrEepgz134Pmi2F0bnGLmxd3/Omp3KmjPGt0r3EK1P4/sVJ/7quDmGI8Gc+nNyev72E3DN5qFjmhIG3waHerAk7bZ8LjqOQ3eoRsceq60G3cF2+0z85t3VkFlqu9sXxHkuxKwvzi6v6Q2TOWi6j1t0bn9gy1lGdoyr4y7zVWMA== Received: from PH7PR13CA0001.namprd13.prod.outlook.com (2603:10b6:510:174::7) by CH3PR12MB9172.namprd12.prod.outlook.com (2603:10b6:610:198::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.33; Thu, 6 Jun 2024 10:12:41 +0000 Received: from CY4PEPF0000E9CD.namprd03.prod.outlook.com (2603:10b6:510:174:cafe::2d) by PH7PR13CA0001.outlook.office365.com (2603:10b6:510:174::7) 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:41 +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:40 +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; Thu, 6 Jun 2024 03:12:37 -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; Thu, 6 Jun 2024 03:12:36 -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:34 -0700 From: Maayan Kashani To: CC: , , , Gregory Etelson , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH v4 4/6] net/mlx5: update ASO resources in non-template setup Date: Thu, 6 Jun 2024 13:12:12 +0300 Message-ID: <20240606101214.172057-5-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_|CH3PR12MB9172:EE_ X-MS-Office365-Filtering-Correlation-Id: 124bb14d-4b85-460d-a27d-08dc86113329 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?BNGT2I+uq8UFR5ZHNXGOjk3wRBOtvpqzTPx/QdnBI2dOclFiJuYLpo1smulb?= =?us-ascii?Q?mKuMdDaFmjy205NB+TtyASpD6xLqViGjP44ay0+wKi9Lpu5nEZM0akgzhIym?= =?us-ascii?Q?rubSiRo7cVcXYoKhSF3KjvZUTrFScgzey/kIrz2iRWkcaanb+uAx2Ylz4uXQ?= =?us-ascii?Q?qR6nx23f4qOI+T+1+ezeWxWYDF6RiuVFSEmHcKtl5s7+2SVGGpx47Uj9+zng?= =?us-ascii?Q?mM9WsNbuMRWgx+5Stwn3oi4Upxu7zgHgJzJ2AOnyzYUQiOldx+wqrxFfDOKL?= =?us-ascii?Q?ndSeVgZ0cYhiSF0ClEa6Dsd4m570TNoI7JQ3bp9cNxQY1p/KWvK8HoKbPxol?= =?us-ascii?Q?knAf6RVrqPiXs9EYnLwWzUljEJqVZnpapVel396kacxgfup1SiuDDBWOq7CO?= =?us-ascii?Q?/3B1cp+ZbxtvPqKMomzq2u/JSMMyCMmlT8UW1RuvfobygP+nbx23BHiWcbO3?= =?us-ascii?Q?nFFtSl6i5I8JDsaHT/fg/p49jqIfxGvg+jwFx7g+nX0EmjUG8wEHjiBlrJrZ?= =?us-ascii?Q?VYgpR69X0Fb8RYSikWvrqUTgzeDPwydiGXxZztjvgp/7VMIgiKRcJJ8sNFii?= =?us-ascii?Q?GSAqllbyC/KNoeANSIoudngE2slPW51HZ7p/v94usLY2Q4mgFSfT1DWshmyW?= =?us-ascii?Q?G49w6WqoGvQ4ud44Q+yfhhBrTOEzWruIw5HzW7xB8czj7yVx14KPz9UJuzHt?= =?us-ascii?Q?sJZQg/tBdsxeaVfyRnz6uifmBA/JeydGnTsu+VOWiYx81iFrkVn6r7JVZRhC?= =?us-ascii?Q?vuf92sineAuvZ5CF5/9WJaO3mX6KNrr/sKltoAsmUhTXyjWszJX10z4sLCog?= =?us-ascii?Q?FqYyTI08cQSPuxL1++QhFZZaVHCIkmlrWBvUyevgXQb7S4kZwT0ERDv2Xtfd?= =?us-ascii?Q?1NINHERsMIluT/n/c1QdILP+SKr+f7Vr27dkxIKfKXeyYQ8q/ebevJEUOVhw?= =?us-ascii?Q?upxvYiDhcmCTyUJBnVdK3IOC4Vv5v6Vd/iQE/OqKAu1dOArNGJ1U7lit/1c0?= =?us-ascii?Q?QdkEhECo191S9VUZFswh9xIc4FfsXoZtjUdWE4lQnAXp3BA3Zsltu0RSmtc9?= =?us-ascii?Q?FXniJUAhzBhniG79OoMTr62cFuMdEwB+Bb4isYXs1RftiTwogjLaO4/fyXnz?= =?us-ascii?Q?P0l9qD79lWhNhZc2mSxEpS7/D6ikUZhtwjAjzsIb5oIgnXFjl/q8iV+27ZYN?= =?us-ascii?Q?ZZ+OtpdwT8wawfaAfkbVqQN9Fqfv8scjXIXBUxMGfN1NV5rEZXv+6TklYbYe?= =?us-ascii?Q?x8DBZrSYYkzVL26vAWMFE892drCkSurHkvNPfq1asBktX6d0HHKsJFcMkO0+?= =?us-ascii?Q?JNICeG61H+Mmrv6V4c/vc3CWR80oEZXVxt7CbwvMQJEdVd7PCgR20lWEYVkH?= =?us-ascii?Q?tRFLfCnDUky0rKaxFmw0NtVAB5lcuoEHxLuXIMnmnK7T5zg7pw=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:40.9606 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 124bb14d-4b85-460d-a27d-08dc86113329 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: CH3PR12MB9172 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 Acked-by: Dariusz Sosnowski --- 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.21.0