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 7A37B45BF4; Sun, 27 Oct 2024 16:42:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7831F4026C; Sun, 27 Oct 2024 16:42:35 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2081.outbound.protection.outlook.com [40.107.220.81]) by mails.dpdk.org (Postfix) with ESMTP id 3BA6040151 for ; Sun, 27 Oct 2024 16:42:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=k1bE5AACUj1FB/fMDaL+chuBwqypsfkxGURTDEUbgKMGEud3Hn/hUeDP9JdbKYBWhdEAWvqdOyY34XMzeZZFVFnyJHqOO82wcBt8smZq2WPmS3LEyVzJnalulVetuNyEBU+ziejOq07+QTShLfFabWwbxUTNxfu+ojjfv00b9pcviwau8CJdlLCadjx5DW+TaFMNEFqXUa9HAoBU2HWhI2QFXBEYjI4oAMAEiM8afSAExFuZgZvhyo5tD8lGi8T2RrsBoneVk8PE/4PUYtTlZTTFle1WYgxfjV6wT9B2AeAyWdPtzvCcayhaGj4+BD6qVez32FsxNp+i3HCY/wChPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=44hX75/hGityB51H+FEJbc4W/7M++TC+X20vxQ7rQuM=; b=kDrEonUxiguNBnUTyMGnSmirwRe0g9EEvOUnyJbZcoRIdnm+0dkT71Kw/5cJfyMdVaq7SkDyoAPTHK8Va3/s7NNWPiO6fEZJL2mpYDhWx3X5wuLvaCO50xtFnBAIMMzp2RHqbkb0n8DKeVkSquVu91eQcHbyqUUKp19tIBLj+XIcXzSiZumlYag/g9Cs2so6YQbzHvq1VtNVBXvRTutQSnFtQ3ezQxddEn2h20cno8O/RnIEu5ml3R0H20tNssPm8rnyJZ1t5cLBUyM2vTB7hmiNOmmq/rpf5xHCsz7UbA2QKym/JzadOPHl8TulL3Lz/+vai3yYU19PYkdpD1f3yg== 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=44hX75/hGityB51H+FEJbc4W/7M++TC+X20vxQ7rQuM=; b=cOin1pHuX7RLT5TpH7tng6Q5b9OxUzeYWRh9Rt2FEAaFvfjFtQGHDt9xtZwvZFziViDktdXYy4+cGhzf31AG0qRbOrwx9mqaZX8UcP6G/rpHUG3lx5SquKiSUQpzoOt4YoVR9LeQ7iuVq0v5KJwqR78wWu3f/nG+i3PPcCR2hwGmh+Mbg1rb8iO+pVKyeqfR2mQwuXQXB4XTPFjbnzg+RwISPFjJEebfAAJi77HWdKfmRiSkl0SPbW5aj33u4LidnEpExdPzaFjbStI9jVd+GodmDeq1ETEio87AS7DqIrH3sldVJZi8zGYbDHasb0iaNykzpYwz0Z9sBg+V5xOhLQ== Received: from BYAPR05CA0034.namprd05.prod.outlook.com (2603:10b6:a03:c0::47) by LV3PR12MB9403.namprd12.prod.outlook.com (2603:10b6:408:217::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.20; Sun, 27 Oct 2024 15:42:29 +0000 Received: from SJ1PEPF00001CDE.namprd05.prod.outlook.com (2603:10b6:a03:c0:cafe::cc) by BYAPR05CA0034.outlook.office365.com (2603:10b6:a03:c0::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.11 via Frontend Transport; Sun, 27 Oct 2024 15:42:29 +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 SJ1PEPF00001CDE.mail.protection.outlook.com (10.167.242.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.14 via Frontend Transport; Sun, 27 Oct 2024 15:42:29 +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, 27 Oct 2024 08:42:24 -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, 27 Oct 2024 08:42:21 -0700 From: Gregory Etelson To: CC: , =?UTF-8?q?=C2=A0?= , , Dariusz Sosnowski , "Viacheslav Ovsiienko" , Bing Zhao , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH] net/mlx5: validate HWS context in meter operations Date: Sun, 27 Oct 2024 17:42:05 +0200 Message-ID: <20241027154205.198727-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CDE:EE_|LV3PR12MB9403:EE_ X-MS-Office365-Filtering-Correlation-Id: 30840496-95f8-4587-97bc-08dcf69df6d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?rDVG3qo4iLREzfMsiKmrVr9V4XfPlhEIciEYov0skLjUrkz8AajTIRQ4F8TW?= =?us-ascii?Q?bJMCX7nj7ujQ9jFysXSlGEPaP2cg7fvPF4rzvW6OOkrLOyYaelZ0f+ys+dqK?= =?us-ascii?Q?jDgw8of05WZVxG1b77mLHDwJtwvQn2al9Omva9ALzLyMgB4xii1LhnulXBcF?= =?us-ascii?Q?M/UFrrl8KEwnDPgeB4FzAzTQHC/7Nxr6ry23MxHfppRoFW6Ibnpx3H/KYARY?= =?us-ascii?Q?H8KaaK6uymyRtXui2k5EKR+SOk0Gsbo+j+XZco3WcNWytd7b9slBCyI8OwA4?= =?us-ascii?Q?frRNvzphSmL3Aj0Qp0v8ZNGs7w6otA5QE8ie/oD3rn50SnWfxKBkqJOUFKr7?= =?us-ascii?Q?R1dkmcjXvO/ZnZ4qPHu1zecOzINv8UsOmhEvnECMIeMKcTgSOUa1F7ItqaY8?= =?us-ascii?Q?YYFe4LJKawzfoyx0lS0efwGCo+Rc4kUMzFNYLwazg974LWXLn51e9W7DcB78?= =?us-ascii?Q?xo+7m8zZoDH6ZVZUQZlzj+svBfzEZ+2VyhZFdvvqB0aZe3JFFN85rXS4d4iA?= =?us-ascii?Q?w5CJVF5UMmamT8Ue4JK5+lGjIv0zYlCL2xmaxkr3nNZW+tJQB2WNtwiBC/jq?= =?us-ascii?Q?OZ/fpG67kaA/c8NT4vdNbbTDOM8RlUCIRm4UUodJhXIgeUjgIHTMyfyvdd3u?= =?us-ascii?Q?ARVxCo/P2tUO4i3qRmrU3P28MZT9H8Bak1MMTft6MoOpz5JlsR0yrqflYFto?= =?us-ascii?Q?W7TilIrvEu0oSA+JU1ZzDhVmQAMYcmfB2O81Ela7na9qW+I3e6ib4IY0EMO/?= =?us-ascii?Q?sCQJyZZQMdksGg/cwnCF0NgVfY0cfgNBvOQp0s0tA0Q96K9LzYojR06Sa/AE?= =?us-ascii?Q?EPBrn3gS8nxpT/rEPH5VLE3tPIqmV8GXu5DOT11t8leJgMltW10rTv8yNPPe?= =?us-ascii?Q?kUB4hGvfxvjISEe/Os0Dv5eyXwIgO1VOpo50YsPPSICcUN+0QL53T7ENKykp?= =?us-ascii?Q?oq9Ev0g7t98LC6WPsbEXG/hXjFXtdourx6LTwbysMoNhry8o5CSPXDrB6TxH?= =?us-ascii?Q?2kG7V2/QwZ0dFiUF21gleap0xX7GPEQpIQfnqempr7lzxmJTqM24vmVFU6w0?= =?us-ascii?Q?1ng1mNTSaJkl863CjfqdqcKA5L/pwfIJc1daQ19h1O68McdeougrW4+FTc3K?= =?us-ascii?Q?/15vb2f6dyteKXNS/cNgDcLtblbaSK3I32eKo3aMzuSHB3c5AKRSVjEtlynK?= =?us-ascii?Q?1MYr0sT95nsfDU7ZddtDCwxGXndyzdWNr3DiKuQXBZtWaTJXezk/JmzuvmDn?= =?us-ascii?Q?dJ9qHCnqVKLLG5O37NDuZJoYA2maEkw00smqiqHkx3aYtl0pg//J94vaPhbK?= =?us-ascii?Q?neuZ/YCtBF3TmUQLmDZgp6xXwx8P3auAo95cnpFYA+FJBieWF1mFajER2fKs?= =?us-ascii?Q?0ebWSwlGJNDBRyRIWbVkQ+X4dNP8dXbvX3uliblv2a7lAQvEYQ=3D=3D?= 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)(376014)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2024 15:42:29.0619 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 30840496-95f8-4587-97bc-08dcf69df6d0 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: SJ1PEPF00001CDE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9403 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 HWS context is created during port configuration. PMD allowed meter operations before port configuration. The patch rejects HWS meter operations before port configuration. Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5.h | 18 ++++++++++++++ drivers/net/mlx5/mlx5_flow_hw.c | 7 +++++- drivers/net/mlx5/mlx5_flow_meter.c | 40 ++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 0e026f7bbb..503366580b 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -2682,4 +2682,22 @@ int mlx5_quota_query(struct rte_eth_dev *dev, uint32_t queue, int mlx5_alloc_srh_flex_parser(struct rte_eth_dev *dev); void mlx5_free_srh_flex_parser(struct rte_eth_dev *dev); + +/* mlx5_flow_hw.c */ +struct rte_pmd_mlx5_host_action; + +struct mlx5dr_action * +mlx5_flow_hw_get_dr_action(struct rte_eth_dev *dev, + struct rte_pmd_mlx5_host_action *action, + void **release_data); + +void +mlx5_flow_hw_put_dr_action(struct rte_eth_dev *dev, + enum rte_flow_action_type type, + void *release_data); + +bool +mlx5_hw_ctx_validate(const struct rte_eth_dev *dev, + struct rte_flow_error *error); + #endif /* RTE_PMD_MLX5_H_ */ diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 5b34154bf1..9c33004c09 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -208,7 +208,12 @@ mlx5_destroy_multi_pattern_segment(struct mlx5_multi_pattern_segment *segment); static __rte_always_inline enum mlx5_indirect_list_type flow_hw_inlist_type_get(const struct rte_flow_action *actions); -static bool +static int +flow_hw_allocate_actions(struct rte_eth_dev *dev, + uint64_t action_flags, + struct rte_flow_error *error); + +bool mlx5_hw_ctx_validate(const struct rte_eth_dev *dev, struct rte_flow_error *error) { const struct mlx5_priv *priv = dev->data->dev_private; diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index 19d8607070..299265f8bc 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -745,6 +745,10 @@ mlx5_flow_mtr_cap_get(struct rte_eth_dev *dev, struct mlx5_priv *priv = dev->data->dev_private; struct mlx5_hca_qos_attr *qattr = &priv->sh->cdev->config.hca_attr.qos; + if (mlx5_hws_active(dev) && !mlx5_hw_ctx_validate(dev, NULL)) + return -rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, + "non-template flow engine was not configured"); if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, @@ -903,6 +907,12 @@ mlx5_flow_meter_profile_get(struct rte_eth_dev *dev, { struct mlx5_priv *priv = dev->data->dev_private; + if (mlx5_hws_active(dev) && !mlx5_hw_ctx_validate(dev, NULL)) { + rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, + "non-template flow engine was not configured"); + return NULL; + } if (!priv->mtr_en) { rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, @@ -939,6 +949,10 @@ mlx5_flow_meter_profile_hws_add(struct rte_eth_dev *dev, struct mlx5_flow_meter_profile *fmp; int ret; + if (mlx5_hws_active(dev) && !mlx5_hw_ctx_validate(dev, NULL)) + return -rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, + "non-template flow engine was not configured"); if (priv->shared_host) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, "Meter profiles cannot be created on guest port"); @@ -1167,6 +1181,10 @@ mlx5_flow_meter_policy_hws_validate(struct rte_eth_dev *dev, int ret; int i; + if (mlx5_hws_active(dev) && !mlx5_hw_ctx_validate(dev, NULL)) + return -rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, + "non-template flow engine was not configured"); if (!priv->mtr_en || !priv->sh->meter_aso_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_METER_POLICY, @@ -1496,6 +1514,12 @@ mlx5_flow_meter_policy_get(struct rte_eth_dev *dev, struct mlx5_priv *priv = dev->data->dev_private; uint32_t policy_idx; + if (mlx5_hws_active(dev) && !mlx5_hw_ctx_validate(dev, NULL)) { + rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, + "non-template flow engine was not configured"); + return NULL; + } if (!priv->mtr_en) { rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, @@ -1645,6 +1669,10 @@ mlx5_flow_meter_policy_hws_add(struct rte_eth_dev *dev, [1] = { .type = RTE_FLOW_ITEM_TYPE_END } }; + if (mlx5_hws_active(dev) && !mlx5_hw_ctx_validate(dev, NULL)) + return -rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, + "non-template flow engine was not configured"); if (!priv->mtr_policy_arr) return mlx5_flow_meter_policy_add(dev, policy_id, policy, error); mtr_policy = mlx5_flow_meter_policy_find(dev, policy_id, NULL); @@ -2230,6 +2258,10 @@ mlx5_flow_meter_hws_create(struct rte_eth_dev *dev, uint32_t meter_id, struct mlx5_hw_q_job *job; int ret; + if (mlx5_hws_active(dev) && !mlx5_hw_ctx_validate(dev, NULL)) + return -rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, + "non-template flow engine was not configured"); if (!priv->mtr_profile_arr || !priv->mtr_policy_arr || !priv->mtr_bulk.aso) @@ -2520,6 +2552,10 @@ mlx5_flow_meter_enable(struct rte_eth_dev *dev, struct mlx5_flow_meter_info *fm; int ret; + if (mlx5_hws_active(dev) && !mlx5_hw_ctx_validate(dev, NULL)) + return -rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, + "non-template flow engine was not configured"); if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, @@ -2609,6 +2645,10 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev, MLX5_FLOW_METER_OBJ_MODIFY_FIELD_CIR; int ret; + if (mlx5_hws_active(dev) && !mlx5_hw_ctx_validate(dev, NULL)) + return -rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, + "non-template flow engine was not configured"); if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, -- 2.43.0