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 6955444173; Thu, 6 Jun 2024 12:26:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8E78342E51; Thu, 6 Jun 2024 12:26:47 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2083.outbound.protection.outlook.com [40.107.92.83]) by mails.dpdk.org (Postfix) with ESMTP id 0459B42E45 for ; Thu, 6 Jun 2024 12:26:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hySzxKd33MfIDLyPKY+TRXB+yTnk4eD5ikWrek0uDBjNECAwVCz/Qk3B0e88iiasF8g0V+O9n5venwXIKp9QpumiAuxteiT5Zc+m2TMDhKiX3Mf5SCkvyxCgFaPc7B9ILdItQu4/i3W6dBeSHh4jdeOmfwkWhOUSOo2YU1tqenDWW07udytGyMp/EPr58oY9NGte5FJxPWb4bheh6v7Yfi6bFt2yxBwfr8uWflEGeesbh87hKnoJXsgouq6jk1xLVfLxd+rzXVC0HBO5/AOhAmsaw+kJeN6UDuf5NMe5qqzyBSOM+NdExYs6FwghuF50CsePMF9UZR1NVgGygDu0nw== 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=VpkZuKcY0BaUT1tpOir3LQiSO6UG+8Ma1AQFP1mUm0w=; b=Ds+lY4PmuNNNlNWyi0j510sbDvNGEZnKuLHNwJxdDmZv9SVjHm7EON8xS6y6rn9EyOaWnWbPdq/QiYE12DTx7vQiEOjRb6gzaeT8mVfWhPyqr59wpbcvfLOiLIdi0/lWsk6ZdItN/Y/GkAQK2wS+yfPtJ365pWTDFpV2VBZ3r+QE5j4EeXmVvVsIyV/WRxJR3WkuuGhQbH9yA+FsEHCA5XbXR0RWLRt10L8i4g/rv00ra/rLOdGAweNIcMC+G8JyfeJzgiZITTICAlVMUcVN/s62UHX+OMR/0Ruo6L9/9aGQ5Ra8OsNS6kmfzalKkR27lbn3HpXpQDPZPXiPT5p5lA== 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 (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=VpkZuKcY0BaUT1tpOir3LQiSO6UG+8Ma1AQFP1mUm0w=; b=tR07SfaBXrnX0xkX4qBcDbC+MbkF79zhU5PGk+clunfvx9kMD6dS3RtttkZ1/7ciLDA6KltPcGI3CDEdYil1idrHTnwriIpGLaDVY+78BwB4dC5yWnWtYkbBY9FJI210KgGsCrKVT0+fd/GidwnIXo/Ufh6XpMm4veEVhqTFWjqnq2tHkcNY5kJumXH12B+bi8p+DyukrHtXHJm6MnTXBxThS2CemEEHwnKBEqh3FPmSC2CAy2Vwow2Ch897SlvSNJT7+gvVKeA2HjofCiylgI415ceaPV1qp/JmiKpKvrvN9FWAJ+Q2U6foaHSivlwI3y7amLXnjf/qAAx0eZJXqg== Received: from BYAPR01CA0042.prod.exchangelabs.com (2603:10b6:a03:94::19) by DS0PR12MB6391.namprd12.prod.outlook.com (2603:10b6:8:cd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.29; Thu, 6 Jun 2024 10:26:40 +0000 Received: from CO1PEPF000044F2.namprd05.prod.outlook.com (2603:10b6:a03:94:cafe::57) by BYAPR01CA0042.outlook.office365.com (2603:10b6:a03:94::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7656.18 via Frontend Transport; Thu, 6 Jun 2024 10:26:37 +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 CO1PEPF000044F2.mail.protection.outlook.com (10.167.241.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.15 via Frontend Transport; Thu, 6 Jun 2024 10:26:37 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.1544.4; Thu, 6 Jun 2024 03:26:24 -0700 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 6 Jun 2024 03:26:24 -0700 Received: from nvidia.com (10.127.8.14) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4 via Frontend Transport; Thu, 6 Jun 2024 03:26:21 -0700 From: Maayan Kashani To: CC: , , , Viacheslav Ovsiienko , Ori Kam , Suanming Mou , Matan Azrad Subject: [PATCH v4 10/11] net/mlx5: use non const max number for ASO actions Date: Thu, 6 Jun 2024 13:23:15 +0300 Message-ID: <20240606102317.172553-11-mkashani@nvidia.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20240606102317.172553-1-mkashani@nvidia.com> References: <20240603104850.9935-1-mkashani@nvidia.com> <20240606102317.172553-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: CO1PEPF000044F2:EE_|DS0PR12MB6391:EE_ X-MS-Office365-Filtering-Correlation-Id: 88188f55-239d-4d01-2fc2-08dc861325bb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|36860700004|1800799015|82310400017; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?u4niuzMBZiykjGfZ9MC4SI3g4gzpaxPcwxNYHNiCEKIDzIHfyoFPmVS2mkZ4?= =?us-ascii?Q?XdOEB7WdV3GyHs/3EyX01BsJmG4jRKazfhmvqYPe/zdkwcaqQSmKjFLLVa77?= =?us-ascii?Q?645yzr4IbKlayKLso2SQ5GhYsRNUDJQ2IwZ83SJkW84jjPPQsxOfkwfoquqk?= =?us-ascii?Q?7e+wFhjM4n61kwkVucGzjvm74aZd0FQcMe5fbdeHihGNdD6lDaGemzssCTDT?= =?us-ascii?Q?ffk9Xe214kNFZmJsa4vyH7tFF9xGU1rEfAkhk9aB/9p/ds3Wao9/YBVUOoY8?= =?us-ascii?Q?P3/VPzJfZYBq+50utJq33yLNvPnKK0/yRtpfxudjEIAir7dOXufjXjif21KB?= =?us-ascii?Q?Q39snZyUyjsyAGAz2okzEFQjW+K5nX5vB6ln7lR9nmkkXGQ/FcgxsTCPOWDY?= =?us-ascii?Q?ajpA/yV3VBw0VO5GZK73nyq7RH2AGqEL+RLrqYus2a55fEPAo3j9h0yb1lCf?= =?us-ascii?Q?B22GflHrZn9rtTqLhw7JaHA3L8VjDZ3DKT/XfG3RJ/2C62hx/9wE5056Y+6K?= =?us-ascii?Q?IbMplHRUo7RU67OEw6uOQtN0uFR86I7Wy1h7QWqgzs0ifxcTHwQ0jC8V1vML?= =?us-ascii?Q?thlFLl24B3MiMWjx5RaPM1Pl7E5kBa9ZRove4zvFciGcoUjvak2ErHLPvmM5?= =?us-ascii?Q?hlNt9nIdi9fjgCTEM70Ch4GN0ewVxf6d+uZN/G4EsMwOAQEguZ0WAQkOPfgd?= =?us-ascii?Q?VsoDAGOa4bssQPRMiXgkIUQt6INlOPz7vejYWMZyZeUNRTc67txtOMd5z2Ex?= =?us-ascii?Q?Y/3GUtmgeBt4r5cQ5X5Qie9vK56OUuiKKEJ36GbVZYM7ZSrW2HsNDZbvImcL?= =?us-ascii?Q?ROdiom+KPuuNTJdaW4Uqe3sdmRf8VzYrIM87HW8TlvKmttRI37IvhoOcW7/j?= =?us-ascii?Q?RF6/Ry6otCTlSWC5LUL2YIRUmp5G/H98DcudndfCMU9usdnGufGN/69xhvxf?= =?us-ascii?Q?gGTY8EohZ4nsMUUZJDrrU0vm63G4vgmvaHjfy9rI9NTTYrRyQ5djyTG6oC5L?= =?us-ascii?Q?vx6MBx68CE5dRcmrTzMs1Dh5WmGYbbrYT/zr9cFCOJo3bUvl8pAdrBbpY8Bu?= =?us-ascii?Q?hpjyfU7HA2zacYvp58SxfHnQCDuPt/0hB+kw8GFL610ogJyQPR5sAwoVo9wf?= =?us-ascii?Q?8WC/JaecyLjskhruynwaWgr3rXzHQeVzvvT3F0SYZYnjujYGZMCQHkbVa5wB?= =?us-ascii?Q?omzf1CjVvziD30tqjCcU2HbBZlkGIwfeZegCpwUy66cWWZceozSPauiyGaju?= =?us-ascii?Q?F62WBzWDIeeutTZZ7jMjynQNU/6D07kNq6sxCOC4dTxTQajCGTbGw1lw4UWo?= =?us-ascii?Q?l1skbzJRul1vA7KZtNYmI/mfDEkUdOqsGNP4ontlFPaO2eOatnkOElY4RH58?= =?us-ascii?Q?oAQtxr8eKcbQlrZrzIA7RB6kLxDKaiUtrXq9i4kc40SfrZ75sQ=3D=3D?= 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:(13230031)(376005)(36860700004)(1800799015)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2024 10:26:37.4355 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88188f55-239d-4d01-2fc2-08dc861325bb 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: CO1PEPF000044F2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6391 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 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.21.0