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 1DE9D44144; Mon, 3 Jun 2024 10:06:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 854C742E23; Mon, 3 Jun 2024 10:06:03 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2052.outbound.protection.outlook.com [40.107.244.52]) by mails.dpdk.org (Postfix) with ESMTP id 0657B42E0D for ; Mon, 3 Jun 2024 10:05:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cWH0HQd7berNIswGHtLz2kQmncFzU4spdd4fii9IsjmjUEHuQXA/6kr5yrLEY3iIInrnq/LLFRRWFPOOtlsPUzqzuBjqB1u4UjxA8aSr9eJEAQMMiA8i49dFGVzqGvDrmtPT0po7DxITwFK7AWMWIochKOQM1JDuRqnQyhK/r90/JGOkVMhZmgkUzTpt8KiJGhm3qnhW+I/s5Ev3nUL2IwgxlPpgKodzdbb9rSDpxSgV/upBPMdaMZfOUUv6UpW09wBVpz/MNEo2LBG/1toFOpZtKm2zGZ9zCpj3i2T5m2UofPhd/thF1ogMbevLjpGf9DJzaILkxcq/JCoy0erIBQ== 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=D7uc6GGFLKx/zTtQRS4X7Yhv/4p8Zeg0EdbhSH/VqHc=; b=cvJDzeOdbM5St7XAqPcJWyK6ZN50BqrzHw4+fxULfLz3h3ISc4J5R4b4nG/UHtncW1E63YgvRvrL/S49QFLRMtIUGIouixGakZlohz5AvoMscM5enzNoN/fjbGRyzTtXmWfCR12y470a+OmvEnPxStHmrBnD+JoqxHD/diermwfvR2eY27kbSX9qwqSXdGXO7QzLVJuZPTcWQK24oBUi7NrnlJ2aYv+CLYu8Z5MW3AAoMaTfLrO8xJJphyv5UmEzMAgpN3h9YOw8lpIHvDRuctz/4WQTHF4qykua0966rlg/Z+Ian+ahdIiusgQbROHgSrEPpgobJFxiJI5rd5niHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=D7uc6GGFLKx/zTtQRS4X7Yhv/4p8Zeg0EdbhSH/VqHc=; b=VaRX/wxmnom7o8oObbMMnJ04zUr1Y8FjU3bX01tF4jLTmDb9L6Mlkmq1d1LCHK0PJ1W5wW0BGjt2aWFN6rwUE0g7K/lKcaXu0csgawqOW7qoYgUDoz+scOt47udSKgjQtEbF1lrPJCLUwgT2Z4F7BpTn5PiFNcEd2Bro0ku0I1PJjlLp2HV33UtfeQu5OiwOivzPu69jKfeiGtQroG/DjOk4879vfsuSndAN0B1Rdok6Fkvr0pMdBaakN8kFm+V0qBKPjUbAe39kC4NmvkteoYXbHmihLcf8RN0249L1BGoYwlcFj/++mVODTu95g69tIZ5IVPkHftIafao1RikwHA== Received: from SJ0PR03CA0376.namprd03.prod.outlook.com (2603:10b6:a03:3a1::21) by PH7PR12MB8107.namprd12.prod.outlook.com (2603:10b6:510:2bb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Mon, 3 Jun 2024 08:05:55 +0000 Received: from SJ1PEPF00002327.namprd03.prod.outlook.com (2603:10b6:a03:3a1:cafe::39) by SJ0PR03CA0376.outlook.office365.com (2603:10b6:a03:3a1::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.27 via Frontend Transport; Mon, 3 Jun 2024 08:05:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by SJ1PEPF00002327.mail.protection.outlook.com (10.167.242.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.15 via Frontend Transport; Mon, 3 Jun 2024 08:05:54 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 3 Jun 2024 01:05:46 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 3 Jun 2024 01:05:46 -0700 Received: from nvidia.com (10.127.8.14) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4 via Frontend Transport; Mon, 3 Jun 2024 01:05:43 -0700 From: Maayan Kashani To: CC: , , , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH v2 14/34] net/mlx5: use non const max number for ASO actions Date: Mon, 3 Jun 2024 11:05:03 +0300 Message-ID: <20240603080505.2641-10-mkashani@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240603080505.2641-1-mkashani@nvidia.com> References: <20240602102802.196920-1-mkashani@nvidia.com> <20240603080505.2641-1-mkashani@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00002327:EE_|PH7PR12MB8107:EE_ X-MS-Office365-Filtering-Correlation-Id: df5859ba-79e7-4ecb-48f6-08dc83a3fe24 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|82310400017|36860700004|376005; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?cInUpjGW/XO8cV56AEBXQ8LZiP0Wiqetd0LXnzWlfVh0rxLy3vJ1YB1afLwi?= =?us-ascii?Q?uf51AYupAoBgWJ0dGDbh6+0yZu3Ooivzuwb6mU5zzjwUj9zto8M+iZljMh87?= =?us-ascii?Q?MnA5EXqRxaMZNW9DVyBDfSfXM6i6A47ZOmSWiYo4/YxgQWozbRaIF4NhSWRn?= =?us-ascii?Q?EcF32mx9gde/iQQkgm8DFdYDrMRaaQ/m6RaqO9e/T2UAH2etPvkXdFU3Bops?= =?us-ascii?Q?GwFDAdHVJlCKuolbHpGifpPbY/M5+wl+pa1m0WrIWH94ZYgwZ9mFAAngTKLN?= =?us-ascii?Q?GEERC1+VOUSLQ4yWFnTnBwKfhqFwbNL+tI1HzPlenSuHOIec29d1ODtZHsQI?= =?us-ascii?Q?SXwLs1NCcKD5KPPrpLv7TWamu0P0T50j1kK3g141LcNGEbybEUcF8ttuD4Oe?= =?us-ascii?Q?3QLBy8tInvpH5K4q/QwfmSLYzrjT7Z40UGlbdSFtwHoaFCVQFvyAg8k981H+?= =?us-ascii?Q?6dnqB88WssnBheBVAART8HcOqIX0fDHL/PJQb7xGw9mGIA6nIzzei/OBDSmp?= =?us-ascii?Q?tIuhaQCsyXM8XGFaH9ZYeIZLaaA6mDnb9CqOOvA892lOhuoxVfjmbP9/CU+d?= =?us-ascii?Q?N7JQ0T67cAZJFOxAhlVTLX1NaR2tI+Emb0EiX2UDdSxL5N8RiQ4Io0IBzI07?= =?us-ascii?Q?5etQ9vZhWEi3O3Brpsedyvuux4w8cKVLuzzKj7dK3RV6DKbkkXcjB2EBV8K1?= =?us-ascii?Q?VfhX94mr21502PwZPrLWziYXo45rqCr1DF5jxAUjwDKBk6J/UgxJjhkWZpSJ?= =?us-ascii?Q?iLYRrS5wwR007yA76OIgPBOraIfPZILOsmzbkNNAHmJUJ6C+yjlpcHNzCgs/?= =?us-ascii?Q?QoCzFRK5xeh39SQYYPev3X309ZJgfhetAD1N6jzBb66xmhIbsLvqWXXDwr1N?= =?us-ascii?Q?KPK2V1HcHIf0MDHidDXgroCVSJbOUc6ZWCtDNQHzpqePr0MuZXVJD2DBhEgH?= =?us-ascii?Q?lkTt2jjAhDmfMvjDwSQqVeEExMeMWyFKLgwnoSYIT6Ussw6cihNHPfa0/Tj8?= =?us-ascii?Q?mvwnWgaxtzlBvpxY86wlJNCIJvJq7FiNt7kSW3xkadzIYXBVGojmb0VOKNzD?= =?us-ascii?Q?DiHtrFf4g9qjdXcwz3AgrrtccJ2koVPoa5JYs4KFzrV48O6lHqPdWPRC1RLI?= =?us-ascii?Q?bCp3lK9PqK37XsPWnmMrS20HlypizqIxvdp5ANBmGmULQorSsa6YXgAMk6JQ?= =?us-ascii?Q?grh3ms6achQ4q3jo5GPVOzLEf7osGYhN3D0SgdOhL2owFQJo47cTrqln0yCU?= =?us-ascii?Q?OzVL++9Zf/PPivLuY2U4/hPurlM6jLXdDdLRDwH8QDHE352wXsvEOhGVEd8D?= =?us-ascii?Q?v58FEbRAh4NMJEgXYJ164I7zJ/fu92kZZAQ1XWajUbTxFIp+9mqcsDkMbS9n?= =?us-ascii?Q?Eo6t+g8=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230031)(1800799015)(82310400017)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 08:05:54.6308 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: df5859ba-79e7-4ecb-48f6-08dc83a3fe24 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00002327.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8107 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 For ASO max allocations in non-template mode, Read FW capabilities instead of using consts. Signed-off-by: Maayan Kashani --- drivers/net/mlx5/mlx5.h | 17 ++++++++++++----- drivers/net/mlx5/mlx5_flow_hw.c | 13 +++++++++---- drivers/net/mlx5/mlx5_flow_meter.c | 25 +++++++++++++++++++++---- 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 67986a00b4..e635907c52 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -792,12 +792,18 @@ struct mlx5_dev_shared_port { /* Only yellow color valid. */ #define MLX5_MTR_POLICY_MODE_OY 3 +/* Max number of meters. */ +#define MLX5_MTR_MAX(priv) (mlx5_flow_mtr_max_get(priv)) /* Max number of meters allocated in non template mode. */ -#define MLX5_MTR_NT_MAX (1 << 23) -/* Max number of connection tracking allocated in non template mode */ -#define MLX5_CT_NT_MAX (1 << 23) -/* Max number of counters allocated in non template mode */ -#define MLX5_CNT_MAX (1 << 23) +#define MLX5_MTR_NT_MAX(priv) (MLX5_MTR_MAX(priv) >> 1) +/* Max number of connection tracking. */ +#define MLX5_CT_MAX(priv) (1 << (priv)->sh->cdev->config.hca_attr.log_max_conn_track_offload) +/* Max number of connection tracking allocated in non template mode. */ +#define MLX5_CT_NT_MAX(priv) (MLX5_CT_MAX(priv) >> 1) +/* Max number of counters. */ +#define MLX5_CNT_MAX(priv) ((priv)->sh->hws_max_nb_counters) +/* Max number of counters allocated in non template mode. */ +#define MLX5_CNT_NT_MAX(priv) (MLX5_CNT_MAX(priv) >> 1) enum mlx5_meter_domain { MLX5_MTR_DOMAIN_INGRESS, @@ -2423,6 +2429,7 @@ mlx5_flow_meter_hierarchy_get_final_policy(struct rte_eth_dev *dev, int mlx5_flow_meter_flush(struct rte_eth_dev *dev, struct rte_mtr_error *error); void mlx5_flow_meter_rxq_flush(struct rte_eth_dev *dev); +uint32_t mlx5_flow_mtr_max_get(struct mlx5_priv *priv); /* mlx5_os.c */ diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 41f20ed222..3022a86344 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -12522,6 +12522,7 @@ static int flow_hw_ensure_action_pools_allocated(struct rte_eth_dev *dev, bool actions_end = false; struct mlx5_priv *priv = dev->data->dev_private; int ret; + uint obj_num; for (; !actions_end; actions++) { switch ((int)actions->type) { @@ -12530,7 +12531,8 @@ static int flow_hw_ensure_action_pools_allocated(struct rte_eth_dev *dev, if (!priv->hws_age_req) { /* If no counters were previously allocated. */ if (!priv->hws_cpool) { - ret = mlx5_hws_cnt_pool_create(dev, MLX5_CNT_MAX, + obj_num = MLX5_CNT_NT_MAX(priv); + ret = mlx5_hws_cnt_pool_create(dev, obj_num, priv->nb_queue, NULL); if (ret) goto err; @@ -12548,7 +12550,8 @@ static int flow_hw_ensure_action_pools_allocated(struct rte_eth_dev *dev, case RTE_FLOW_ACTION_TYPE_COUNT: /* If no counters were previously allocated. */ if (!priv->hws_cpool) { - ret = mlx5_hws_cnt_pool_create(dev, MLX5_CNT_MAX, + obj_num = MLX5_CNT_NT_MAX(priv); + ret = mlx5_hws_cnt_pool_create(dev, obj_num, priv->nb_queue, NULL); if (ret) goto err; @@ -12557,7 +12560,8 @@ static int flow_hw_ensure_action_pools_allocated(struct rte_eth_dev *dev, case RTE_FLOW_ACTION_TYPE_CONNTRACK: /* If no CT were previously allocated. */ if (!priv->hws_ctpool) { - ret = mlx5_flow_ct_init(dev, MLX5_CT_NT_MAX, priv->nb_queue); + obj_num = MLX5_CT_NT_MAX(priv); + ret = mlx5_flow_ct_init(dev, obj_num, priv->nb_queue); if (ret) goto err; } @@ -12565,7 +12569,8 @@ static int flow_hw_ensure_action_pools_allocated(struct rte_eth_dev *dev, case RTE_FLOW_ACTION_TYPE_METER_MARK: /* If no meters were previously allocated. */ if (!priv->hws_mpool) { - ret = mlx5_flow_meter_init(dev, MLX5_MTR_NT_MAX, 0, 0, + obj_num = MLX5_MTR_NT_MAX(priv); + ret = mlx5_flow_meter_init(dev, obj_num, 0, 0, priv->nb_queue); if (ret) goto err; diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index da3289b218..19d8607070 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -704,6 +704,26 @@ mlx5_flow_meter_param_fill(struct mlx5_flow_meter_profile *fmp, return 0; } +/** + * Callback to get MTR maximum objects number. + * + * @param[in] priv + * Pointer to Ethernet device. + * + * @return + * Max number of meters. + */ +uint32_t +mlx5_flow_mtr_max_get(struct mlx5_priv *priv) +{ + struct mlx5_hca_qos_attr *qattr = &priv->sh->cdev->config.hca_attr.qos; + + /* Max number of meters. */ + return ((priv->sh->meter_aso_en) ? + 1 << (qattr->log_max_num_meter_aso + 1) : + qattr->log_max_flow_meter); +} + /** * Callback to get MTR capabilities. * @@ -730,14 +750,11 @@ mlx5_flow_mtr_cap_get(struct rte_eth_dev *dev, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, "Meter is not supported"); memset(cap, 0, sizeof(*cap)); + cap->n_max = mlx5_flow_mtr_max_get(priv); if (priv->sh->meter_aso_en) { - /* 2 meters per one ASO cache line. */ - cap->n_max = 1 << (qattr->log_max_num_meter_aso + 1); cap->srtcm_rfc2697_packet_mode_supported = 1; cap->trtcm_rfc2698_packet_mode_supported = 1; cap->trtcm_rfc4115_packet_mode_supported = 1; - } else { - cap->n_max = 1 << qattr->log_max_flow_meter; } cap->srtcm_rfc2697_byte_mode_supported = 1; cap->trtcm_rfc2698_byte_mode_supported = 1; -- 2.25.1