From nobody Mon Oct 6 13:35:40 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2044.outbound.protection.outlook.com [40.107.93.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA5CB283C90; Mon, 21 Jul 2025 07:14:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753082048; cv=fail; b=bjqYyhv2Tl1Pk3D7XfATTJXZUA7GVs1JxTcVgOyrBS9gWpUAB865QgY7IXjU4d/v8iTD8X03WuSnlcR2vUpAGay8+lVcDiVzGf8sC9i94C+nv/IrIk3R9bqp3GwgZrjw00IA6wDvZdH7YLxLDglPEQwwMYH9TmhXJRwm6Ph5TiY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753082048; c=relaxed/simple; bh=x4Deyhk8G0S+1TsidAfVsguDSWOSVuEVJJuR4IcZvD0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=M674DnMrOT5KNLwhccKdtYt0o4gThArW8t2P7pWnv4aRSkqXicZHiQ+w/POpCl8mocROR80xAeIujFUV6C/uF5wMD8kh62CZSJpA+2QdFMCKMqjwVdeDI1Tgr9hdMckWqywmaXGKnr0E09u27HOW2SlXNA5NVM67tncPLw2kTjs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=m3Qvc1kU; arc=fail smtp.client-ip=40.107.93.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="m3Qvc1kU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rpRNCuWJ1DK5SzGIfYIRl/mcpcgzA82aP9S34/0AB6E0XM1ezU1v5CjpHBhm6Gec8h6w/augoQE7Ri6qGf1O+JaU3d5pq0gABD2Fm2ozbrgCzxukrFhjZTmlZdf8Eu01Qr51Uwj9aXKuNSh48hxuO1X++tKqsauIsxUXlmYL0zFPDyCTRX07xYIHfpJ6cnONJVL7zn4KqGvj6vLnGwWy4CZbUnb7iM/U0jSVb7kkeSkAglfVM0UjdpfEVBN1UwWCVEdgEJLJehZHG+bsDIL1mUVvJeAlq6pOQquOf9hTWmevY++Vb9bwNpKSGdgEn0U1SoBuRfKnwRxSIs8RGv+XjA== 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=8LGKilvQOqwjsbfSg9rBn5hMOGvgrpc0UHFDcxdURTs=; b=FqIKQQT64lIo7nieklfrTv/BLnSfnYPNg5wKQmDTpnbkYPFTClF120mGH+7O3yiuyDhTA0+7yXykrDswVPDkZFd4Z84Wi8S7mkbCAKFVhKpG56O/AVqiqvU/mq8svboAfobqDF77fWQmxRuuZAtMUSskQ1NyjjFFKqjmuDrqFdiXamMt+B/4HA0Xuaw7r/23XKRqMdpHJtUPNdEQ4YGniYElniIOhFdFSeA5rlx4vqNH2U2eZesEES6E/oQtX6ynxRwgIotAeY0DD9wFR4rWg/dVIhlscCwKMed9BNJrHgnmGtsNUUpSFPOGKi1RRydd7KWmas1CIjBLWxcPVv6WyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=google.com 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=8LGKilvQOqwjsbfSg9rBn5hMOGvgrpc0UHFDcxdURTs=; b=m3Qvc1kU/SUUkGExUt3R3xDyjDn+pAMfRaYvJxW07RtOdV2/KyfclciSZwpTqj2CHZF7RueHWdlgYaG86ORuJHiubYzwbqh3jGa1bTeZuMPw+KyEl82dp0g13DoyJC3/cSUq5+1GPsPc+vxnxd3m05PZCoFxr6q5GJHH4TXNBK7dxMBBA+79kpoVuKMdiujb8FEQbO9vQXI1Kum/UbyKe1gQBJJeNpgLnTxqBUzpcMxOpjhJFPnK4YGX7F4UrxrfzkBG9MTfOP3r1N0jzjJQqfKCQsmlPI/5vQ/nHTlvBAucZYtF65/ywaTvoqhWSbaHuKf7JE+zEIzCtmF1v0yfUw== Received: from SJ0PR03CA0337.namprd03.prod.outlook.com (2603:10b6:a03:39c::12) by MN0PR12MB5836.namprd12.prod.outlook.com (2603:10b6:208:37b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8943.29; Mon, 21 Jul 2025 07:14:02 +0000 Received: from SJ5PEPF000001E8.namprd05.prod.outlook.com (2603:10b6:a03:39c:cafe::a3) by SJ0PR03CA0337.outlook.office365.com (2603:10b6:a03:39c::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8943.23 via Frontend Transport; Mon, 21 Jul 2025 07:14:02 +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 SJ5PEPF000001E8.mail.protection.outlook.com (10.167.242.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8964.20 via Frontend Transport; Mon, 21 Jul 2025 07:14:02 +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, 21 Jul 2025 00:13:40 -0700 Received: from drhqmail202.nvidia.com (10.126.190.181) 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.14; Mon, 21 Jul 2025 00:13:40 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Mon, 21 Jul 2025 00:13:37 -0700 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , , , , Lama Kayal Subject: [PATCH net-next V3 1/3] net/mlx5e: SHAMPO, Cleanup reservation size formula Date: Mon, 21 Jul 2025 10:13:17 +0300 Message-ID: <1753081999-326247-2-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1753081999-326247-1-git-send-email-tariqt@nvidia.com> References: <1753081999-326247-1-git-send-email-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001E8:EE_|MN0PR12MB5836:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d921274-e6c3-4d9f-159e-08ddc8262b9a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?SxeBQcFTuhKJrn64kxV0pnaj7tuq8VKVW6hu4Ud6nvE+bgMkv3UeQSYkG9r9?= =?us-ascii?Q?MzIjGpI7nkaNboufX6pIJl/6GXpq+w/MouShygxREyLwKh7+ABUI7tFTeoPd?= =?us-ascii?Q?txSMokLuCHVEiG+Tcm7h9aMd3E5qyh4lqc1pmCuiUarMlFkBIzFmDbYlNfgK?= =?us-ascii?Q?CjBavwZ75Mnf9Y7Q3E8o0/OBvVWgzFNw/LxrjSKmDDC3SmkXiV42ewYJMkjB?= =?us-ascii?Q?cAk7q0chvgkGVarLIMc8xO7h9hpzuE61vUZPa60NCZhw0dwesm3QoYhcOIIP?= =?us-ascii?Q?lL4n8X16ffbIdEBGOBrIEfoZnqdi73Yj0h3jY18o8K0tiCW+yGgdifEasxCC?= =?us-ascii?Q?sQA30H3FHw+y8VA2SPWhJdTEBnXqcMjnep05SPRuQWrXfKzOQNUukFOIlelg?= =?us-ascii?Q?S3ZT2bQScgcvfUMtoMygoQWn7uUD6tWSgzFow0zodn+bIBp40ihjQYMajHiM?= =?us-ascii?Q?yXhW4A+E0k5vblc2PVbu37o05GmSIBUfQ7OVcZrXcX7Lel2BiSmvlUwEW6gT?= =?us-ascii?Q?zjiYDdxj32/lV3nIoO9IERmosyIXKV1zFanT7WREgxE7/+Et7GTJLVgJfGHx?= =?us-ascii?Q?McLfOOad9WjSwil4WAVyS8q90PHxJ8bZPEmQCu8mibQbew23G+VLdVUnSR0r?= =?us-ascii?Q?vOJUfn1QjGlbT7By4RPrkXfYdkfGrT4klQoGH8Tq9mkGZoajjFCqqSLJKKK/?= =?us-ascii?Q?FxB8Q9S0aKHasHv4vqybxobgWoz7nwdgBCLG3Tt6cJNDB6ljtjQDS8TAfnaJ?= =?us-ascii?Q?NDtOr3FESJcCVfe9Obfv/snCQ2L0s4x4Yp2MdCNmWwaziHG5MsTIYXN8i2lH?= =?us-ascii?Q?Smlj0k2k0JTqAbrvtiFiSHPyxu1lYOOU3ub3LJuL+O9oaOjyJSW+aagru2Ga?= =?us-ascii?Q?ycJU83tw5JXF6fPuMmJ/YYXmf039cfISbWIIxiNaiaoQcMDi34qi3/5BQT6b?= =?us-ascii?Q?uADsmhJNuGaebE4+qjhs/frbDUkyfsAa7xCqyR27UGH3dqWkyfxEpQJ6Ew6y?= =?us-ascii?Q?daY6AIN4n1ToUKvGQqHf/Dug0J2RKG/SS1lq/+k3FDAt2u7Tpp6LIr2rNffC?= =?us-ascii?Q?26eMsFvfGDVvFj1LA8ABWk8B6GMNGKuquKwdqmtzDfAZxx5M7LNQi67gxCbM?= =?us-ascii?Q?UFKCyLBdb3AQ+ul2C3ZMc+Qy/5ek1x7ysRHMH4UwOKWpLbEwjgAdor798Xz7?= =?us-ascii?Q?CE/sw7Ob6JRSIW0WCY8A4LjP3JUAyzd9o/ab2L5mMs4oOUE5HV9M7kpuFXWv?= =?us-ascii?Q?kouVQmtJll/x1YPhVuCliZbaZcEiFzqvlAi9s3GALsQV8/9BAgS90KyctjuM?= =?us-ascii?Q?vBbR0MPaFNocfPZCoSB9NsERcGpdQziYYIOFJZGrRqSOxe7IKYC1uY6N38Q4?= =?us-ascii?Q?B1f2JN4MQcFR7NTEnpZCqZwdqE+OeRq/GEkhQJ++lB3jq6gKjU53mRQduKuR?= =?us-ascii?Q?RBXk9XMK47cEjPkaKJcf2xcSJ7B9uMIVOnlx0O2I7OTcGdjGXzJsgG9e1A3U?= =?us-ascii?Q?7ld5lARvllFsHmvVJGskdCgCxmnUwlxLSehu?= 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:(13230040)(36860700013)(1800799024)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2025 07:14:02.2113 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d921274-e6c3-4d9f-159e-08ddc8262b9a 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: SJ5PEPF000001E8.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5836 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lama Kayal The reservation size formula can be reduced to a simple evaluation of MLX5E_SHAMPO_WQ_RESRV_SIZE. This leaves mlx5e_shampo_get_log_rsrv_size() with one single use, which can be replaced with a macro for simplicity. Also, function mlx5e_shampo_get_log_rsrv_size() is used only throughout params.c, make it static. Signed-off-by: Lama Kayal Reviewed-by: Dragos Tatulea Signed-off-by: Tariq Toukan Reviewed-by: Michal Swiatkowski Reviewed-by: Jacob Keller --- drivers/net/ethernet/mellanox/mlx5/core/en.h | 5 +-- .../ethernet/mellanox/mlx5/core/en/params.c | 36 +++++++------------ .../ethernet/mellanox/mlx5/core/en/params.h | 4 --- 3 files changed, 16 insertions(+), 29 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/eth= ernet/mellanox/mlx5/core/en.h index b6340e9453c0..b25147442c92 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h @@ -85,8 +85,9 @@ struct page_pool; #define MLX5E_SHAMPO_WQ_HEADER_PER_PAGE (PAGE_SIZE >> MLX5E_SHAMPO_LOG_MAX= _HEADER_ENTRY_SIZE) #define MLX5E_SHAMPO_LOG_WQ_HEADER_PER_PAGE (PAGE_SHIFT - MLX5E_SHAMPO_LOG= _MAX_HEADER_ENTRY_SIZE) #define MLX5E_SHAMPO_WQ_BASE_HEAD_ENTRY_SIZE (64) -#define MLX5E_SHAMPO_WQ_RESRV_SIZE (64 * 1024) -#define MLX5E_SHAMPO_WQ_BASE_RESRV_SIZE (4096) +#define MLX5E_SHAMPO_WQ_RESRV_SIZE_BASE_SHIFT (12) +#define MLX5E_SHAMPO_WQ_LOG_RESRV_SIZE (16) +#define MLX5E_SHAMPO_WQ_RESRV_SIZE BIT(MLX5E_SHAMPO_WQ_LOG_RESRV_SIZE) =20 #define MLX5_MPWRQ_MIN_LOG_STRIDE_SZ(mdev) \ (6 + MLX5_CAP_GEN(mdev, cache_line_128byte)) /* HW restriction */ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/params.c b/drivers/= net/ethernet/mellanox/mlx5/core/en/params.c index fc945bce933a..86f6147de22b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/params.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/params.c @@ -420,19 +420,10 @@ u8 mlx5e_shampo_get_log_hd_entry_size(struct mlx5_cor= e_dev *mdev, return order_base_2(DIV_ROUND_UP(MLX5E_RX_MAX_HEAD, MLX5E_SHAMPO_WQ_BASE_= HEAD_ENTRY_SIZE)); } =20 -u8 mlx5e_shampo_get_log_rsrv_size(struct mlx5_core_dev *mdev, - struct mlx5e_params *params) +static u8 mlx5e_shampo_get_log_pkt_per_rsrv(struct mlx5e_params *params) { - return order_base_2(MLX5E_SHAMPO_WQ_RESRV_SIZE / MLX5E_SHAMPO_WQ_BASE_RES= RV_SIZE); -} - -u8 mlx5e_shampo_get_log_pkt_per_rsrv(struct mlx5_core_dev *mdev, - struct mlx5e_params *params) -{ - u32 resrv_size =3D BIT(mlx5e_shampo_get_log_rsrv_size(mdev, params)) * - MLX5E_SHAMPO_WQ_BASE_RESRV_SIZE; - - return order_base_2(DIV_ROUND_UP(resrv_size, params->sw_mtu)); + return order_base_2(DIV_ROUND_UP(MLX5E_SHAMPO_WQ_RESRV_SIZE, + params->sw_mtu)); } =20 u8 mlx5e_mpwqe_get_log_stride_size(struct mlx5_core_dev *mdev, @@ -834,13 +825,12 @@ static u32 mlx5e_shampo_get_log_cq_size(struct mlx5_c= ore_dev *mdev, struct mlx5e_params *params, struct mlx5e_xsk_param *xsk) { - int rsrv_size =3D BIT(mlx5e_shampo_get_log_rsrv_size(mdev, params)) * - MLX5E_SHAMPO_WQ_BASE_RESRV_SIZE; u16 num_strides =3D BIT(mlx5e_mpwqe_get_log_num_strides(mdev, params, xsk= )); - int pkt_per_rsrv =3D BIT(mlx5e_shampo_get_log_pkt_per_rsrv(mdev, params)); u8 log_stride_sz =3D mlx5e_mpwqe_get_log_stride_size(mdev, params, xsk); + int pkt_per_rsrv =3D BIT(mlx5e_shampo_get_log_pkt_per_rsrv(params)); int wq_size =3D BIT(mlx5e_mpwqe_get_log_rq_size(mdev, params, xsk)); int wqe_size =3D BIT(log_stride_sz) * num_strides; + int rsrv_size =3D MLX5E_SHAMPO_WQ_RESRV_SIZE; =20 /* +1 is for the case that the pkt_per_rsrv dont consume the reservation * so we get a filler cqe for the rest of the reservation. @@ -932,10 +922,11 @@ int mlx5e_build_rq_param(struct mlx5_core_dev *mdev, =20 MLX5_SET(wq, wq, shampo_enable, true); MLX5_SET(wq, wq, log_reservation_size, - mlx5e_shampo_get_log_rsrv_size(mdev, params)); + MLX5E_SHAMPO_WQ_LOG_RESRV_SIZE - + MLX5E_SHAMPO_WQ_RESRV_SIZE_BASE_SHIFT); MLX5_SET(wq, wq, log_max_num_of_packets_per_reservation, - mlx5e_shampo_get_log_pkt_per_rsrv(mdev, params)); + mlx5e_shampo_get_log_pkt_per_rsrv(params)); MLX5_SET(wq, wq, log_headers_entry_size, mlx5e_shampo_get_log_hd_entry_size(mdev, params)); lro_timeout =3D @@ -1048,18 +1039,17 @@ u32 mlx5e_shampo_hd_per_wqe(struct mlx5_core_dev *m= dev, struct mlx5e_params *params, struct mlx5e_rq_param *rq_param) { - int resv_size =3D BIT(mlx5e_shampo_get_log_rsrv_size(mdev, params)) * - MLX5E_SHAMPO_WQ_BASE_RESRV_SIZE; u16 num_strides =3D BIT(mlx5e_mpwqe_get_log_num_strides(mdev, params, NUL= L)); - int pkt_per_resv =3D BIT(mlx5e_shampo_get_log_pkt_per_rsrv(mdev, params)); u8 log_stride_sz =3D mlx5e_mpwqe_get_log_stride_size(mdev, params, NULL); + int pkt_per_rsrv =3D BIT(mlx5e_shampo_get_log_pkt_per_rsrv(params)); int wqe_size =3D BIT(log_stride_sz) * num_strides; + int rsrv_size =3D MLX5E_SHAMPO_WQ_RESRV_SIZE; u32 hd_per_wqe; =20 /* Assumption: hd_per_wqe % 8 =3D=3D 0. */ - hd_per_wqe =3D (wqe_size / resv_size) * pkt_per_resv; - mlx5_core_dbg(mdev, "%s hd_per_wqe =3D %d rsrv_size =3D %d wqe_size =3D %= d pkt_per_resv =3D %d\n", - __func__, hd_per_wqe, resv_size, wqe_size, pkt_per_resv); + hd_per_wqe =3D (wqe_size / rsrv_size) * pkt_per_rsrv; + mlx5_core_dbg(mdev, "%s hd_per_wqe =3D %d rsrv_size =3D %d wqe_size =3D %= d pkt_per_rsrv =3D %d\n", + __func__, hd_per_wqe, rsrv_size, wqe_size, pkt_per_rsrv); return hd_per_wqe; } =20 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/params.h b/drivers/= net/ethernet/mellanox/mlx5/core/en/params.h index bd5877acc5b1..919895f64dcd 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/params.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/params.h @@ -97,10 +97,6 @@ u8 mlx5e_mpwqe_get_log_rq_size(struct mlx5_core_dev *mde= v, struct mlx5e_xsk_param *xsk); u8 mlx5e_shampo_get_log_hd_entry_size(struct mlx5_core_dev *mdev, struct mlx5e_params *params); -u8 mlx5e_shampo_get_log_rsrv_size(struct mlx5_core_dev *mdev, - struct mlx5e_params *params); -u8 mlx5e_shampo_get_log_pkt_per_rsrv(struct mlx5_core_dev *mdev, - struct mlx5e_params *params); u32 mlx5e_shampo_hd_per_wqe(struct mlx5_core_dev *mdev, struct mlx5e_params *params, struct mlx5e_rq_param *rq_param); --=20 2.31.1 From nobody Mon Oct 6 13:35:40 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2056.outbound.protection.outlook.com [40.107.223.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE79C27F006; Mon, 21 Jul 2025 07:14:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753082049; cv=fail; b=YaD01Wy9w4WijYaWjf5MeG04+nAbDpdphudtxxAoWzpguJx1k2wMNLbsb26CIWfi0HDRzs7bw9IZGcGJI9hsazerL1a35RpC/DXmb0Ti/Px9Yv+oVmfdL436AGKEJgRJows1NHcfxkoScIuBCCCNNWr2YwDgRgu39r+JWqeJJOY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753082049; c=relaxed/simple; bh=xqiFslgWNeLLxjvXiEuowlFFIr0k6O2tHtcf/QbGbNs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RPVmsYMZ98j40ulq99FS9gCfCxfy5TBuildvpchT7aOKuPgYnFXRhdwWaDpiv5nLaFjJYEgKD6qdqq/9j1QrAYDbI1AKsuGU2iJw8qnP9w5B5OD/cl4z8OGY146fLz/iLRlIa3Y/2d6/OeIOgqql60/9doSmNIcp4C2sauxxN3E= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=J2U5yvjV; arc=fail smtp.client-ip=40.107.223.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="J2U5yvjV" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JL2hrauE4Y5FHDi4RT/qU962iXqr21c/UAjzxsQAhudGs76cUsXL7+DhSzwfbUmyvp5pXRChE/k9k1uVr0wn8ihvDHNUOXlHfNYoJVYwlZjLu9gWi2nRMERkdxflW0FdEGSzfEj3ROIdo7Qxo98X2WK/yhCXIN/Syq0o7XB20EJZWw9fT3LpPJf7YBIsXuMlHXqNlEzz1s9r0hjGTsJUXlHW5Ue4qsfBQB2lCoyw21+4EtIP6b+T9yIGiOYqTCEmLSLj0PjtBtU2FeaKZBEZEDt9iLb6SEKOegon6HuTZQWtBBq+yrSKpp7Ho6yY7ro8Pxqkuw3D9EI8OPLMRo0Csw== 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=hcobcUzE6+GNbbv4jflK511moO00MeqsQ0+Kfm+7BPA=; b=IF1GZao7MMJMxWQO/U4hTSdbVGkYgk7P/GLb8yRVIZ8Rfz5pNPrOQ8MEfIzLL/mv4jx7+rQKCOpo3d4Weq2kfQyhkU6kglWjrDgLpz6nTSPV08M0l3rzOAK6kVz9GeryTc9JQQxdAO+dp14d/aXIScuKZyccMrrMW9zScItB006ZzmpqZSZR+xOHKqcnk3bRlzIns4nhSl9GwFgHhZoMLf05l3NUaAs4VvxpAD1u8vFJA6l0a57PmtQfGItwsTewvsa/A0xzgNDn7kVUCVlwJmztAKaEzuKMHBo9ljwlvr6hlo3zUJd6PiOLFIzoEcsdAEgEU4bey8bXFwKCoVbI6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=google.com 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=hcobcUzE6+GNbbv4jflK511moO00MeqsQ0+Kfm+7BPA=; b=J2U5yvjVIrEX9+IRK2TOX0Tib+pXO0pWG02kXmkIENFPSImWvhmC7qjJuMcSUE5SAG09FpdoQppWcwJ6jkgehg+QaAHFi+6Dn7OLdBNTOr4OHzZbBZl6G8IfNGnLzQKF+IQ+FkBEhAJFx84n1yRrbaeWDfKXkLIrX0l8Ms5YUvLHk+G3mYl7/OaA/gCj7Rd5vkvbv///zHnVcY+pGG+wXN5lZq0ZRccTrE8eI1encZW0r/XjGbeM0y0h6+n8YRzdOjPB68rdoChdx69iIGWy/GL/Art/w2GqywlXRPuxDXrxHvM5jEgDFfbct8ciQhi8SQNQbaUks0Zt+IM62532Qg== Received: from SJ0PR03CA0349.namprd03.prod.outlook.com (2603:10b6:a03:39c::24) by MW4PR12MB7191.namprd12.prod.outlook.com (2603:10b6:303:22d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8943.30; Mon, 21 Jul 2025 07:14:04 +0000 Received: from SJ5PEPF000001E8.namprd05.prod.outlook.com (2603:10b6:a03:39c:cafe::fd) by SJ0PR03CA0349.outlook.office365.com (2603:10b6:a03:39c::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8943.29 via Frontend Transport; Mon, 21 Jul 2025 07:14:04 +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 SJ5PEPF000001E8.mail.protection.outlook.com (10.167.242.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8964.20 via Frontend Transport; Mon, 21 Jul 2025 07:14:04 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) 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, 21 Jul 2025 00:13:44 -0700 Received: from drhqmail202.nvidia.com (10.126.190.181) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Mon, 21 Jul 2025 00:13:43 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Mon, 21 Jul 2025 00:13:40 -0700 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , , , , Lama Kayal Subject: [PATCH net-next V3 2/3] net/mlx5e: SHAMPO, Remove mlx5e_shampo_get_log_hd_entry_size() Date: Mon, 21 Jul 2025 10:13:18 +0300 Message-ID: <1753081999-326247-3-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1753081999-326247-1-git-send-email-tariqt@nvidia.com> References: <1753081999-326247-1-git-send-email-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001E8:EE_|MW4PR12MB7191:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d635e67-c097-4505-d111-08ddc8262d30 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?CIA0Y/mA+b6sMOo37kca/lwZU3CCelk9BUvgxHQmRRNGuYmjQo+bUU7isQe+?= =?us-ascii?Q?r9vMuR5mYHSnJXfoIz2QZGE00BR3HMzsA6oqiB5S2mQx5JQisLfCGgAc0WYY?= =?us-ascii?Q?K+cHaKLZdoQPpS6OWm7E0URtknNRneZvtZi5swnloz5KfQrEQo53azhvRolB?= =?us-ascii?Q?ArprgS8zLI2+dVvcHxChk5JMp09YCZVYmrD3Tpnye4ye/0Qx/CNqUYgFXuo7?= =?us-ascii?Q?4OvaMGJqLsmito1SCgvDSn0aWGSvnkN4z1KQAe0sVZRuf8GXGLt04Mg6pD10?= =?us-ascii?Q?7+hCeolxR3O7p8TgmFB0Ryi2BO3fKHZJ22JVcX8FgZu4clwBcN4afLCyvlh2?= =?us-ascii?Q?O1DZ7+oiBJ+AJ9vhv/O9lNXY0d4FyLdPu7KTpSb2gYqJkenyWKUJaD/xnmsF?= =?us-ascii?Q?1KpeV6ypJGHANLQIq0GrbltBXzcfcFqInhfJ1RkvEZiUHon8Xr5H/wF7CYyL?= =?us-ascii?Q?XRigYC+GVfKOHMxToiyqvZzhQivwraB6kWxH7Pd5Kyk5EXQHJlp7401aYvI0?= =?us-ascii?Q?8usRt/Qshf5R9kpIqGNF2YbvQkflv7Qneqo98xuJmMSJd9o4nrjfHIukMn+p?= =?us-ascii?Q?/jD5huXaUmQsiMifHU3/DGp3PYHEm3ltjKM98SgQU65v8FEkmWGIZfKM5h9O?= =?us-ascii?Q?PLGwCS9YUcb0Fn+K5wi4BqeDsKVbaesUftNQDQk2pg1pXubTlhtNwxPondAi?= =?us-ascii?Q?KkhgsbB7VwkNh/kXAiI5JdThFJvuO06ISTFlzAkDL7BkU3QVtKm/6m7HHtZs?= =?us-ascii?Q?Ydi0uFB/KoSJp+o/Uv8FLfKLDQwUj/gQV0NwlSpNQRaa6D+psQjYXKkssHCB?= =?us-ascii?Q?4aCXHGqREPesJ/szNgTJmmyKk2q5eKw8kswQ96f96d/lGjTFfFEPfsG2d7jK?= =?us-ascii?Q?oz9EfeSQZXla24rFoHKBXar5W5ePAGkXjC92ebTTpXZ6GkOJiaujc1P2fAqK?= =?us-ascii?Q?DSuQ1uxyPa1U77fXRQPm84KUkdAhEGfrr47uu8w0xGen8G/0V3OFIryP5+LQ?= =?us-ascii?Q?/PHCqjsiA3zq4BPIwCAOUyvmcsHZeMC51+XjL+S2e4siVltqFC9DL3fEamQV?= =?us-ascii?Q?3FPSrEVfSAsJXnFW64KeZfnL5Hp/7TrPItnnXyo+2awqigYSwHRF5/McRi1z?= =?us-ascii?Q?5rtHGByAgOxPFQZV+op0So+1+A0tGCeqtKlw6RphfELyKu9cUg44U1gqUjN+?= =?us-ascii?Q?iS27zIyjVzR6tndPuifYkGk1U81TiSFyer5MGo6tidpqN5EtJEZaTTZ7jdcI?= =?us-ascii?Q?p5FQ7GGMygqCb1BmzGuDJweciGLcr/NVgvrgl3pxt69PYY4WXDBP7Oixwfdk?= =?us-ascii?Q?DMY6fhdwDDb/OIm4k3UImVntIhVj+noPFdv68bTrFzD6OKg2TbLaCSmHoLl0?= =?us-ascii?Q?501cfWcgkfG+Rdw/E/rTqfi7EStHGh3ihtbcgWye3zba/aQnj5IsHR9ElgO+?= =?us-ascii?Q?nwvMWmpFcgJBvaYWBQIedLYhmDTA+aKlqua1yqAUAL94lRXAlOOTnBz8RKod?= =?us-ascii?Q?fj8U7oBwAPXin/EwTkOgl44d+qX+4xzfLZD4?= 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:(13230040)(82310400026)(376014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2025 07:14:04.8213 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8d635e67-c097-4505-d111-08ddc8262d30 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: SJ5PEPF000001E8.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7191 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lama Kayal Refactor mlx5e_shampo_get_log_hd_entry_size() as macro, for more simplicity. Signed-off-by: Lama Kayal Reviewed-by: Dragos Tatulea Signed-off-by: Tariq Toukan Reviewed-by: Michal Swiatkowski Reviewed-by: Jacob Keller --- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en/params.c | 9 ++------- drivers/net/ethernet/mellanox/mlx5/core/en/params.h | 2 -- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/eth= ernet/mellanox/mlx5/core/en.h index b25147442c92..558fad0b7e48 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h @@ -84,7 +84,7 @@ struct page_pool; #define MLX5E_SHAMPO_LOG_MAX_HEADER_ENTRY_SIZE (9) #define MLX5E_SHAMPO_WQ_HEADER_PER_PAGE (PAGE_SIZE >> MLX5E_SHAMPO_LOG_MAX= _HEADER_ENTRY_SIZE) #define MLX5E_SHAMPO_LOG_WQ_HEADER_PER_PAGE (PAGE_SHIFT - MLX5E_SHAMPO_LOG= _MAX_HEADER_ENTRY_SIZE) -#define MLX5E_SHAMPO_WQ_BASE_HEAD_ENTRY_SIZE (64) +#define MLX5E_SHAMPO_WQ_BASE_HEAD_ENTRY_SIZE_SHIFT (6) #define MLX5E_SHAMPO_WQ_RESRV_SIZE_BASE_SHIFT (12) #define MLX5E_SHAMPO_WQ_LOG_RESRV_SIZE (16) #define MLX5E_SHAMPO_WQ_RESRV_SIZE BIT(MLX5E_SHAMPO_WQ_LOG_RESRV_SIZE) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/params.c b/drivers/= net/ethernet/mellanox/mlx5/core/en/params.c index 86f6147de22b..3cca06a74cf9 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/params.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/params.c @@ -414,12 +414,6 @@ u8 mlx5e_mpwqe_get_log_rq_size(struct mlx5_core_dev *m= dev, return params->log_rq_mtu_frames - log_pkts_per_wqe; } =20 -u8 mlx5e_shampo_get_log_hd_entry_size(struct mlx5_core_dev *mdev, - struct mlx5e_params *params) -{ - return order_base_2(DIV_ROUND_UP(MLX5E_RX_MAX_HEAD, MLX5E_SHAMPO_WQ_BASE_= HEAD_ENTRY_SIZE)); -} - static u8 mlx5e_shampo_get_log_pkt_per_rsrv(struct mlx5e_params *params) { return order_base_2(DIV_ROUND_UP(MLX5E_SHAMPO_WQ_RESRV_SIZE, @@ -928,7 +922,8 @@ int mlx5e_build_rq_param(struct mlx5_core_dev *mdev, log_max_num_of_packets_per_reservation, mlx5e_shampo_get_log_pkt_per_rsrv(params)); MLX5_SET(wq, wq, log_headers_entry_size, - mlx5e_shampo_get_log_hd_entry_size(mdev, params)); + MLX5E_SHAMPO_LOG_HEADER_ENTRY_SIZE - + MLX5E_SHAMPO_WQ_BASE_HEAD_ENTRY_SIZE_SHIFT); lro_timeout =3D mlx5e_choose_lro_timeout(mdev, MLX5E_DEFAULT_SHAMPO_TIMEOUT); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/params.h b/drivers/= net/ethernet/mellanox/mlx5/core/en/params.h index 919895f64dcd..488ccdbc1e2c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/params.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/params.h @@ -95,8 +95,6 @@ bool mlx5e_rx_mpwqe_is_linear_skb(struct mlx5_core_dev *m= dev, u8 mlx5e_mpwqe_get_log_rq_size(struct mlx5_core_dev *mdev, struct mlx5e_params *params, struct mlx5e_xsk_param *xsk); -u8 mlx5e_shampo_get_log_hd_entry_size(struct mlx5_core_dev *mdev, - struct mlx5e_params *params); u32 mlx5e_shampo_hd_per_wqe(struct mlx5_core_dev *mdev, struct mlx5e_params *params, struct mlx5e_rq_param *rq_param); --=20 2.31.1 From nobody Mon Oct 6 13:35:40 2025 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2063.outbound.protection.outlook.com [40.107.96.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBD67285074; Mon, 21 Jul 2025 07:14:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.96.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753082056; cv=fail; b=jbsE0i9a2xu9f8fF65jkW0KUb24z5Wm9AGTpVac4ryFh7oUK6rp3PE0FN9Q0lSmAU5gyrwMeknL0gevb7o+z2l+xfRS8nLPVIsxG9lqGfQj8zdsLdgpqfbTvSJvGOC3Z+CD1Mx0QzC0HcC5GlVrUwdylxh7rAdvBk5kcvSjveuE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753082056; c=relaxed/simple; bh=y+fg1y0das10cLYBK5O5glzaw9FxMcNRaKxk3g9cxEY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pBQPzN4DxKBYeSEhTJPW37/eFc2oOOd5ZIOIGTfjG0g0tvz1VZ7yrjK1ICOWDWOwN1omdFnWxpqWU9jjFqCWFygMJbk1mwGK95bg6fJoGw6WC7RM77Qx0EEUupziyWKcYJxLlJ9UYj9TFmASZHjGsen6f50d4IQoPcSfKVwYaeM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=KwRpUkeg; arc=fail smtp.client-ip=40.107.96.63 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="KwRpUkeg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pJsOWJ7bmZWRelNWFRQfOuG89HGOhukoOrqODJVzRiAytzMc4ub46/vrek2gQgpazprim9T4Jec9pC7E6cOxykLDOabhHvWsuBSwp/x31XOta2IvgDtB8JAFpagAkHseV6ZRqTMVSZqV3TPtqRFEbrQcNsq7UzW1rPxl1TMQFNZ5gtUMZhOn4cXe1oWPfXDLKPLyVZJ64kABYQsB4xnWvGO8Yee2bxB0clO3N1JPTH8QqkI83ozypW86b8kBD6qRMGO68vGZJQYBUzLSta4L9++b6jXwI76UsSqoLFCguROGX2pcKPDTxnGqcJBXO0iPlozuf4vPZfvMJ1Yc3hL6ig== 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=tmajpKoJ1UUd5OWXy2jrzgfuvbsdGiLlwEDCzV/ESGI=; b=xP33SJfYtS5sBKFyzhjiwXtj0OMTSJnRcSquH4NNbvKh4Cy5QwS7lMNSRlSaaG2cJEnKvSu6Ko43yA/9ex9IPjsS1bYZD1ik1BqUsFUa5EtU+eE0ukmeLdggV38ynt2g8ZyOy6OllqC0qR+BIotIr/NV/t4/SAfpAQVqSByVtoZdUxfT8Gtu2u5vCTPYLN5sb4ADenxEA/uPc05CcCsFu4zk7hL/+CjJaLx/YuT7oHOhtFN0rDW09c33Zvl6jNxGsq1OwpTmd+RYiyxI4P/v1jz13+QmpCruXnY27/9LyhdF1FFvsWcBTRKu5dEBCRTAa3uTWXHCHypeJRONatlYig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=google.com 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=tmajpKoJ1UUd5OWXy2jrzgfuvbsdGiLlwEDCzV/ESGI=; b=KwRpUkegWf3f2QX2aLUZ6LRxFCsqFCK8+wcGq3p0h1CyK4z5umig1AOfBGK2c/NSKWaRJsDxJnLtZaFZMgzPSalL29CUVCIFepNU2wFO0jwqcVCtBg1B/AWcqc3iSX8GKP/kIs19gfWmrwJupMzJwM1BabtKGtD94pI3QySjVzk9LX3aOXdpbFTZpiEb93bEt2gVIaT8cj3I9neeVBWLGfvGTltc5LDqpX1HdsJ/UvsGfkxmpfcCAMaC7n4FWbTGhyVcBO/SLMLSpqfmo/Ypb2X5+9yPCQekHImGgZl0GWRWivHAUxLgjm5aFXkyU8wQXcFwLVRjIdafdTloWa7SYw== Received: from SJ0PR03CA0346.namprd03.prod.outlook.com (2603:10b6:a03:39c::21) by SJ0PR12MB8166.namprd12.prod.outlook.com (2603:10b6:a03:4e2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.39; Mon, 21 Jul 2025 07:14:07 +0000 Received: from SJ5PEPF000001E8.namprd05.prod.outlook.com (2603:10b6:a03:39c:cafe::97) by SJ0PR03CA0346.outlook.office365.com (2603:10b6:a03:39c::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8943.29 via Frontend Transport; Mon, 21 Jul 2025 07:14:07 +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 SJ5PEPF000001E8.mail.protection.outlook.com (10.167.242.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8964.20 via Frontend Transport; Mon, 21 Jul 2025 07:14:07 +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, 21 Jul 2025 00:13:47 -0700 Received: from drhqmail202.nvidia.com (10.126.190.181) 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.14; Mon, 21 Jul 2025 00:13:47 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Mon, 21 Jul 2025 00:13:44 -0700 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Mark Bloch , , , , Lama Kayal Subject: [PATCH net-next V3 3/3] net/mlx5e: Remove duplicate mkey from SHAMPO header Date: Mon, 21 Jul 2025 10:13:19 +0300 Message-ID: <1753081999-326247-4-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1753081999-326247-1-git-send-email-tariqt@nvidia.com> References: <1753081999-326247-1-git-send-email-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001E8:EE_|SJ0PR12MB8166:EE_ X-MS-Office365-Filtering-Correlation-Id: 12f0915f-2e4a-4381-19ce-08ddc8262eca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?I4TlR+L392i8Wvj6bRJmlAcBrqe8/GZ7v0vn/04hS7ALkKpfEy10XnPUcV35?= =?us-ascii?Q?ltbN9s+u/y44X3dNVmzUAedNnoZTu09bUsAiEpZQlFe9HpV6SMTGaBTPWt7t?= =?us-ascii?Q?IQ+npM90tcRz5DhYvAik02VoyRan1KJRceJ8wNpV2uT+mj/p3oq6dC263VKR?= =?us-ascii?Q?CTvrA/ap4ZBUIw8CuRQ8Hnu+G6kNbgW6Vu0NbXprKYLDIZtFwisraRm36HbC?= =?us-ascii?Q?DMZILJoudtvtbalxdNfZZwN9S7zmBUbL9A6ELspnLZNeOJgWdvzSbWm+Msad?= =?us-ascii?Q?wCXlDbdAgUzvwDHT1yxqs/1KwTCOjV4n68bTbPumT2t7AcG+VgzfQK9VQrgV?= =?us-ascii?Q?LjuT3hH+FDfN63TOMZ7B278LhQfqLrDs4SGj6MrCxWiiUytkz/IIGkcojtjM?= =?us-ascii?Q?wzqEPTjFgcwQJPUrGVKUTqF14UbLkYNGD05LASW/WA+ebjrM3rzeiXry/xHm?= =?us-ascii?Q?Yd43oUryyN+sB1PQlIgeVF39FacFs64mrbPktXj4BRcR1k/pK5aITvKRW3DX?= =?us-ascii?Q?s5FuawFv79ODGsZtE4OhA15FeEGrFiVHs0oq5fdfR/Qj63OondfZxSB2RgyD?= =?us-ascii?Q?twQo0VnU2gysDSQtuFTQznuQqAi5xLFRWctNNeLPiROB3j0RJ/3oTfqfVhLQ?= =?us-ascii?Q?W2gmPll1h7nvV7AQ2P3gBoln8tptcUh2vHYW5LOId3uB8+K5+5qarPNTSsCQ?= =?us-ascii?Q?dl8CCEXL00a8TdxcK8SzMJcFmjPPnksHnhV8HssmwNAdMXTOrWFCOFHJunLE?= =?us-ascii?Q?jHAAsuFcFj3RzLOs7BGhvKbSU5OPfpD2LN3eZ+I+ZMQoQ8G0odcGyTbfYoDC?= =?us-ascii?Q?RoXyfzV7E7jtH/v3zz31l2qprz/+MlxeKcTH4o22KX4sGqipwdCvtS7vbOaM?= =?us-ascii?Q?Ns8+ZX0gZH7fiFV9oii+42v380jBk2UsG7M6ecdRj8+KMB9Cku+vd7liuGPJ?= =?us-ascii?Q?+D7rsRf7eNU9VSJp6O8f47MF/2M84rVC9PKNuFR9O9ZaWXXbHHgNLFVz5/3s?= =?us-ascii?Q?HQfO0KiijC4YhDtpKYwqimuiWry59epiofCu0pO56NnW/84UD8KrFQfn3bi2?= =?us-ascii?Q?ijt9HJfy9Xu5TFezR6pd6fp3Fsexm76qdnh6NVtLz4oiI5m8UOwYvS9TmSuH?= =?us-ascii?Q?FmQC2lB3zDTw3wGGfptUN1UDxfRGk9Ox06302SGHPR71iyvTmRXth7T+b2Uf?= =?us-ascii?Q?+O53jLpIrYfvOCmGcJlIMZnBzpK6T8LGkfICGbAqndy6bewo6+0/MqHgV523?= =?us-ascii?Q?1nzDZYglYc3oWjvXiYK+cAQNRNRmYnVz/hZvVLVyzgwP8oElXFFtEu8ak/DY?= =?us-ascii?Q?vttBiRG4LsUNrG1cwrP4c/7EuqcsrmzW2KZhO34HwZyzsL2n5Nkwna12JTkc?= =?us-ascii?Q?6+9FKDd+/aQO1VNKerdom7n+n0oeiCTWeGIoscVuCGQyXUIPcTbXUxVP8SSt?= =?us-ascii?Q?szC0KQYTnIAMWAw5DEWYham3fkuRN8+dTmOVu15pD/ovyfCNe6ZkmFzilpIC?= =?us-ascii?Q?xZZNw7CamqShoPEUqs7i6ZkEnNTgEf8ACpK0?= 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:(13230040)(82310400026)(36860700013)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2025 07:14:07.5117 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 12f0915f-2e4a-4381-19ce-08ddc8262eca 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: SJ5PEPF000001E8.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB8166 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lama Kayal SHAMPO structure holds two variations of the mkey, which is unnecessary, a duplication that's repeated per rq. Remove duplicate mkey information and keep only one version, the one used in the fast path, rename field to reflect field type clearly. Signed-off-by: Lama Kayal Reviewed-by: Dragos Tatulea Signed-off-by: Tariq Toukan Reviewed-by: Michal Swiatkowski Reviewed-by: Jacob Keller --- drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +-- .../net/ethernet/mellanox/mlx5/core/en_main.c | 27 ++++++++++++------- .../net/ethernet/mellanox/mlx5/core/en_rx.c | 2 +- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/eth= ernet/mellanox/mlx5/core/en.h index 558fad0b7e48..99295eaf2f02 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h @@ -630,14 +630,13 @@ struct mlx5e_dma_info { }; =20 struct mlx5e_shampo_hd { - u32 mkey; struct mlx5e_frag_page *pages; u32 hd_per_wq; u16 hd_per_wqe; unsigned long *bitmap; u16 pi; u16 ci; - __be32 key; + __be32 mkey_be; }; =20 struct mlx5e_hw_gro_data { diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/ne= t/ethernet/mellanox/mlx5/core/en_main.c index bd481f3384d0..33bdb7f1e03f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -546,18 +546,26 @@ static int mlx5e_create_rq_umr_mkey(struct mlx5_core_= dev *mdev, struct mlx5e_rq } =20 static int mlx5e_create_rq_hd_umr_mkey(struct mlx5_core_dev *mdev, - u16 hd_per_wq, u32 *umr_mkey) + u16 hd_per_wq, __be32 *umr_mkey) { u32 max_ksm_size =3D BIT(MLX5_CAP_GEN(mdev, log_max_klm_list_size)); + u32 mkey; + int err; =20 if (max_ksm_size < hd_per_wq) { mlx5_core_err(mdev, "max ksm list size 0x%x is smaller than shampo heade= r buffer list size 0x%x\n", max_ksm_size, hd_per_wq); return -EINVAL; } - return mlx5e_create_umr_ksm_mkey(mdev, hd_per_wq, - MLX5E_SHAMPO_LOG_HEADER_ENTRY_SIZE, - umr_mkey); + + err =3D mlx5e_create_umr_ksm_mkey(mdev, hd_per_wq, + MLX5E_SHAMPO_LOG_HEADER_ENTRY_SIZE, + &mkey); + if (err) + return err; + + *umr_mkey =3D cpu_to_be32(mkey); + return 0; } =20 static void mlx5e_init_frags_partition(struct mlx5e_rq *rq) @@ -783,11 +791,10 @@ static int mlx5_rq_shampo_alloc(struct mlx5_core_dev = *mdev, goto err_shampo_hd_info_alloc; =20 err =3D mlx5e_create_rq_hd_umr_mkey(mdev, hd_per_wq, - &rq->mpwqe.shampo->mkey); + &rq->mpwqe.shampo->mkey_be); if (err) goto err_umr_mkey; =20 - rq->mpwqe.shampo->key =3D cpu_to_be32(rq->mpwqe.shampo->mkey); rq->mpwqe.shampo->hd_per_wqe =3D mlx5e_shampo_hd_per_wqe(mdev, params, rqp); wq_size =3D BIT(MLX5_GET(wq, wqc, log_wq_sz)); @@ -832,7 +839,7 @@ static int mlx5_rq_shampo_alloc(struct mlx5_core_dev *m= dev, err_hw_gro_data: page_pool_destroy(rq->hd_page_pool); err_hds_page_pool: - mlx5_core_destroy_mkey(mdev, rq->mpwqe.shampo->mkey); + mlx5_core_destroy_mkey(mdev, be32_to_cpu(rq->mpwqe.shampo->mkey_be)); err_umr_mkey: mlx5e_rq_shampo_hd_info_free(rq); err_shampo_hd_info_alloc: @@ -849,7 +856,8 @@ static void mlx5e_rq_free_shampo(struct mlx5e_rq *rq) if (rq->hd_page_pool !=3D rq->page_pool) page_pool_destroy(rq->hd_page_pool); mlx5e_rq_shampo_hd_info_free(rq); - mlx5_core_destroy_mkey(rq->mdev, rq->mpwqe.shampo->mkey); + mlx5_core_destroy_mkey(rq->mdev, + be32_to_cpu(rq->mpwqe.shampo->mkey_be)); kvfree(rq->mpwqe.shampo); } =20 @@ -1122,7 +1130,8 @@ int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e= _rq_param *param, u16 q_cou if (test_bit(MLX5E_RQ_STATE_SHAMPO, &rq->state)) { MLX5_SET(wq, wq, log_headers_buffer_entry_num, order_base_2(rq->mpwqe.shampo->hd_per_wq)); - MLX5_SET(wq, wq, headers_mkey, rq->mpwqe.shampo->mkey); + MLX5_SET(wq, wq, headers_mkey, + be32_to_cpu(rq->mpwqe.shampo->mkey_be)); } =20 mlx5_fill_page_frag_array(&rq->wq_ctrl.buf, diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/= ethernet/mellanox/mlx5/core/en_rx.c index a4896e89fa35..218b1a09534c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c @@ -676,7 +676,7 @@ static int mlx5e_build_shampo_hd_umr(struct mlx5e_rq *r= q, wqe_bbs =3D MLX5E_KSM_UMR_WQEBBS(ksm_entries); pi =3D mlx5e_icosq_get_next_pi(sq, wqe_bbs); umr_wqe =3D mlx5_wq_cyc_get_wqe(&sq->wq, pi); - build_ksm_umr(sq, umr_wqe, shampo->key, index, ksm_entries); + build_ksm_umr(sq, umr_wqe, shampo->mkey_be, index, ksm_entries); =20 WARN_ON_ONCE(ksm_entries & (MLX5E_SHAMPO_WQ_HEADER_PER_PAGE - 1)); while (i < ksm_entries) { --=20 2.31.1