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 8EBFE41F51; Sun, 9 Jun 2024 13:02:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B73BC40E3E; Sun, 9 Jun 2024 13:02:04 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2074.outbound.protection.outlook.com [40.107.92.74]) by mails.dpdk.org (Postfix) with ESMTP id 2E98740E1E for ; Sun, 9 Jun 2024 13:02:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MrstTZdiD9TRqxH/46sGFfVAXTNT2teYnPAwiX6gWzbJxT8VToOW8S2vJb4HvMiAqBOvQwxVmXiqi0Sv+0cTG6gMw4VtUSuzouKVoTK6cqtVhAcMQQ8fc1TEJ16pxqSpYZE4FBB+iNXtERT4g7T4wQzc2crVWV4vXTsixb0EPOgj7ldjOsFBDQDlqIXtped8duvEp34WYl5x/4BHXsD8Uk1tSlNV9TxAGQ6p2rt44w8dJeF8rHAd/7SQsZsOYspIFhaQ3vt6tZA1AWxzeA2ZrDF/IBvuIQ6BShXbuCWtIZeachG8Lp2dHVHvNShBjT3G6RDS4mYuYGz/lp0bpHpnlA== 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=7CIh1AAva7J3hdK3IrwbqcWZ2LXVfZkGRcgELF32S38=; b=E3ICg28atCg2/oHwJWyU/dWyyYNtY8ATiSGTXKxwjTHCArOrp/0Hbq/zx3bEkRgiiQO68/hGD+gkFleBsLCZ0WZDUO6Xfd6byCc+5NU7GdLHYLQ1y3wc1pKJXODvbaGYFVMFnP2wutQd2txbSZnhJLZC00FLeJ1ZjEUT7ChqhHPT52KE1OiOcJe6NhtdicvPWMZi9N75/0oTjAiHvTb1APGLVSLQY9/Ep5mACklVpPZ+fb9lGcvONNjz3guxNXJ2iQHj9t4IqriW3rhrFfhyQ7tA+g1KNU7QEAsbuRGNkkr76j7f6jUdkw9pRzaILvqm5IPVyfWZ1LdbfaLKRAjAXQ== 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=7CIh1AAva7J3hdK3IrwbqcWZ2LXVfZkGRcgELF32S38=; b=Nv6hGkkw4a2pgTm5Y6YwtISDNxkn/eEvRKp/MQun4QgQknAmszXjp33mF3XzJ7flMpUDOAts2wdwyF6UxSYiu2EnAZzkFz8ONSHdETc+NzRODEnQTSSkgOFd3DNPLkpdR4RH03ptAAD9E4HRSYARGmZcGxS/eyVKm/eIQS1mdIW9RD5A8f3mPBILKVoA/Y9LCCVpT1/x/dY1Qu4ccy2uS7/lLWTHg8g5BOb68PLy2UPbR6x0gS8k0+wDQi8MlQkPUxDwZj+Ju5Vi10VkqDifozNGXMAb987LItn5aoris6fQwJTvjdODqzVu+GD8Vi+PGbbFjCs9KEB56mUmjkBy0g== Received: from BL1PR13CA0132.namprd13.prod.outlook.com (2603:10b6:208:2bb::17) by SN7PR12MB7154.namprd12.prod.outlook.com (2603:10b6:806:2a5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Sun, 9 Jun 2024 11:01:59 +0000 Received: from BL02EPF0001A108.namprd05.prod.outlook.com (2603:10b6:208:2bb:cafe::1c) by BL1PR13CA0132.outlook.office365.com (2603:10b6:208:2bb::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.15 via Frontend Transport; Sun, 9 Jun 2024 11:01:58 +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 BL02EPF0001A108.mail.protection.outlook.com (10.167.241.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.15 via Frontend Transport; Sun, 9 Jun 2024 11:01:58 +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; Sun, 9 Jun 2024 04:01:49 -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; Sun, 9 Jun 2024 04:01:48 -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; Sun, 9 Jun 2024 04:01:46 -0700 From: Maayan Kashani To: CC: , , , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH v7 10/11] net/mlx5: use non const max number for ASO actions Date: Sun, 9 Jun 2024 14:01:06 +0300 Message-ID: <20240609110107.92009-10-mkashani@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240609110107.92009-1-mkashani@nvidia.com> References: <20240609085600.87274-1-mkashani@nvidia.com> <20240609110107.92009-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: BL02EPF0001A108:EE_|SN7PR12MB7154:EE_ X-MS-Office365-Filtering-Correlation-Id: 7aca8f87-fac5-46db-915d-08dc88739565 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|82310400017|1800799015|376005|36860700004; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?IEVZ0rgVEkbIrOg38uJUcmYDDpIYhoBJXlAOmTU2qdH0jyxXhT78WbQDip2c?= =?us-ascii?Q?eXJPsNUsBskU2fH7CaJkyEzj0HecAeD3/HoEKKAofId/yEpTbomrRTqfzfEN?= =?us-ascii?Q?Ts1g9fSzVhtKNm+rhuxAxG5NBb4Ow4co6WN7o92rpJxe1u8HznZTg9ZyQVF+?= =?us-ascii?Q?Pe3l6oGPdbDdUZslrpmsqHcbozb9bIk2aMTGbf/UeJucwRB67SNNgJ8ivTwJ?= =?us-ascii?Q?ntH40kbEDFsszBCOZfq+GtAn8NWDTmW4jtSSBQ1jasBT24lGMvZL+nZhIXyg?= =?us-ascii?Q?0NhCZJQb2dpQzdfvzCWe/zwL8FaJ88HaHmZo4AgT8aOliGSjkW2gInks6Q1z?= =?us-ascii?Q?TVNqR4kYuUzieLPmvgGYYLUY0lre1nezSBW/QD9F8wA7ueFzEdlY/MK1bNzx?= =?us-ascii?Q?hxTZ0f1KE2i6dSWdq4NxOJHxHwE1bltx3WByP3ojAFqF4gQW7yno69gN+s3g?= =?us-ascii?Q?l74078uwNLl2RADIYUCFSl3WVwsfS8Jj084TxJfbSPIE3K8LKf1FOEtqDyT4?= =?us-ascii?Q?yg2R1odFTCWLWlV02sMhQ9WNWskA+rUs1m2KTIQTd3+m7CigJedVCX4gJGPH?= =?us-ascii?Q?EgU/hGGs+HFm4eXCo5tbfAPtg1xsU47UfQfkVKSY31ol/Xr+gCR/1a3oD6Hb?= =?us-ascii?Q?/UNQswKWmnRynVpD2H+0Y6HOAEVUztzRg1HcnEERHFmfT+RVl8zWOo/YVAxs?= =?us-ascii?Q?3QnGZhyD8FnLwH4q4ZkkJVUyIN6V2QRrmPEdTOHf0PmGj5tylFC7KOnM+iZO?= =?us-ascii?Q?uPhGS6wWegl58zw7XG441nBOI1vasJp3UZfe3Zw7uUE53zDW5YplwvEPpLq+?= =?us-ascii?Q?ZwWQY8YFK16u8XIFO5l1jCnLcPcLgYhmi7xg+Mr5f6tnmaeFZomQpz7gEjjb?= =?us-ascii?Q?WvvvXHgEpzlPxDv92N5vT/l4ojkVW/8w1ViG/ZatvtyjsadRxNYjtZ+HYEvm?= =?us-ascii?Q?BEV+IocibNt6eGPkOUMurePb3TbP5cwS5QF3+q4CK8pQEV2yU4XjI3EkzXE1?= =?us-ascii?Q?++qgeW8+GufjVBO4oiV5z17WRqAzTvEQok5m+Yx+djS3uZ+mSg1Xck/F2PjC?= =?us-ascii?Q?NOOpjZqE1GqRTeFDsbPXsb/8bfW9m2S9Q2dPsUIQOatmC5woMsAGPk3/qDn7?= =?us-ascii?Q?BfCDtCjXc61x3B/0Dcy/uuLPhe2AKiA7ZXDNwJ7Nfgl3hYQ4zkEj1mm/S6rR?= =?us-ascii?Q?OK1RKQOEIfvLkPMhWHJfdjhtoKQ7O3m3pc3y0Jr1PV+83nHUQgRSn6Y3YanY?= =?us-ascii?Q?6rdKcXg/Qy3nADT7IDoqnPfLIfRDvbryW53kX9RtWPKtczgjgJmTmj3Bfyd8?= =?us-ascii?Q?3ZjJpQb1W8+BG0gHZAf+A1xZqN91gYuv5PKiV0q8T/mmOV5TNOZNOdo1bSww?= =?us-ascii?Q?bOiDRvooRg+/MZUyMSK67gCAyH9Hm42lORz2drvyetg7YPD3yw=3D=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)(82310400017)(1800799015)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2024 11:01:58.6658 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7aca8f87-fac5-46db-915d-08dc88739565 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: BL02EPF0001A108.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7154 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 Acked-by: Dariusz Sosnowski --- 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 5789cc6ef17..159ea10018e 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -812,12 +812,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, @@ -2457,6 +2463,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 f326ca0a21c..b4b0de417a8 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -13114,6 +13114,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) { @@ -13122,7 +13123,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; @@ -13140,7 +13142,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; @@ -13149,7 +13152,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; } @@ -13157,7 +13161,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 da3289b2189..19d86070707 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.21.0