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 E9B29455B5; Sun, 7 Jul 2024 11:49:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F3BCB402CF; Sun, 7 Jul 2024 11:49:09 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2056.outbound.protection.outlook.com [40.107.243.56]) by mails.dpdk.org (Postfix) with ESMTP id 6B8DE4029F for ; Sun, 7 Jul 2024 11:49:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O7/DQVgC+K3gy5HbbryPo2m7jv46quqXuvntRy4QpQd2Ff278ZwjGHBaYhPkzqB6q2SlQ/gSlefAyggBlO+zbsW5Rcum+PQHniAOBgOL7C22Ouzbq02jkUxO3I290/ln53LBHdx2WnNpIu7335ZsABLpM7pr6rhDPiOIg3SAllmGiryTQCG73X0VuTaMm3iayuz0yZ4JGqunNfH1gk3EGi8i7z4RxutAOLof7yMmWR2DZsHlvGRnyFSUSwPGUl5ADBS8zRNfjGKmoCzpbgM6t4GCid0+fMTceauF1h5DDqFA9am7apfHZ/RmZ9NMOUXYf4kydd2g1PAytVVkn7mUZQ== 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=vrZ8ngTrSsdyt2eXarsIs8z5whA9+6rZM7jGdl8ZLCA=; b=QAaVQnZxUm62ZxU7cFENRMlzoemkwgokQyvBS4Tk28/iU7pl+3/KCS6XF/VDOQHlDB/6sN4T+bKjfnCfFNHuVyAR5Feljd8ZIWaNXSBoBP1dem3r6DMGJEdSs6/t2MJNCwzNXq9SxH6DzlSu+Zl4z7xpSq8/CSUc6y2TCOjOb5azw2WWaS6AJ5qVGBCPEQstYkf+01GzEMVZPV3JFDFLu0ODNn2R225WuWNBDyhC714153X7q7oafn8W+fXEmjp/VDTaMnovZAqNFwsxcIpvmCFCAo//w/1ieYw2pW0N+uvphv5A+Qt1gDot7SAc9aY0O7DMwThc6UIja3mHyrPhlA== 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=vrZ8ngTrSsdyt2eXarsIs8z5whA9+6rZM7jGdl8ZLCA=; b=f+/BAwFwWHiRUYYyRu3XUb5Pkil7h6F22FtKRULkX+W26kdqEKsqamfL70w9pvd5rhDznDA2HlNY1aCgqu9lOBVTKjxgXSQvjPOgzLrgoYKbYymVQBdBsZja3I+0k71DTHwK0YBc1c3edY9a40OYtFUCaJGk+tLHpavS1gZ/LxRa4/NAbNUEfJsT1AvqeuuqDKpGGR84LBB9tAXOh6CUjei/SIFfwxiCcawfduWWX6SIQW/BzIzSTd1elWUArvCAYFryNTdhLLoumgEXN8lipq0feub5R3VgrzD4YDoonIOE/i70nQjlOV0CcVDDcIH1BVvh2niwebhP1fcCkLH2pQ== Received: from SN6PR2101CA0002.namprd21.prod.outlook.com (2603:10b6:805:106::12) by PH8PR12MB7028.namprd12.prod.outlook.com (2603:10b6:510:1bf::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.32; Sun, 7 Jul 2024 09:49:04 +0000 Received: from SN1PEPF0002BA52.namprd03.prod.outlook.com (2603:10b6:805:106:cafe::8f) by SN6PR2101CA0002.outlook.office365.com (2603:10b6:805:106::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.13 via Frontend Transport; Sun, 7 Jul 2024 09:49:04 +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 SN1PEPF0002BA52.mail.protection.outlook.com (10.167.242.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Sun, 7 Jul 2024 09:49:03 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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; Sun, 7 Jul 2024 02:48:47 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.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; Sun, 7 Jul 2024 02:48:43 -0700 From: Gregory Etelson To: CC: , , , Dariusz Sosnowski , Viacheslav Ovsiienko , Bing Zhao , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH] net/mlx5: fix indexed pool resize Date: Sun, 7 Jul 2024 12:48:28 +0300 Message-ID: <20240707094829.44604-1-getelson@nvidia.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002BA52:EE_|PH8PR12MB7028:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f34f587-b7e1-4815-196c-08dc9e6a094c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?XAQJTL2eHWtwPgGTISYkvgJrUF0GowJK/JUxYQlWoOMwCg0wL3EwGAPoPZSL?= =?us-ascii?Q?jnnNZSH3H+cTUK5S5ZbvnRy4kwt2CZdAYo0G7PX8z/NsP7KkDRZ8SwH8lyEU?= =?us-ascii?Q?qTk2FBg7BmU9j4BRGH/XZNo+EnajDIkIGOQ0VeK1M++Q+tDvVVQRQYNFbXpZ?= =?us-ascii?Q?jFcSj5hBiXsCekuNoqkM8h9GwEzqizAMtHPDLV4ECY0Q7k15oUCqVDHDNTvL?= =?us-ascii?Q?iOifKVrXS8dlohMqWg2b9iT5xEh7lEKuftp9jcCdf/MaCHIUq6A7J2ZyS7JC?= =?us-ascii?Q?wlyL7mixmsR069HNe7FIxIpVYTcZ4w60/GMC4vYxlbZi1Fa4MQ9JJY6KpiF1?= =?us-ascii?Q?xINVQluncisoyC3BshR/ph47WDiXcq2OfbJqwc29hv1iXnAGnX+2Sj1HCebA?= =?us-ascii?Q?FAd9Wqm3twwHMbL93G6pu+9NA2uBtcNLGhecM7zn1lTvpIUS8UKGlu1xfTyG?= =?us-ascii?Q?yZIkDP6lUjNEWaXqVTVDJx8iffgQKiLPD6QhZ2rUkosCVRAP/pYuD7GgwOqI?= =?us-ascii?Q?R8GrZaqkNuzqbXs4nXYt1ZJKCbygpDNxNjBmOyZfrTk/136eoN2283H/fkGB?= =?us-ascii?Q?v442ljA3fSx2sN1ipebA6T3cH06V+r/PjOH4WsjYVhO11MMiCOFglT0X2ZBb?= =?us-ascii?Q?J1tG51ahizZpuxN1fzABxmq3G2zA0fIdUPU4tpkGJv7aTHTKanqF09ZMJG1y?= =?us-ascii?Q?aok0FvB7BzrDRDGDrYtmU5WAc07JWV4ZfJX0odPsfaLr7Si4Y+3b05djXOON?= =?us-ascii?Q?+nqmA+IdnCphR1qCKJKsON8zxv96Sqge5UAsaaX9oKz2m1C+ijrJ6R6fLIW2?= =?us-ascii?Q?+0tgKtU47mAjOFulre5H1cwFokiiZR64wIu2ntGvrGZaBu/A6DZnbe4aedvp?= =?us-ascii?Q?oIttZak28kwXzhK5Zl+gIetb2t20gMnm2ywZPT5m6bqcrSJFejaUhZ7Xd975?= =?us-ascii?Q?5O4KT9Y1ah/Ya845PZrkAQfrzs8IRUQvfDcHt2TejVvdAgYAagu3hqxUcDjS?= =?us-ascii?Q?PVf8LlCx+bqDZCF99yx6V/o/AZzckNPRMhu1Kop0sVsWylkfdhgVw9aIzjyu?= =?us-ascii?Q?TetxUsbB03QlKNTBHVKwhIYW/XzfKwP+RUAG4vNg/2A3F2afozlEk/XyNbc5?= =?us-ascii?Q?JisTs+AeuFJBec+jktLBI62aK0AzB2VdMSlKAV8PuVgO+RtiXchRQEiJl3Fb?= =?us-ascii?Q?7wmYOkSSl8Jsf3GvzP4R3u9H5FGuLXruNTWdINqOY/lo30QExg3WoSDFhqx9?= =?us-ascii?Q?Nje5a68lqZqGDhhaFKEQK0B15Sf71y8Qp5fj6+g1o+gwJqpYva0Kw2CUHgLR?= =?us-ascii?Q?h3doR34TgmeFFCN/saESqDoFUteyCkeJCs0MLYuH+06kJFJbgX0msM687qUe?= =?us-ascii?Q?opSNTMGHuHE26pnb+f5+QMC3QdlYxPMakMVkpssdTpmUx1ammgVKZApvoxMu?= =?us-ascii?Q?DFhLnZ56bV793qcK7EHLK4362/YPhpn1?= 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:(13230040)(1800799024)(82310400026)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jul 2024 09:49:03.8065 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5f34f587-b7e1-4815-196c-08dc9e6a094c 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: SN1PEPF0002BA52.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7028 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 On success, indexed pool resize sets maximal pool entries number to the `num_entries` parameter value. The patch fixes maximal pool entries assignment. The patch also adds `error` parameter to log error types. Fixes: 89578504edd9 ("net/mlx5: add ipool resize function") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 6 ++--- drivers/net/mlx5/mlx5_utils.c | 39 ++++++++++++++------------------- drivers/net/mlx5/mlx5_utils.h | 3 ++- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index ad8d73a089..45dab32f80 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -14747,11 +14747,9 @@ flow_hw_table_resize(struct rte_eth_dev *dev, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, table, "shrinking table is not supported"); - ret = mlx5_ipool_resize(table->flow, nb_flows); + ret = mlx5_ipool_resize(table->flow, nb_flows, error); if (ret) - return rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, - table, "cannot resize flows pool"); + return ret; /* * A resizable matcher doesn't support rule update. In this case, the ipool * for the resource is not created and there is no need to resize it. diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c index d52119f0be..d882af6047 100644 --- a/drivers/net/mlx5/mlx5_utils.c +++ b/drivers/net/mlx5/mlx5_utils.c @@ -811,30 +811,25 @@ mlx5_ipool_get_next(struct mlx5_indexed_pool *pool, uint32_t *pos) } int -mlx5_ipool_resize(struct mlx5_indexed_pool *pool, uint32_t num_entries) +mlx5_ipool_resize(struct mlx5_indexed_pool *pool, uint32_t num_entries, + struct rte_flow_error *error) { - uint32_t cur_max_idx; - uint32_t max_index = mlx5_trunk_idx_offset_get(pool, TRUNK_MAX_IDX + 1); - - if (num_entries % pool->cfg.trunk_size) { - DRV_LOG(ERR, "num_entries param should be trunk_size(=%u) multiplication\n", - pool->cfg.trunk_size); - return -EINVAL; - } - + if (num_entries == pool->cfg.max_idx) + return 0; + else if (num_entries < pool->cfg.max_idx) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "cannot decrease pool size"); + if (num_entries % pool->cfg.trunk_size) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "number of entries in pool must be trunk size multiplication"); + if (num_entries >= mlx5_trunk_idx_offset_get(pool, TRUNK_MAX_IDX + 1)) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "requested number of entries exceeds pool limit"); mlx5_ipool_lock(pool); - cur_max_idx = pool->cfg.max_idx + num_entries; - /* If the ipool max idx is above maximum or uint overflow occurred. */ - if (cur_max_idx > max_index || cur_max_idx < num_entries) { - DRV_LOG(ERR, "Ipool resize failed\n"); - DRV_LOG(ERR, "Adding %u entries to existing %u entries, will cross max limit(=%u)\n", - num_entries, cur_max_idx, max_index); - mlx5_ipool_unlock(pool); - return -EINVAL; - } - - /* Update maximum entries number. */ - pool->cfg.max_idx = cur_max_idx; + pool->cfg.max_idx = num_entries; mlx5_ipool_unlock(pool); return 0; } diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h index c44a9d88be..f933daf03c 100644 --- a/drivers/net/mlx5/mlx5_utils.h +++ b/drivers/net/mlx5/mlx5_utils.h @@ -438,7 +438,8 @@ void *mlx5_ipool_get_next(struct mlx5_indexed_pool *pool, uint32_t *pos); * - 0 on success. * */ -int mlx5_ipool_resize(struct mlx5_indexed_pool *pool, uint32_t num_entries); +int mlx5_ipool_resize(struct mlx5_indexed_pool *pool, uint32_t num_entries, + struct rte_flow_error *error); /** * This function allocates new empty Three-level table. -- 2.43.0