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 AF3EB4383E for ; Fri, 5 Jan 2024 16:36:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F7B5402E0; Fri, 5 Jan 2024 16:36:50 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2079.outbound.protection.outlook.com [40.107.243.79]) by mails.dpdk.org (Postfix) with ESMTP id CBE37402CC for ; Fri, 5 Jan 2024 16:36:48 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V81AewSmLiRrtej9PQ2AIpsqcIqE+bJV9AunmMTfTFgq+sYvkgxFzamU8Ftc0OJqBkJKvtyjb02391M/OH+uvmmFE84BPhcCWejXG/UHwSgwU8BH3VO0O0E4ua3r0Ukd+AqI+VpaLy7zgb82Dl2vusY4on/tYDwdS2Lu8UCHkilFP+lxptl9AS+qMzSisd5kZxFvtN4Bekr8Ty6ynXf9FoI+hucosFMD7bO4x9wvki9D9iZW4cja6iyn+/XwMtNfHdNhb1hzB1xRftMYXmb69r5njhAaJEwO+bXwp5anmncPOrCl2DLtSVhbTKap52/vv4oa61JQTAFmgGnNbE6gxQ== 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=YsOR101hmO+Up333gphZ/6Z3GsKCV53i8zxfYY4WMvQ=; b=YBTFBkRzqAwunvd3dhA/IJbTlWqmaW+FLIexaQ4hg9/Edo39NE4np80COpri57DkdBAIWGBle2FdKPETajKoDjXdrXzFvOQuRz93NtbxwbwAKLWsRhHukjIoEJJly7A2JHD/OFZlhirVVpEL/qvbP+CIvFOZXFfX6XhUMkGqJvsTzXJsi+tboQSkvNlbLosLKJBFL5jjSXFC1z6p4NY2hwYKR5jFbqudPUSnAQ5tnLm/08mwLGVLOQXTY+iRmZLP3ie/nlvUxKdAGX0kGdBmi6t+s3hcsCA35k0pw0MMexhLU5cg9NvuPzLPsETAvyU1Lg7uSQUn1wHXn484HS0j4w== 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=YsOR101hmO+Up333gphZ/6Z3GsKCV53i8zxfYY4WMvQ=; b=Db2mQrylLMTbRApRXuwAbHt19yzrYBGoDupxnYY7ZgruZP7QM7zdvxa3Q6vYZZaxdnZ+yoeHlXPbkO3CKdUkDVjtZI23oRmKD3OMpL0JMpVtyQW4bzJoRaSFkEh3Y7z7ZpIo+cnZenMECOUeAIrvkLhl/XIRXTUu8awoJUvnmQKEGm7StO6iyGThJZ3bEvFicK3ebvJF45Gzh1vafQaanwSFjpEiBpIqZt/YZllisdGgynGKfg1BtflfCbCZQoHLksTsyGmmYfXPbEP+w5tZA1RUGE0TyqBxEOhcV14SQykWzPuklZZVOIaog3Nh1rQA6Dhs1WSvBwvbmfiqK+heFg== Received: from DM6PR07CA0079.namprd07.prod.outlook.com (2603:10b6:5:337::12) by SN7PR12MB7022.namprd12.prod.outlook.com (2603:10b6:806:261::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.13; Fri, 5 Jan 2024 15:36:45 +0000 Received: from CY4PEPF0000FCBF.namprd03.prod.outlook.com (2603:10b6:5:337:cafe::8) by DM6PR07CA0079.outlook.office365.com (2603:10b6:5:337::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.17 via Frontend Transport; Fri, 5 Jan 2024 15:36:45 +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 CY4PEPF0000FCBF.mail.protection.outlook.com (10.167.242.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.9 via Frontend Transport; Fri, 5 Jan 2024 15:36:44 +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.986.41; Fri, 5 Jan 2024 07:36:29 -0800 Received: from nvidia.com (10.126.230.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.986.41; Fri, 5 Jan 2024 07:36:28 -0800 From: Bing Zhao To: CC: , Alexander Kozyrev Subject: [PATCH] net/mlx5: relax hws meter validation Date: Fri, 5 Jan 2024 17:36:15 +0200 Message-ID: <20240105153615.117381-1-bingz@nvidia.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000FCBF:EE_|SN7PR12MB7022:EE_ X-MS-Office365-Filtering-Correlation-Id: ae238792-ebc5-4a7c-2d4e-08dc0e041f71 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D+FJ0tT9cR/G07yt3OWIKthCpbW168QDfbYQVdIaqgs/h+uEFX7ZjrU6MmwcG2MpmN/R6ahbdcmLfEHRozWrARqL27mFgD23fR7BrUQjjMfEOOQ2ITFzV8H+nJne6tZajIhbYSQ7wTXo4kNX7IbJCCfREoxKxou0+KroICQy7cfcqDPHgbKs7G1H4G/0Cn62IcpOOkNrVZ+CmI0RCGWgJm4UGIyqMQ44Wd8NnZR0Ma4fNNYUcFcXSjh7VnCCZnPxbZC+EC6gybT39kXUYxHJvR7Mun6GtEcM31Vdfpjd27tW8TGi+9fatWYSVbchxu4hOrrqKogHNbAIZfyjhVQ96DN8sxIrZJu34wNKsk1D6GsKnsWP9U54jQ7gLcrCOiJPqivSnD2THAMCYSNOTTeieWvfLPmGdxm/j4Sj7Yck6N/r866pCcwrKxqCv/wpIn0OeF9B+Iq4MJA29W/gcvgK9Q5nJHtwO1Pqtx0HnVWCb1+1/i6enEaj5yO9XKoRWVk9zP0c66zPTBMGB5u12LIEFTnEJosncW0UdeOXXugl+oSE70G8eCRZdfkOC620uokKsh0E24yJctjKP4XyUVVahrijGyzhhnNlKl9j7Yf5XFGWNbQlbh1JJiMgMW2md6luzs9Ljj4NBWN8LJFv+FXAok9pq6hWlTqJGSgeGhuRsQuAJKz1dFSDgu12Yade8IpW5JAbgxRTHWtEDBn7gIgiuE7zpy6W2YXmdK72jtHinA/FqKx2zGGhvXgYbUECqtlW 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)(4636009)(376002)(136003)(396003)(346002)(39860400002)(230922051799003)(186009)(64100799003)(451199024)(82310400011)(1800799012)(46966006)(36840700001)(40470700004)(40480700001)(40460700003)(55016003)(6666004)(107886003)(36860700001)(7696005)(426003)(26005)(336012)(6286002)(16526019)(2616005)(1076003)(82740400003)(7636003)(356005)(86362001)(36756003)(6862004)(83380400001)(8936002)(2906002)(5660300002)(47076005)(8676002)(70206006)(70586007)(54906003)(6636002)(37006003)(478600001)(316002)(4326008)(41300700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2024 15:36:44.8530 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae238792-ebc5-4a7c-2d4e-08dc0e041f71 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: CY4PEPF0000FCBF.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7022 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org From: Alexander Kozyrev [ upstream commit 077eb39f0d975995d38e8d472bfb306110d3939b ] The policies array is not required for the new METER_MARK action. It is only required for the old METER action implementation. Furthermore, the profiles array is optional for the METER_MARK action since a profile can be found using the rte_mtr_meter_profile_get(). Do not enforce the preallocation of meter profiles and policies. Fixes: 24865366e495 ("net/mlx5: support flow meter action for HWS") Signed-off-by: Alexander Kozyrev --- drivers/net/mlx5/mlx5_flow_hw.c | 60 ++++++++++++++++-------------- drivers/net/mlx5/mlx5_flow_meter.c | 32 ++-------------- 2 files changed, 36 insertions(+), 56 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 6b889e9f81..ea4acfbac7 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -7194,7 +7194,7 @@ flow_hw_configure(struct rte_eth_dev *dev, } /* Initialize meter library*/ if (port_attr->nb_meters) - if (mlx5_flow_meter_init(dev, port_attr->nb_meters, 1, 1, nb_q_updated)) + if (mlx5_flow_meter_init(dev, port_attr->nb_meters, 0, 0, nb_q_updated)) goto err; /* Add global actions. */ for (i = 0; i < MLX5_HW_ACTION_FLAG_MAX; i++) { @@ -9730,7 +9730,7 @@ mlx5_flow_meter_init(struct rte_eth_dev *dev, .type = "mlx5_hw_mtr_mark_action", }; - if (!nb_meters || !nb_meter_profiles || !nb_meter_policies) { + if (!nb_meters) { ret = ENOTSUP; rte_flow_error_set(&error, ENOMEM, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, @@ -9831,33 +9831,37 @@ mlx5_flow_meter_init(struct rte_eth_dev *dev, cfg.per_core_cache = MLX5_HW_IPOOL_CACHE_MIN; } priv->hws_mpool->idx_pool = mlx5_ipool_create(&cfg); - priv->mtr_config.nb_meter_profiles = nb_meter_profiles; - priv->mtr_profile_arr = - mlx5_malloc(MLX5_MEM_ZERO, - sizeof(struct mlx5_flow_meter_profile) * - nb_meter_profiles, - RTE_CACHE_LINE_SIZE, - SOCKET_ID_ANY); - if (!priv->mtr_profile_arr) { - ret = ENOMEM; - rte_flow_error_set(&error, ENOMEM, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, - NULL, "Meter profile allocation failed."); - goto err; + if (nb_meter_profiles) { + priv->mtr_config.nb_meter_profiles = nb_meter_profiles; + priv->mtr_profile_arr = + mlx5_malloc(MLX5_MEM_ZERO, + sizeof(struct mlx5_flow_meter_profile) * + nb_meter_profiles, + RTE_CACHE_LINE_SIZE, + SOCKET_ID_ANY); + if (!priv->mtr_profile_arr) { + ret = ENOMEM; + rte_flow_error_set(&error, ENOMEM, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "Meter profile allocation failed."); + goto err; + } } - priv->mtr_config.nb_meter_policies = nb_meter_policies; - priv->mtr_policy_arr = - mlx5_malloc(MLX5_MEM_ZERO, - sizeof(struct mlx5_flow_meter_policy) * - nb_meter_policies, - RTE_CACHE_LINE_SIZE, - SOCKET_ID_ANY); - if (!priv->mtr_policy_arr) { - ret = ENOMEM; - rte_flow_error_set(&error, ENOMEM, - RTE_FLOW_ERROR_TYPE_UNSPECIFIED, - NULL, "Meter policy allocation failed."); - goto err; + if (nb_meter_policies) { + priv->mtr_config.nb_meter_policies = nb_meter_policies; + priv->mtr_policy_arr = + mlx5_malloc(MLX5_MEM_ZERO, + sizeof(struct mlx5_flow_meter_policy) * + nb_meter_policies, + RTE_CACHE_LINE_SIZE, + SOCKET_ID_ANY); + if (!priv->mtr_policy_arr) { + ret = ENOMEM; + rte_flow_error_set(&error, ENOMEM, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "Meter policy allocation failed."); + goto err; + } } return 0; err: diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index 08f8aad70a..735669e572 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -644,9 +644,7 @@ mlx5_flow_meter_profile_hws_add(struct rte_eth_dev *dev, int ret; if (!priv->mtr_profile_arr) - return -rte_mtr_error_set(error, ENOTSUP, - RTE_MTR_ERROR_TYPE_UNSPECIFIED, - NULL, "Meter profile array is not allocated"); + return mlx5_flow_meter_profile_add(dev, meter_profile_id, profile, error); /* Check input params. */ ret = mlx5_flow_meter_profile_validate(dev, meter_profile_id, profile, error); @@ -683,15 +681,7 @@ mlx5_flow_meter_profile_hws_delete(struct rte_eth_dev *dev, struct mlx5_flow_meter_profile *fmp; if (!priv->mtr_profile_arr) - return -rte_mtr_error_set(error, ENOTSUP, - RTE_MTR_ERROR_TYPE_UNSPECIFIED, - NULL, "Meter profile array is not allocated"); - /* Meter id must be valid. */ - if (meter_profile_id >= priv->mtr_config.nb_meter_profiles) - return -rte_mtr_error_set(error, EINVAL, - RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, - &meter_profile_id, - "Meter profile id not valid."); + return mlx5_flow_meter_profile_delete(dev, meter_profile_id, error); /* Meter profile must exist. */ fmp = mlx5_flow_meter_profile_find(priv, meter_profile_id); if (!fmp->initialized) @@ -1238,15 +1228,7 @@ mlx5_flow_meter_policy_hws_delete(struct rte_eth_dev *dev, struct rte_flow_op_result result[RTE_COLORS * MLX5_MTR_DOMAIN_MAX]; if (!priv->mtr_policy_arr) - return -rte_mtr_error_set(error, ENOTSUP, - RTE_MTR_ERROR_TYPE_UNSPECIFIED, - NULL, "Meter policy array is not allocated"); - /* Meter id must be valid. */ - if (policy_id >= priv->mtr_config.nb_meter_policies) - return -rte_mtr_error_set(error, EINVAL, - RTE_MTR_ERROR_TYPE_METER_POLICY_ID, - &policy_id, - "Meter policy id not valid."); + return mlx5_flow_meter_policy_delete(dev, policy_id, error); /* Meter policy must exist. */ mtr_policy = mlx5_flow_meter_policy_find(dev, policy_id, NULL); if (!mtr_policy->initialized) @@ -1358,13 +1340,7 @@ mlx5_flow_meter_policy_hws_add(struct rte_eth_dev *dev, }; if (!priv->mtr_policy_arr) - return -rte_mtr_error_set(error, ENOTSUP, - RTE_MTR_ERROR_TYPE_METER_POLICY, - NULL, "Meter policy array is not allocated."); - if (policy_id >= priv->mtr_config.nb_meter_policies) - return -rte_mtr_error_set(error, ENOTSUP, - RTE_MTR_ERROR_TYPE_METER_POLICY_ID, - NULL, "Meter policy id not valid."); + return mlx5_flow_meter_policy_add(dev, policy_id, policy, error); mtr_policy = mlx5_flow_meter_policy_find(dev, policy_id, NULL); if (mtr_policy->initialized) return -rte_mtr_error_set(error, EEXIST, -- 2.25.1