From patchwork Mon Mar 13 18:15:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kozyrev X-Patchwork-Id: 125078 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B555441E86; Mon, 13 Mar 2023 19:16:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 53FE140E03; Mon, 13 Mar 2023 19:16:08 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2058.outbound.protection.outlook.com [40.107.92.58]) by mails.dpdk.org (Postfix) with ESMTP id 107C9406BC for ; Mon, 13 Mar 2023 19:16:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HQHcow+dhbH0qAjrGF6+ahERT1ErVF4xpGw1b6wr3MJKZ1vvMzScMxB/SEqklQtp4bpDUeE+M2/M1wV3dB+ppWvjOX2RvzkUBuiHLA/b1cnSQ2KAKuKNqJ2QbPP/NIGH+ZOqzHjtsnlFnGDlJGGYb+TFDk9lDhbagVa7esaAObksgVt57znMXLXf4Ea60LHk0honfAaIkWhnhxh0WsbL+t3415l2Du3HKzhmX9t74/zj4M9+xPqOUNLO6snGsy+gyIVW5hCfoRm+YMMd5PmkfTHcN1SivcSu8mtXHBcSo3G9H82+0iRxz0PGXqLgRlTuApipyVPjpEUAvxwdsBZyZQ== 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=WnOj1B3dxfVkpvs5ugHatT+owA8vfpH5BZhQRHr8FAU=; b=oWC7qmIEUrmaMnrC3HccbrkbzbhLdAO/FX4/+lYMhaQJD3Y41+yAeTMOYwQ5iRLfyKlEsYaGIdUG5rQBr150BfsJwzTSNyRBiGter5ilOhdBnQTBLFxU7nAYpkrYvb+JZ61+3yCGbnMVOFaNnWS7qXSGXGtofL0dAN2tJzNSJsu+0yNvshbqeGvaWgHYYZYb2MNhk9jcrUapFRVJ+pD0bLsZBGl6GAMeG8o/6btAhK3khyBrsZUbCaTrhN2QetH6CzBWvaJL8s0dILeuBl28jmX4hphaVxyULg716WgmkibtsnbPME0J2cSWjW8YDx34hRKiE+Dw1gsj31ryHjOK1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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 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=WnOj1B3dxfVkpvs5ugHatT+owA8vfpH5BZhQRHr8FAU=; b=lqdfMci8ShBXFNPyaE+nSuPTjMymBJmd032SNor1cGfTltUHrRDvRoDEcIFcrIQr+puebkrSnYtwFzSN9SPXFUeZbNpDYYngkdiHMbqMwhh1YZi1/IDbV7nLA7Pw9jMJGRaTwjBi5uiyLEaIu59/O9IOxkXT+ANUv4J9pCuBDXsXK24i67HkFodOK/l1qPupHZRcyslzYyP0XasmXofseI2D++Bao7OPI/h6UAzA68EseS3noud6dv3dEbismv/OzkAF9OoQanYxZfWi7Z7FkCHU0zyufNKwuMA7gv7Byvnj1mMf/IeF8XsWUxbRWebQy3p+zc5pYZmEzNFSJeF9oA== Received: from MW4PR04CA0182.namprd04.prod.outlook.com (2603:10b6:303:86::7) by IA1PR12MB6385.namprd12.prod.outlook.com (2603:10b6:208:38b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Mon, 13 Mar 2023 18:16:01 +0000 Received: from CO1NAM11FT027.eop-nam11.prod.protection.outlook.com (2603:10b6:303:86:cafe::9) by MW4PR04CA0182.outlook.office365.com (2603:10b6:303:86::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.25 via Frontend Transport; Mon, 13 Mar 2023 18:16:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1NAM11FT027.mail.protection.outlook.com (10.13.174.224) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24 via Frontend Transport; Mon, 13 Mar 2023 18:16:01 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Mon, 13 Mar 2023 11:15:43 -0700 Received: from pegasus01.mtr.labs.mlnx (10.126.231.37) 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.37; Mon, 13 Mar 2023 11:15:41 -0700 From: Alexander Kozyrev To: CC: , , , Subject: [PATCH] net/mlx5: relax hws meter validation Date: Mon, 13 Mar 2023 20:15:27 +0200 Message-ID: <20230313181527.1211433-1-akozyrev@nvidia.com> X-Mailer: git-send-email 2.18.2 MIME-Version: 1.0 X-Originating-IP: [10.126.231.37] 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: CO1NAM11FT027:EE_|IA1PR12MB6385:EE_ X-MS-Office365-Filtering-Correlation-Id: cc114113-2164-485f-cf71-08db23ef0097 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kqOcSKlqor1nz69xT4q90nI/fwZDZwMurs4seHs0w+uKRP+j2wtMEGEIsFA4x5xfdLv/dJYVJy/u+ZdqQzpxhaDm9vt0ufBjBm/K868O7cPv1PbLeVXAEesuL8p/FYRu+bnS/z0znhBLbTwtq818VhpG9mSraBwu381ZOyD1HnVoeAFztT9JJv1gahPnJdkptYZdaPnVaxzZn4wgvzRDTrmPmQnI556wrtHAwLFIQgbOUz2yVvkpznytJfm5jrdc0BEbCiAR1o4r8Ms4lxeD0tINw7iXZl2XlZo020pYOnhZ7fcUleN6JjPeSfqovYnDufIdNtFDbbJLG2uoQfzRyBGm8ATRLqRUNemHg9tkLmt2wwid84J9xvWhDJ/JIZflhkL9h3Mfkaei3G3RIPxqF0wfjMtjFq7eavkwveXeU7izthJ0eNfdU9bU8cdxpXSQ6ORRJJ28EdVbgRmIk5KEMQQ3R1Z7qKNyHHT2WXOX0enO0L5LRb0wkDjpQHwuOtD/oO5+fl+pPpdfg+8W9EUgyMCJgwcsuhedHFacv393/ZQ+3WbmpOSlDT0WzDKcTro+2rKGZdkAMr9R8TgItk8ZJ/nTWnW0+TWgfdXX2QyYRntxolBPCRtfClOx2bpOeeyuklQrYKzyrMizA53QiR6UopWq3xhNQOistOc2+RNHsRjrWLYcJeG1ME/NVmLt7MMB+A+vSl9KQyqImbxGs4vU3dAhyw4ZHY2fquwoUafGMv8iQ3KYDt9DExhqqo4i+WE1 X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(396003)(346002)(136003)(39860400002)(376002)(451199018)(46966006)(36840700001)(40470700004)(40460700003)(5660300002)(36756003)(83380400001)(47076005)(186003)(478600001)(82310400005)(16526019)(426003)(1076003)(107886003)(26005)(6666004)(2616005)(336012)(40480700001)(356005)(8676002)(70586007)(70206006)(41300700001)(6916009)(4326008)(8936002)(54906003)(316002)(86362001)(82740400003)(36860700001)(7636003)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 18:16:01.5599 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cc114113-2164-485f-cf71-08db23ef0097 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT027.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6385 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 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. Signed-off-by: Alexander Kozyrev Acked-by: Matan Azrad --- 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 9392727aa0..fba76311fd 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -7261,7 +7261,7 @@ flow_hw_configure(struct rte_eth_dev *dev, } /* Initialize meter library*/ if (port_attr->nb_meters || (host_priv && host_priv->hws_mpool)) - 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++) { @@ -9650,7 +9650,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, @@ -9751,33 +9751,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,