From patchwork Thu Mar 7 10:12:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 138091 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 2EE1943BA7; Thu, 7 Mar 2024 11:12:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0EB3642E9D; Thu, 7 Mar 2024 11:12:52 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2064.outbound.protection.outlook.com [40.107.244.64]) by mails.dpdk.org (Postfix) with ESMTP id 31D7042E74; Thu, 7 Mar 2024 11:12:50 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oUPqbJGZefSzLS8uZBXwX8pCPPoORaMCJRd1hawFVkKXHQtzHtizghOLD8Aivv92GITPfLbII3MoiD/Zspf/uxozNlPmLLeBMgXqLKT1/bD1itfKGK/o4WaDjWkz9nC/t6kdOZdQWz9itr+Vf6e9EvGHn0U0hgxQRVGGxX5EA9JuoyOdB6tTk7BS/bIfYbvbTptu495kKS+XRjallMU1jmsNr+rCmYadOH7tJgYbJzEjYzKbHj8LGEuOGKNdGx+TsWcIe/YJuCGWqUizMXRIl5s/KhUAaEpxn0TxcdG2ObTRwonPArBTFrSjMhTAMkWWli6BnLccwdeEA50GTyjK7g== 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=FQ6COwgA7EDugiDitjOB2+j6se8K2sbrNMBNWEv1Kd0=; b=BZaMWI7IO7o+X73MpRLdGQAO8FTOHbzjGNcz5fu1X7F/kxB3v+dWmGjlkOPHs1n0+GLHWcDTWN9FdkgUhXL5D27/6OGISuBKZyovPTIQbDjf9ykn8TqY//OAkDgKZaHLbJVlud5m3AonwKJOX6q9FuMzJahhdGLlHsa9ZCVMsm4tepM1PIL6Lowzt4kTtsAA5/EunMn9FfM7/3E3YsyovnBgwWU5CuRKbv9b5+t2xavskArm8CjniH5E9uLGLKkv1HzTekZTW6sPSSXeYgO/4Vbq2BghWpeH7U7uAJQxIFh6I1ViYuvg8Rdzxif6+cKi8v9Vm5XnMs2O6QZkLzH2cA== 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=FQ6COwgA7EDugiDitjOB2+j6se8K2sbrNMBNWEv1Kd0=; b=kR/nGiWnOwBBH7b0SevY05yICDUyyqJ9jpId+l826CH+AFAWna3LuNJNRLV2lCaVi0L0YD1lj9ww8Y+L9QxS64W/nBwhJHxrLI8Y4ml3TTpjOlNyCIlDZoOMlU3wCpbQQw/q/UeIZ+mo6F5pSWbbkVtwj2dhR0gSGRVyMJoiKpCVQ+7rr+Du8g5EQfHm3Ne5FrDy2uvVGqW8JmYviFINQT6X2bWFyc28JbBxk7nrzS4+YuldZ7qSU+zSQdL4P8/MIBEbC/GG5hY1ZJt8PQyDzCbgF1OJbpfAE5mVTzXLG6GrxcIxp9EusfuhbomWz6h2jGgNK6UAdR76h58Hf8bMFg== Received: from SN6PR01CA0020.prod.exchangelabs.com (2603:10b6:805:b6::33) by MW6PR12MB8898.namprd12.prod.outlook.com (2603:10b6:303:246::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Thu, 7 Mar 2024 10:12:46 +0000 Received: from SA2PEPF00001509.namprd04.prod.outlook.com (2603:10b6:805:b6:cafe::4) by SN6PR01CA0020.outlook.office365.com (2603:10b6:805:b6::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.26 via Frontend Transport; Thu, 7 Mar 2024 10:12:46 +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 SA2PEPF00001509.mail.protection.outlook.com (10.167.242.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Thu, 7 Mar 2024 10:12:45 +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; Thu, 7 Mar 2024 02:12:34 -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.1258.12; Thu, 7 Mar 2024 02:12:31 -0800 From: Gregory Etelson To: CC: , , , , Dariusz Sosnowski , "Viacheslav Ovsiienko" , Ori Kam , Suanming Mou , Matan Azrad , Alexander Kozyrev Subject: [PATCH 1/3] net/mlx5: fix HWS meter actions availability Date: Thu, 7 Mar 2024 12:12:09 +0200 Message-ID: <20240307101211.1134473-2-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307101211.1134473-1-getelson@nvidia.com> References: <20240307101211.1134473-1-getelson@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.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: SA2PEPF00001509:EE_|MW6PR12MB8898:EE_ X-MS-Office365-Filtering-Correlation-Id: e150df56-a143-4a26-4f2b-08dc3e8f2295 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nDNyd/JbyPFEZh21dnyuRj/nIgFVY/3q95dZDytmO/WuRZhVKcpD9o17U6N9saAe2JBEd66upXBvzA7xV6OP7QLaIkrW1lZNdp0cGMHZLkPhAuxN+vSoyEFHDswmk9iXL8Z07AxRFEqiOiKj6tW0I6Dpe/KxOqj3SLOQRuA0H4fShU1RuvOMx1+U3H91gJrma9nbC44rNfeeDlL9O3gV3uwT38P3Nkp/IXc5xhHyNa57qicYghDVr1GNDvJ/wvTW1SFkHMYHBkB9ujEYSifT9ZdpVIdeZ/p8q+4DMHm9AWV6E//hCPHv989QjOwxPy+BYR5n1JGpGLJ6rQW+QFmwxa/qPLzqutw8r21fK0PXevH+aY7okKIf7mQXhvfAqREym3OyHCusBzIz8M/U8e1qdVN4537U7yc+rxPtDrxhfw2ZjTQQACBIpJhok7uoQKplIg1G2jbQZrfwLJX462JiqvBOeZKD6MW4C689zuh4Iq1P/m+tjFtlu623LJSbVp9qtUzxkE2KRGygZJ/lk70EFfu4jPJXvgxF3iOcDnAG/Q23c7E07KFcsph0baVZ/ArjNDw92Fl8rCNZBOOVzmfEEuHM9uL5LUTbsYyL7R2dGia8DYwDsc8FbHmO0WDfnFRbEa2LhYwb56IFI36hdoQPVhRmitGFShyO+wGZmVMV2HENP4Qtdgr4TM+8oIqPoY+mKGlKooclY7WZ0seXhPpUD+BKiHzZFImwNUq0bk2s2Qa6mHq+4DdTc1cOaFJV322G 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)(376005)(36860700004)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2024 10:12:45.9973 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e150df56-a143-4a26-4f2b-08dc3e8f2295 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: SA2PEPF00001509.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8898 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 Allow compilation of HWS meter code only on platforms that support HWS. Fixes: 24865366e495 ("net/mlx5: support flow meter action for HWS") Cc: stable@dpdk.org Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_meter.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index c0578ce6e9..57de95b4b9 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -896,6 +896,7 @@ mlx5_flow_meter_profile_get(struct rte_eth_dev *dev, meter_profile_id); } +#if defined(HAVE_MLX5_HWS_SUPPORT) /** * Callback to add MTR profile with HWS. * @@ -981,6 +982,7 @@ mlx5_flow_meter_profile_hws_delete(struct rte_eth_dev *dev, memset(fmp, 0, sizeof(struct mlx5_flow_meter_profile)); return 0; } +#endif /** * Find policy by id. @@ -1123,6 +1125,7 @@ mlx5_flow_meter_policy_validate(struct rte_eth_dev *dev, return 0; } +#if defined(HAVE_MLX5_HWS_SUPPORT) /** * Callback to check MTR policy action validate for HWS * @@ -1159,6 +1162,7 @@ mlx5_flow_meter_policy_hws_validate(struct rte_eth_dev *dev, } return 0; } +#endif static int __mlx5_flow_meter_policy_delete(struct rte_eth_dev *dev, @@ -1485,6 +1489,7 @@ mlx5_flow_meter_policy_get(struct rte_eth_dev *dev, &policy_idx); } +#if defined(HAVE_MLX5_HWS_SUPPORT) /** * Callback to delete MTR policy for HWS. * @@ -1807,7 +1812,7 @@ mlx5_flow_meter_policy_hws_add(struct rte_eth_dev *dev, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, "Failed to create meter policy."); } - +#endif /** * Check meter validation. * @@ -2177,6 +2182,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, NULL, "Failed to create devx meter."); } +#if defined(HAVE_MLX5_HWS_SUPPORT) /** * Create meter rules. * @@ -2260,6 +2266,7 @@ mlx5_flow_meter_hws_create(struct rte_eth_dev *dev, uint32_t meter_id, __atomic_fetch_add(&policy->ref_cnt, 1, __ATOMIC_RELAXED); return 0; } +#endif static int mlx5_flow_meter_params_flush(struct rte_eth_dev *dev, @@ -2744,6 +2751,7 @@ static const struct rte_mtr_ops mlx5_flow_mtr_ops = { .stats_read = mlx5_flow_meter_stats_read, }; +#if defined(HAVE_MLX5_HWS_SUPPORT) static const struct rte_mtr_ops mlx5_flow_mtr_hws_ops = { .capabilities_get = mlx5_flow_mtr_cap_get, .meter_profile_add = mlx5_flow_meter_profile_hws_add, @@ -2762,6 +2770,7 @@ static const struct rte_mtr_ops mlx5_flow_mtr_hws_ops = { .stats_update = NULL, .stats_read = NULL, }; +#endif /** * Get meter operations. @@ -2777,12 +2786,16 @@ static const struct rte_mtr_ops mlx5_flow_mtr_hws_ops = { int mlx5_flow_meter_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg) { +#if defined(HAVE_MLX5_HWS_SUPPORT) struct mlx5_priv *priv = dev->data->dev_private; if (priv->sh->config.dv_flow_en == 2) *(const struct rte_mtr_ops **)arg = &mlx5_flow_mtr_hws_ops; else *(const struct rte_mtr_ops **)arg = &mlx5_flow_mtr_ops; +#else + *(const struct rte_mtr_ops **)arg = &mlx5_flow_mtr_ops; +#endif return 0; } @@ -3161,7 +3174,6 @@ mlx5_flow_meter_flush(struct rte_eth_dev *dev, struct rte_mtr_error *error) struct mlx5_flow_meter_profile *fmp; struct mlx5_legacy_flow_meter *legacy_fm; struct mlx5_flow_meter_info *fm; - struct mlx5_flow_meter_policy *policy; struct mlx5_flow_meter_sub_policy *sub_policy; void *tmp; uint32_t i, mtr_idx, policy_idx; @@ -3229,15 +3241,20 @@ mlx5_flow_meter_flush(struct rte_eth_dev *dev, struct rte_mtr_error *error) mlx5_l3t_destroy(priv->policy_idx_tbl); priv->policy_idx_tbl = NULL; } +#if defined(HAVE_MLX5_HWS_SUPPORT) if (priv->mtr_policy_arr) { + struct mlx5_flow_meter_policy *policy; + for (i = 0; i < priv->mtr_config.nb_meter_policies; i++) { policy = mlx5_flow_meter_policy_find(dev, i, &policy_idx); - if (policy->initialized) + if (policy->initialized) { mlx5_flow_meter_policy_hws_delete(dev, i, error); + } } } +#endif if (priv->mtr_profile_tbl) { MLX5_L3T_FOREACH(priv->mtr_profile_tbl, i, entry) { fmp = entry; @@ -3251,14 +3268,17 @@ mlx5_flow_meter_flush(struct rte_eth_dev *dev, struct rte_mtr_error *error) mlx5_l3t_destroy(priv->mtr_profile_tbl); priv->mtr_profile_tbl = NULL; } +#if defined(HAVE_MLX5_HWS_SUPPORT) if (priv->mtr_profile_arr) { for (i = 0; i < priv->mtr_config.nb_meter_profiles; i++) { fmp = mlx5_flow_meter_profile_find(priv, i); - if (fmp->initialized) + if (fmp->initialized) { mlx5_flow_meter_profile_hws_delete(dev, i, error); + } } } +#endif /* Delete default policy table. */ mlx5_flow_destroy_def_policy(dev); if (priv->sh->refcnt == 1)