From nobody Tue Oct 7 05:42:06 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2077.outbound.protection.outlook.com [40.107.93.77]) (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 F31A41FF7DC; Mon, 14 Jul 2025 05:40:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752471657; cv=fail; b=jTkZ1BxHdiCW03cVSKMYoqNNcYmnqN1XLTIm2tFmCyV4IhjSF3XPaX36+sb+D4oKwtgPKeC6RLVXj0bDN+I3qniFogk6kW9ig2E7dianKueEs4q1tqJ4yO1HyJ2szL2SrKT3MfwWFXfSOAFMpB+d2KRBQCLbDkRqunLOLDn3ss4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752471657; c=relaxed/simple; bh=t8vNTWn2jEOYIBvuGdNzJRzSJOD2hFSQA3kLk0y8liY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jqG+UtI6AU8ToIjSJgna8ZEC3WayAezFIQvgNKx8bfBfoA1wdxaE5w1SbpF5gso3rEdC5/3SS7eWEf6wyn5H3QS8h6pY3+cy1fNPn2j6Vj3npnGvOoJa5Dy9VE4LmIBuY6OOJj0WW02N4IRqElwyLVLglvN50qlC4QCY9mTp7XI= 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=upUJsOue; arc=fail smtp.client-ip=40.107.93.77 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="upUJsOue" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bt1/PREBUFtiJzWiTHdRpgVQfzBCDfOCrayU0JRL5fTwIcB09B5mCqGRowrsroyNzii3jgzAPGBdOIpvhha59QaK6cptWZ59mMUZHy75w4stUhDeQjxraSWniPBBbhRgoNyEzlUt5gDOlG86ZCZvrtpDNnfR0zDoBBGhqQy5uVs+gTdVQww/4ORoGoDTvkJezLUetsMpTo7js4L/gjstS8onOueDEx5W8NjTWji+bZqpYR/fw9WDtWNJCBmxbhce7VUKjjfjiYC99DJFHzLOpkIAGh+TcjaCPZ3rg8uEK8WbaCpO9aQdCVY/OLPRm/FIWXSkco3XY2mi/MuA+56TTg== 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=bphQAq++bBw3pqlOnkWeHb8OPwUV5ZIyWbPkJlEIDZU=; b=hD4rILe07h7WGB/uHCQ2SiLD6C7EZeNY3UhSGszH/e/6fDTl5HUQLuvZeA7R/gzqlBUSH74gDGvb0zRM1yAjwKJXxJzamI/zO9wVMyTCsOsB+T//s/oYN0DlzpQFlWdKS2sWgEcdvrynoGUJVa37XigUssVBBb1kV/RsKWrIjzG02GuhG37mfMKx0QJfwTEsnz+oLo3R9SLScly0GHInY7TNGP1o9g10fFFSh58qXevDAoXY4WghGq0dResg0m9qzI7j+66cXerleGIVSRfJG2aHoO6jEslJCaMmpVmBOVnclCLpGMvHFJeu74ia0W0NPxjNmsIh2/r7rMEUx9agxQ== 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=bphQAq++bBw3pqlOnkWeHb8OPwUV5ZIyWbPkJlEIDZU=; b=upUJsOuemYY97slTgg0ayIkY/MA9CiuqBrVdgC4vXIowqTWoGrJOpxhQ02qj43xK8R49zSxQpveLYzUkBQH85byB+zEpnA3DxsJw4yitFrGWZ9/l96tahn2OnvMlM6VLW8DKA6LUOcKn2zMs17/C7ov0xYXwxoqoVqSn1//paiScV89ubGws4hiMVhYC8QA5WcZz4B2Nqb8RqJjcWkGxjjlMdPZIJAuKT/Cg83Is7S0lFyZI5Frx+UsGmbh29AOhz49cXNNwhY+VHP172WInXLHUMtC2lQ6QddIpmbOudb3W64zOw88RmTipoXgI1P2v3Uy+zV6uoytPaOdRqHaKsQ== Received: from SJ0PR13CA0192.namprd13.prod.outlook.com (2603:10b6:a03:2c3::17) by DS0PR12MB9421.namprd12.prod.outlook.com (2603:10b6:8:1a1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.35; Mon, 14 Jul 2025 05:40:52 +0000 Received: from SJ1PEPF00001CEB.namprd03.prod.outlook.com (2603:10b6:a03:2c3:cafe::bf) by SJ0PR13CA0192.outlook.office365.com (2603:10b6:a03:2c3::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8943.14 via Frontend Transport; Mon, 14 Jul 2025 05:40:52 +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 SJ1PEPF00001CEB.mail.protection.outlook.com (10.167.242.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Mon, 14 Jul 2025 05:40:51 +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; Sun, 13 Jul 2025 22:40:40 -0700 Received: from drhqmail203.nvidia.com (10.126.190.182) 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; Sun, 13 Jul 2025 22:40:39 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sun, 13 Jul 2025 22:40:36 -0700 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Gal Pressman , "Leon Romanovsky" , Saeed Mahameed , "Tariq Toukan" , Mark Bloch , , , , Lama Kayal Subject: [PATCH net-next 1/6] net/mlx5: HWS, Enable IPSec hardware offload in legacy mode Date: Mon, 14 Jul 2025 08:39:40 +0300 Message-ID: <1752471585-18053-2-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1752471585-18053-1-git-send-email-tariqt@nvidia.com> References: <1752471585-18053-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: SJ1PEPF00001CEB:EE_|DS0PR12MB9421:EE_ X-MS-Office365-Filtering-Correlation-Id: 34cb871a-b740-417a-63d9-08ddc298feb4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?naglqXFJ0skMyrrCtJKaBooRrO51ms92dIcQnG9yPc5MPJUHfaynzj8nUzf7?= =?us-ascii?Q?bznTWXZ/lWJctWxKijSa1DP311Y72HGbc3q4OYElMPAyDniTqU/amWc/jmNE?= =?us-ascii?Q?SUAAVvxG//YWiH6sMpgbo5cD8RRGCLLeRAxEfiImE1rhWyD+bNp+bHBW9N6h?= =?us-ascii?Q?VNAremyryh/iaV/jSPoa7cFUTMiHDpNko8BkYfQb9FxjPazzM9wK0IjxFdms?= =?us-ascii?Q?2gGLAXfVmg75SCNx1tPBYoa3WfoWOuWwrq29LpM3lhcTItbF1FHNPGwim9/A?= =?us-ascii?Q?L86PGKEdt6REjuXLLdNTcrRgREXWzz9k8T96ItK+vgPTGKegxOsdHsDDeiFo?= =?us-ascii?Q?9hA0DHq8mso0l/cF10nOsD2SRWgL+1nI/IO3WJAqq2xSp2bFhnPUy1QvHUhj?= =?us-ascii?Q?rIPJiTWnhjd8gzJLrrZVdmoiDDbrJrycMi5hqvVn6+ODCBHXMuO2slVUZIC3?= =?us-ascii?Q?6Qq1m+wXkLgjpbk9kIznSoxUj9PdbXzj9AG8lAmJgBGC4K3UbKW+DdH3KC2+?= =?us-ascii?Q?RLvEuI7SoILAm4zVU0ZHkLJKib72Edj0cOmQhAV/NA9UvV72PxQJRA5slujm?= =?us-ascii?Q?wuAUGlAZeV/YCJJh94f0yzEhmkx+A8spVo8zWADhxxwPvxTl4ICh7KrC75RQ?= =?us-ascii?Q?h2KJ672H5ow0tsbK/BF5J0TJ7ug4SXOgYlhIpX1FEQ9eKyt6XSaXZJHx8+jC?= =?us-ascii?Q?n6YTQDew9Rj2LGH9FPZaKilncURd0rdRyOMo3HVapBZRk1x8N8wYCEenruwk?= =?us-ascii?Q?0FZSc7SnQZyHbBkTXRw0E5+jJM5kKDnszmKIYr+adz8FMDwibT7u+R/UeS4M?= =?us-ascii?Q?yjkmiTm/ngYnuiLgzRhirBTmKn2fpAbJmQTmHTlaRpRw5y3FJydjwDuNSplh?= =?us-ascii?Q?2H3MGcrUZCXloF3vF14jPCoTKFUudlRRuPqOaqD8vDXhNmf3/uzuVXMQi1z+?= =?us-ascii?Q?TETg0RE2IQ/sE+FqABkrzxDzkOkIoUTkrHJCdVn0ozbSpumfveayGShz+8ef?= =?us-ascii?Q?FDb53RdDKwfZk2KKVmsyAXS+u8GpimhunuwwD6+TuG6ZdN/m6DnQjIky6ecM?= =?us-ascii?Q?po9ceAONkr/NBTSXHpY+e8bVg0wUFQo12wa3Jiph5Bff5mc7KLFpRoUYuOmK?= =?us-ascii?Q?5lBn68pXPqD8PbGz8bsDhYA2yMQ5YTFGqLLXHV8oK1E57bnnKlSdrB4oggsr?= =?us-ascii?Q?dc5IREFyYHTxq2KR8L2SRP0F6hYvnaypVtYohN9QJavFySa7VYrQwG0wyUl4?= =?us-ascii?Q?RgaPX3Di+AuUUs3glj2VbfRuZaWGNPQ7qj+UEUKd25zS23EH615ZehUlY75V?= =?us-ascii?Q?tUAERxOY9+pgmnBmr+2VyOKAJtxUDNLZrlPRGyQC97hW3/cUNfup26NRXiZz?= =?us-ascii?Q?+lKeoThIJiHjeIxk9LsXXpq5PeYqGFqRCBlXPDl8BnaHzXNvSqsKaRbmkOLE?= =?us-ascii?Q?+UEIvF93GddSsNisGpRM6O+bPuQAV9MtwDdWurva5/wtOlXhBTw8gMY/GhZV?= =?us-ascii?Q?yRsLM8qGYovOKoCgFzfGGBBfrwqFp8+qOJdX?= 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)(82310400026)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2025 05:40:51.9985 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 34cb871a-b740-417a-63d9-08ddc298feb4 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: SJ1PEPF00001CEB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9421 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lama Kayal IPSec hardware offload in legacy mode should not be affected by the steering mode, hence it should also work properly with hmfs mode. Remove steering mode validation when calculating the cap for packet offload, this will also enable the missing cap MLX5_IPSEC_CAP_PRIO needed for crypto offload. Signed-off-by: Lama Kayal Reviewed-by: Jianbo Liu Signed-off-by: Tariq Toukan Reviewed-by: Michal Swiatkowski --- .../net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload= .c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c index 820debf3fbbf..ef7322d381af 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c @@ -42,8 +42,7 @@ u32 mlx5_ipsec_device_caps(struct mlx5_core_dev *mdev) =20 if (MLX5_CAP_IPSEC(mdev, ipsec_full_offload) && (mdev->priv.steering->mode =3D=3D MLX5_FLOW_STEERING_MODE_DMFS || - (mdev->priv.steering->mode =3D=3D MLX5_FLOW_STEERING_MODE_SMFS && - is_mdev_legacy_mode(mdev)))) { + is_mdev_legacy_mode(mdev))) { if (MLX5_CAP_FLOWTABLE_NIC_TX(mdev, reformat_add_esp_trasport) && MLX5_CAP_FLOWTABLE_NIC_RX(mdev, --=20 2.40.1 From nobody Tue Oct 7 05:42:06 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2083.outbound.protection.outlook.com [40.107.220.83]) (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 3300121772A; Mon, 14 Jul 2025 05:40:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752471660; cv=fail; b=CF55wioLm8p40OmG2zNdMVAkKrqK2hfwVI+LZwURebY9QFNzP1JWb8J6xopOMOApoHAKsaIxLVwjEaTnhAxkRTplAoas218sThj4vWw2sBIOjTt2EMVZ/mZ++9UgFHo8ijie0YNMDFk3EghUpQ0+ZSXv6v8rKC8gFPGXfuVh3oE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752471660; c=relaxed/simple; bh=O1w5KrRmEDOj7c6oMi9IgWX7HiC9NXsRT4m1jEM3E4Y=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bZ6hk90W8IkJAEKftMZEBpA9sSk8Rs9UsuZV70lKja/iANuVr9aQajfWcHajvb/oAPRG8VGq0tgM3bxP8gO5iy86NEqakD+UzCzf8PAFEghiIc1X+7OygYQPdPojl3M8E4da6o5qAnyuGm018UEGZJuvWcFKh0I65Falm8rvy9s= 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=PWKiyzT4; arc=fail smtp.client-ip=40.107.220.83 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="PWKiyzT4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Eb9pIbAQl8aBbLzWM3KD290uEs1QIw37nPSqLHmCzKrT3fbDBaqwKAZaPClQbgJS/3YbLVtf/fPHMp+f79b9BPRzTwE8CR7LLSciji7Jdgt2tpFAZSqGuNcObzBYm5WaUfj33zSYGXcNionR8/9g7GsYmGAhvDfoa+pEYH3fzH+iVqvU7BA/NlNXIDxPtx3l87qzXp4GnAMC/9gUsF18jBJVm0QGXc7ID7weFhBPVk5gJmbWeHfiOpkJr3Kq2BI9J1xHSEUAFZbTP2syHAHGGeVwXqtiPRgbrPtcYt4eg6uAr2eABATIJt51DaL9vcIr0brSPu9WOcNwnAlibcZlag== 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=4Q7jpgijUmqA6dVXeirqsOF9Kb/nGT2V4x9EafWyzkY=; b=fW6zTh8Qmvn58mksW58uBqWEY7oQmzIAIpFv1yvWomPyXZ5YKT7FlkftGZ079NkR7uykMRe44/h45PhesTtbjnSKUl6gUS198+/dBk0VivBWwDvkULObEUITOCSCrFqs0bby4p3fUeEDmpGLmJtLtSzRml2imV+SAgoszzZmqb4i9rZvLhzlaryXlR0OSJ4dvMl6qXhzE9wLHv+RHddqjCs1IkhqnziMhwr937jTMF0k+VYhNGcieVe8+5LIu/pcg4nc1cFi/2xciOtkcC/PL2tDhtNzUNgcjz+NXC7dR5td4jFkrutSej3S8y6nocRJJ8IALtg1f4AOQIUe7QhoPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=4Q7jpgijUmqA6dVXeirqsOF9Kb/nGT2V4x9EafWyzkY=; b=PWKiyzT4CLjzKpULAfwHU2Pwc4jAZfTVItbS/BThG98lVEmQk35yL0yYYvobJxLvn7SGtZz9fmKAbDZtWwGXiIsdbB4VyRDLM0sZZkbLosoQENgfFzVvHgfDhv9V8JTi+Ep9JHtAgi1TFZHqKhcVY7vx0Y6z83EbasI8yV+MK2/5Z5bNP9Qw1S4ocB6RvlvW/lIJyLeFfj20Y2/PYVZ+EABakRm3BqW/JDYC0Kdxn9dwmnodU/uovFuV/3ItOnBeKkTyUBp4svRsLQNTS4Mxk6ivkmz8e6/7aSwBRRp5v1iR9Oh2/0ELkXffqHyv3L+7XmZRE/ksmSg307GS1FNeQA== Received: from CH0PR03CA0428.namprd03.prod.outlook.com (2603:10b6:610:10e::23) by SN7PR12MB7936.namprd12.prod.outlook.com (2603:10b6:806:347::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.27; Mon, 14 Jul 2025 05:40:56 +0000 Received: from CH1PEPF0000AD75.namprd04.prod.outlook.com (2603:10b6:610:10e:cafe::a3) by CH0PR03CA0428.outlook.office365.com (2603:10b6:610:10e::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.32 via Frontend Transport; Mon, 14 Jul 2025 05:40:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by CH1PEPF0000AD75.mail.protection.outlook.com (10.167.244.54) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Mon, 14 Jul 2025 05:40:55 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 13 Jul 2025 22:40:44 -0700 Received: from drhqmail203.nvidia.com (10.126.190.182) 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; Sun, 13 Jul 2025 22:40:43 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sun, 13 Jul 2025 22:40:40 -0700 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Gal Pressman , "Leon Romanovsky" , Saeed Mahameed , "Tariq Toukan" , Mark Bloch , , , , Moshe Shemesh Subject: [PATCH net-next 2/6] net/mlx5e: fix kdoc warning on eswitch.h Date: Mon, 14 Jul 2025 08:39:41 +0300 Message-ID: <1752471585-18053-3-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1752471585-18053-1-git-send-email-tariqt@nvidia.com> References: <1752471585-18053-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: CH1PEPF0000AD75:EE_|SN7PR12MB7936:EE_ X-MS-Office365-Filtering-Correlation-Id: 02551c7e-4342-4899-5b5e-08ddc2990113 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uB7VFJ7pvdlhrZJOof6H1KBYGAREgPIV26Dx2761R7ABw9GDVjLXW1a5aM/c?= =?us-ascii?Q?VcUsmyM2b5+qJRJoYAjL8WQmUsLLkP1LKP9lrzvQGNb8KwsLyO10f4zBziZu?= =?us-ascii?Q?OmFTBNi5JGSv+l3qUU6Uz4KMzyv7O54TEooE0wBOVAtTlLJet7mQyf4mpeH5?= =?us-ascii?Q?N7xjeDYLPsIJ1DwmE3PvxfHH7FqBMm8/Tst8WlqXZ9liEUgNUEuqmTSOR4j1?= =?us-ascii?Q?XTCZ89n3spThpIEjLH5Z8PePjxNt9+k8AprhG04PZMP5x3Rsgr5jVHnIny3w?= =?us-ascii?Q?iKh17RHUpJbYXj34W52ymKcCxA9A1E9GHFaXOjXJMOwqjUBHozg1z+nlTkwf?= =?us-ascii?Q?hpYGQgI0YDjp32dm2CdNKxNeuMDyRgCYmJhDD9zLRUO29cjsj5YibeGh/w6l?= =?us-ascii?Q?S6xCCOP3VUNLmddSWxmgWLL+K5zM61LpEIDMiXOLYrBXUakcrGuAuIhLhGqG?= =?us-ascii?Q?WZNJOTC9rl4S1wKVzO0i2vnJYtUZx2D1fk8tlnzK5No2z6WtVF1CX0F9XBFW?= =?us-ascii?Q?acHz1248aYAui43QfPYcaReY0K6qcrY1XM5fNS93SCC7QxdyKRUMfVhwoeAk?= =?us-ascii?Q?KZNpGS8cUoXcF3ZttesiKo38EsATgB0P3SuVlHTUc/0p0abJElDPrMD48CVt?= =?us-ascii?Q?R6T+HDewwa5lRKR8NcQ/stnZBjzAxNVOpH/qzcHXMONsiuA9616wKXRlugIu?= =?us-ascii?Q?hvGvd2YU1bDP0CxfwdnalyMCV/RXzbasOZDQxZCFZK4VmS24ckmFeU223fq5?= =?us-ascii?Q?nYKd7huqAAPnMOhARVCjQ8qWP/mwijejbViHtge8btYDrhLDzS8ILLEq00g6?= =?us-ascii?Q?lS7gBaFjsWwdWyTJdj5HZoK2CYhf5BlK3Mx3W6oFDUCZ0mx+vKgy5VA05fsx?= =?us-ascii?Q?Bu8FTm7blk474voyhmvVnjpTvnao5tLOBMXlPalB0BxJqtcrNVpvC4aOnPBK?= =?us-ascii?Q?C741Y5Q7fs5ZG1V5LpSJv24vIEYb8DJ6ccmNDbkwfqeXzfLzIcCeR1X/FbvA?= =?us-ascii?Q?E+PdGnuxElmfTDp/OrXid1ljBxTRg6scUVHn6wmnOaG07BLrvSfKzGYFYNwZ?= =?us-ascii?Q?dVxI7SNMFxqkGz866B1EdTGWyIv4QU5y+jzh9ToKlz0gS++horskYBxzAW2n?= =?us-ascii?Q?RyZusmVldbefZxA0M3k4SUEvn2dR+5eS2CCxpVP+3nu9cxc71jlhuzp0D8fY?= =?us-ascii?Q?nUWVEk1A0UXlIPJuSFdTMhpb5aQFC8+SUG4K1wkEoUeMjKuxfIEo6FGOEOan?= =?us-ascii?Q?29Zzti9Hnk4aX3zTvgLJ5iw5zzqcd6QTL2msnd7SDw/IeUHC0nsjseRLG2ow?= =?us-ascii?Q?VUsX/OKxfv+yvg5mlN4J90Z3sO88eeSXt6/9FCH9yPv0N3wdFaZ4Oe8eBtOo?= =?us-ascii?Q?AUflLbnzbrbZzGW6D6MX9f7OUhQ5FICcCTkImSFQiQ+WzFsWviTZjhnknyCm?= =?us-ascii?Q?ZCdlAb8VX0F7lZGWjC7iZD0eHX0k/0fP3xdo69e+jeJRD+w9kksOfCxG8DCB?= =?us-ascii?Q?SO2HZXuV1YBlCtPoxBqSsLTlbuj8NsQcQa/1?= X-Forefront-Antispam-Report: CIP:216.228.118.232;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge1.nvidia.com;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700013)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2025 05:40:55.8852 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 02551c7e-4342-4899-5b5e-08ddc2990113 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.232];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000AD75.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7936 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Moshe Shemesh Fix the following kdoc warning: git ls-files *.[ch] | egrep drivers/net/ethernet/mellanox/mlx5/core/ |\ xargs scripts/kernel-doc --none drivers/net/ethernet/mellanox/mlx5/core/eswitch.h:824: warning: cannot understand function prototype: 'struct mlx5_esw_event_info ' Signed-off-by: Moshe Shemesh Signed-off-by: Tariq Toukan Reviewed-by: Michal Swiatkowski --- drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/ne= t/ethernet/mellanox/mlx5/core/eswitch.h index d59fdcb29cb8..b0b8ef3ec3c4 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h @@ -827,7 +827,7 @@ void mlx5_esw_vport_vhca_id_clear(struct mlx5_eswitch *= esw, u16 vport_num); int mlx5_eswitch_vhca_id_to_vport(struct mlx5_eswitch *esw, u16 vhca_id, u= 16 *vport_num); =20 /** - * mlx5_esw_event_info - Indicates eswitch mode changed/changing. + * struct mlx5_esw_event_info - Indicates eswitch mode changed/changing. * * @new_mode: New mode of eswitch. */ --=20 2.40.1 From nobody Tue Oct 7 05:42:06 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2062.outbound.protection.outlook.com [40.107.236.62]) (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 632902063F3; Mon, 14 Jul 2025 05:41:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.62 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752471667; cv=fail; b=DJb+jcqvhK7XTMesJJs21Y5sEpKspf++EENOjGJcJv8yfrNJuaqCjYzbynPk9b2TOcQvmgka7BVLb4Fy1ePtqraDlXjRmgESFNY+RpOnZ13/Iy9dU6A7v1a6q8DtVx9Ab7Y0NbV5n7n604B+G8hmVX+cc3wn/bFdlNARrOPXb3c= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752471667; c=relaxed/simple; bh=XbPozJdc9WXKGTY4IUaqpv925gDN7LRk75gW33GZU54=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MA/73mhzUMc1lQdaqi5jx/36FbXuwGRAxqVfnYD5BUVk0UIUoQ4YvaZe7nA4TR1JlMUOpcrg7YSJVyqKf/efWjfYc94ReTTjv/b4iIzh5EDrSsrUhdHd3RH3xx2/XwClVXtcQp7FozAmvihOmDputTYpcaw+UiLPj/RmNrvVTk4= 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=G+j0zEBm; arc=fail smtp.client-ip=40.107.236.62 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="G+j0zEBm" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=H313rURj/OV1iFfruerF5rr449+9ZDnwEXcA48PmRdvbO+pud6iAmKWrz8VflISmH6qoeD8tLlrkb9n11J0xS19zzPo3BS9g4XhFopDGJKtNeRtRISRbjg8Id26xuUAbSIkH4smxO1qsAJHre1k9CdGjSTbc0U8KPEx1TC7xRZj/rEiDBtUCIfjdUjpyN4molfwILjIBhi30e623gmLfpvfFs610crTPD5WhbkxdHgaoOTWCbF168bxqwYPy5aT8jZItfmWUvMGiTWNRKnetNjMnCDKYQfjZFxb81zqMi6L1TMgpQzRFl5ADTwz2ozdmm/IYzoQ0u3BiluhEvp4YVQ== 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=9ZK7EMvQPVVxwj6dTJNwChEzIuxfbqx/J639/qEmUhw=; b=jlx7wzqOeZx1CTzVUnVEM942y6QK82nJkKifjFyDm6cAGJ8ECbiAhdZFBJCNSMCV95MKYyNKl2KKwx1uOviifAQ6nz1vrsXtYzvV6bIF7UlM27yx1oMV0DPYn5F4unnXIv+dqSmr0Bk5CZJ2tcc2YTc9WgaTbD7JIf8jqpPT9W9HpMUry7gGnMFfGmDqtV+EHqQAJaRvad9q2Ahn2di1ufr8h8Blxtli+ya8VG5sn9+rl//nTzGHN13NctXSq16buPwySqGVXq/l2d64kU9zKVMekdywWjUqx/6/HIiTkGGEjjceGpD7aF1CinT7TAVQFi+lVeHDzjVpTX4BMxYMYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=9ZK7EMvQPVVxwj6dTJNwChEzIuxfbqx/J639/qEmUhw=; b=G+j0zEBmBTC4KP+r+tIn2cU97WxiJOhyLyyjFkrPjLMb22sajuwcm1O1wVn2Oru5CU2KkX6XYPAg9icrNHrLYb/F1M5EiUkPa2e0MJdhYmPF37lLJUYu8cQiHZQfyvKwypWtsSsuOi/HTAzn9FdtjTCIABDpItprCnP9TO9WbpDHv+GQuT4bIXezNbVcrezUpZfM0geSbaEOvUjrk/+LQpLfhNPhb7vtKoeOsJ+5WMsNiIiZZZqv+JugcND+ktrVnQ3UxAMhOx/QdT5+b87wWMB4aXp8Fx4AlDTShX0fMo28/E3BIV6+Sb6j/echyvVoBBagNH5lqm6du3dTCkKAwA== Received: from MW2PR2101CA0025.namprd21.prod.outlook.com (2603:10b6:302:1::38) by PH7PR12MB7018.namprd12.prod.outlook.com (2603:10b6:510:1b8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.28; Mon, 14 Jul 2025 05:41:00 +0000 Received: from CY4PEPF0000E9D1.namprd03.prod.outlook.com (2603:10b6:302:1:cafe::3) by MW2PR2101CA0025.outlook.office365.com (2603:10b6:302:1::38) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8964.5 via Frontend Transport; Mon, 14 Jul 2025 05:40:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by CY4PEPF0000E9D1.mail.protection.outlook.com (10.167.241.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Mon, 14 Jul 2025 05:40:59 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 13 Jul 2025 22:40:48 -0700 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sun, 13 Jul 2025 22:40:47 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sun, 13 Jul 2025 22:40:44 -0700 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Gal Pressman , "Leon Romanovsky" , Saeed Mahameed , "Tariq Toukan" , Mark Bloch , , , , Leon Romanovsky Subject: [PATCH net-next 3/6] net/mlx5e: Properly access RCU protected qdisc_sleeping variable Date: Mon, 14 Jul 2025 08:39:42 +0300 Message-ID: <1752471585-18053-4-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1752471585-18053-1-git-send-email-tariqt@nvidia.com> References: <1752471585-18053-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: CY4PEPF0000E9D1:EE_|PH7PR12MB7018:EE_ X-MS-Office365-Filtering-Correlation-Id: ca583b6f-5e28-4674-5c23-08ddc2990348 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|7416014|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4ZsIa++olgvCF0Q4AjHio8AujycMeXCnUXF9lJnVTlRzMn4uAfWm+wQklhXY?= =?us-ascii?Q?P7DALbIc7ZneU1P0Ha5WR1iXCuGRcnr84KQJDbfdh3qz16XUDUuhYhFCgvug?= =?us-ascii?Q?frpaWss4zsv0Iczp31ZZmuaTknxaX85MzoQjxDdeIm+qmGN66EgKg3MGe1qk?= =?us-ascii?Q?xy5doHW/f4MU6Dfwv2+iJwSBbZVo2RKHIzo9ZenzeEejAf5ZKEqv9iRvo37h?= =?us-ascii?Q?qpLbe5z/wHK+ebhRF38U4VOMFiQxGgutaHNXnWdAtRVQr6EAwV4MKSiKi4X+?= =?us-ascii?Q?I6pya5JmG9l46xmzOtiSaqtNjmtW8jQL1VusKRFuplVXBn2sWZdK77p6HYtQ?= =?us-ascii?Q?6K1+tXjo2VxPRc6Sqcgq3NPTrs0nX7Sz9hbC3dzwfxSv5glBOH3WCd9CtwWG?= =?us-ascii?Q?2bV/FrSnhUJY4+Xx6f4sBkI4oAMcy5uCmavhQvrjhq/AIyzaGUseZBXWoVCP?= =?us-ascii?Q?OJopjhkC+kg1x2DIzWniSh5KWvVGgTooGSCWaB/I6Fn8uy+nrN24G/kwSTcO?= =?us-ascii?Q?wp7W69CZ0DZCc6HHWgDdu0kmaHzi2jeltEAgvv+LZqepBryZ5FS56hYJmGO8?= =?us-ascii?Q?brERntGhx7d5BN6Y4LdRIAKuhOVGx+8+20brDjoG/h/7KAmPNxSh9Dal0IRl?= =?us-ascii?Q?lTpkD6zgeQKy1adNDVzo3pBTsUuyQuk7mjZv4d84zaoZvSEc3cs1PrGN6A40?= =?us-ascii?Q?y6APLb03EMYBAXdD4sFrOifswVySAm7d9c8Xs9IJBYN2K+uF11ZZPDLoYsAY?= =?us-ascii?Q?vRZnDHlT+szTQyp5vLYgdWYbABwbjleMkXsfBShmYnnIUMb0/nIGP7vKeLS+?= =?us-ascii?Q?H26Rt2eh8KZVVqlYe/ADWRTFN2H6U017ivsAO0NDQrGxijBCSyAuW+3Eum6D?= =?us-ascii?Q?tWOwYjAzGBoONJTwGLsBLqfNO0HW17UVuv4sZm2XMBILCKrmHYgLzjLkAu3+?= =?us-ascii?Q?ryVrULUZRoQkPRX1WmH0OPXgfwUAuTKHNeVhh5zeoLd576iPLE30etCyQGOl?= =?us-ascii?Q?D3KasoT7cBIe+rEcdBE3hEwWMo01otpw9PcqqiSD9Kwn2Ly9arzBzoA90tMS?= =?us-ascii?Q?jBmrXcDdY7GXBXlOpcqNAs+8CLro/y54/Gi3MSlcPfwSMFc+5/snWgGQVuZ8?= =?us-ascii?Q?HFTEPoydv5INw851ED1UKwhRx/uF53vIKmjuKmy+aIb2yblhO9MJEFfmtK9C?= =?us-ascii?Q?hVMYtuo8mj9Nkx0pxLNFVcYAyI5LNPIZDTCWIpoM51cPMbGzg/47266UqVru?= =?us-ascii?Q?KPVYGD3dw0giOnrdS8go7IK1vyCgmgStsmSVXSLzFPjdgWFxA6ioDXeGqQYF?= =?us-ascii?Q?Q53qWboDGLPxYh9vajyUsSwf3SJtRkmHxec7EmyI2YpNaLFR+vuXnXvQGjId?= =?us-ascii?Q?8zkcFha/O+Yfhsdu0D05DFAuMyrzg9E/ktgEz0CMGiKS7OJKZNV8YFnAnV0Y?= =?us-ascii?Q?9YxGMm2QU/568b8r9DEz8PeTg+EpTVTlFM/ZD9MHdJC1EbpDzGLzH+MJhYyc?= =?us-ascii?Q?Fygdsg6fwS3vCkWxTUSnpj/A71SgRUR7E1bT?= X-Forefront-Antispam-Report: CIP:216.228.118.232;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge1.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(7416014)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2025 05:40:59.6317 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ca583b6f-5e28-4674-5c23-08ddc2990348 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.232];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9D1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7018 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Leon Romanovsky qdisc_sleeping variable is declared as "struct Qdisc __rcu" and as such needs proper annotation while accessing it. Without rtnl_dereference(), the following error is generated by sparse: drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: warning: incorrect type in initializer (different address spaces) drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: expected struct Qdisc *qdisc drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: got struct Qdisc [noderef] __rcu *qdisc_sleeping Signed-off-by: Leon Romanovsky Signed-off-by: Tariq Toukan Reviewed-by: Michal Swiatkowski --- drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c b/drivers/net= /ethernet/mellanox/mlx5/core/en/qos.c index f0744a45db92..4e461cb03b83 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c @@ -374,7 +374,7 @@ void mlx5e_reactivate_qos_sq(struct mlx5e_priv *priv, u= 16 qid, struct netdev_que void mlx5e_reset_qdisc(struct net_device *dev, u16 qid) { struct netdev_queue *dev_queue =3D netdev_get_tx_queue(dev, qid); - struct Qdisc *qdisc =3D dev_queue->qdisc_sleeping; + struct Qdisc *qdisc =3D rtnl_dereference(dev_queue->qdisc_sleeping); =20 if (!qdisc) return; --=20 2.40.1 From nobody Tue Oct 7 05:42:06 2025 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2047.outbound.protection.outlook.com [40.107.94.47]) (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 2FB9F1FECB0; Mon, 14 Jul 2025 05:41:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752471666; cv=fail; b=e/Mr+MHEb+G7XLBOKXvTppbzP5VLmnz0eNNUPdI3mXhWrW2DXCzBwcDh04Z1Fd62MYGO+2t4ZpisTz9Od0FeljYxDQgyqVvbUJNGe4YGk1CSsDM5HGo9kXUnbK2a3nkbCp4/iK2ABJ6BIvlFZDq1587KXmMQScrTgaWGdpbecqw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752471666; c=relaxed/simple; bh=S+J19DBuoN9eufNBN5zF9uHHSoB5E/JjnBz1opoMGKY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NvfikNUHoh/kGdS6OSZ/FXg2yJD/NPpiscR9hqfW7B10kTErdIOwjU87kTt7Z3ZyrGkvHhSmQqmbBhLgsBDGDGAMwVvb1mqLlNFmBfMPFsNfexJxQZbqvZ4miEIyTOO7kv4tZePQymriEEjK+whdQkXH64xSzRauTKVeZD6KaJA= 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=Yuhgrfs7; arc=fail smtp.client-ip=40.107.94.47 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="Yuhgrfs7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NfDpkNt+L478NXoXZ0N1NDBKB6YNMfhWlzLLYjEaCu1qWgINf1FGBBpx1GLf6jAl8d5s8EmOmb3l+mlqhUO2f1c6+S5NvoqE0Y2QsKGI8U3+EzhdO3nOJ7hd5VSzeFD0VstWFdNgjd9nQOJrJ4hBL0s3g9bZBLO73ukVsF0yW2K2sNbtNP0Hq5aGW9HYUpPhYUUqm4Vszqb+JfZMekLN3ErsQmK4NBysw0vKaQzilIAVR5igmGVNoyK5tAgVd7Y9SWjVzmC1BwP0wBVEekqM8xkn4g/pDUtiGqY76PdFh5zVqlPqQXGH+yWIoxJfHfiM3AfV6/yFaxupVYHZvUbl8Q== 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=7nICyObmMvbWPWrhZlqj6X3XUjcaL0+FQbCeNp4sxhA=; b=IlNYqIjwiYcqZPLRGBD2owHtPDwT9UVYNJ8w6D+YGPelxVzPNAw97ET+KFo1cgqR8+3WGxyoWnIYhxg0dTtrD+BzVRX/I/twP+fr8Bx7sn75T8Tees7ju3xKCLaw+SOwBp2y+noFLa9G+QTgmQtPjRVn+D5CTq/UvCmwASkXBa2gb5ozhU3TxYeLYgNIQwtJ92PzGcKduDgx9xcwBatfwDlcZwoolx/7K6wSfgBK3eBL+ClvpbuQHDHZtZEb6XXg00+nG3csTgfYKr2oYNMhkqsw8lWkXx5vqpGilmW29x4i7HojT+J2BNNN6L7ywszGSlJIbGyeD2DpEfbPwwRW7w== 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=7nICyObmMvbWPWrhZlqj6X3XUjcaL0+FQbCeNp4sxhA=; b=Yuhgrfs73dgyBTy21bbTGfBLuEEhBgOYX6wJohJWFRhkPKdIR8Ls37iCJrXF33aoAEjjic0wRxIg8Mwb3Es/LDX8NS8LM8TAa09ZmNgsxne48Ar1Lrwj96j+/+2i2eDqHKfs4UZZz4wRb8UchHrvaR6Ajn1cphM0QiqashCWB9u5HpS4a30TIWsBBrlKdNjYLuqLxTXf9Ikl5etDIBPdo5Vv5aQhrf4jYY131T11qDObnkR9CpCSIlFfdVc6kC0nwG6ECwXppcRkHfT4Rkt0TZVr0STQxarDgM8/PqqrCDJ1bZ8F7J2Rpr1Zp18bukLRtgx5OZAWEAWyYjFv4F4zUw== Received: from BYAPR07CA0035.namprd07.prod.outlook.com (2603:10b6:a02:bc::48) by MW3PR12MB4396.namprd12.prod.outlook.com (2603:10b6:303:59::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.32; Mon, 14 Jul 2025 05:41:00 +0000 Received: from SJ1PEPF00002311.namprd03.prod.outlook.com (2603:10b6:a02:bc:cafe::5d) by BYAPR07CA0035.outlook.office365.com (2603:10b6:a02:bc::48) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.32 via Frontend Transport; Mon, 14 Jul 2025 05:41:00 +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 SJ1PEPF00002311.mail.protection.outlook.com (10.167.242.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Mon, 14 Jul 2025 05:41:00 +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; Sun, 13 Jul 2025 22:40:51 -0700 Received: from drhqmail203.nvidia.com (10.126.190.182) 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; Sun, 13 Jul 2025 22:40:51 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sun, 13 Jul 2025 22:40:48 -0700 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Gal Pressman , "Leon Romanovsky" , Saeed Mahameed , "Tariq Toukan" , Mark Bloch , , , , Lama Kayal Subject: [PATCH net-next 4/6] net/mlx5e: SHAMPO, Cleanup reservation size formula Date: Mon, 14 Jul 2025 08:39:43 +0300 Message-ID: <1752471585-18053-5-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1752471585-18053-1-git-send-email-tariqt@nvidia.com> References: <1752471585-18053-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: SJ1PEPF00002311:EE_|MW3PR12MB4396:EE_ X-MS-Office365-Filtering-Correlation-Id: e7d70f25-50eb-4fa2-5857-08ddc29903b8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?rIP2m6QmrHUgzI3z+cF5I6idYwLqE6tpd7cD8RvmZH0KREo4wFQm/jYMItag?= =?us-ascii?Q?khP0cc7dI+NmrOCJWa4gqpvOLi6b+L0ByMHTFDzZFRRtq3OkigYQo1JlfEmA?= =?us-ascii?Q?u+0tsaI9lptB9VADKGir2O72GcWDxOUwq5x651M6ldIV3YO+ReHB3J2w8dnl?= =?us-ascii?Q?JwO8vwzLNeERa4WNfQL4YC75B+teWqvLsixvUWBD9wngXlcYfakVz/TT5+dC?= =?us-ascii?Q?ngOLtYiSNq93zTwqynqYD3ghBKO+MievzgXBidHXWBNNlUM/WmDaqujoJBfy?= =?us-ascii?Q?CNFW0+/X27p98JjbZUPeAq0+bKt0h6gwkDB/8zXrWHq/k2eP6o5OGP2NFof5?= =?us-ascii?Q?O5eMInbSyWEf6DmUsiGXNXGKEWOV3/eTHbPGhdjA/07XsawIemq35iRAb8ym?= =?us-ascii?Q?BfLz2y5jgTTPnmEA/aEWxgQI9qUaItMX0wUTFCAwOSLZvc/ViVqteARCpq7U?= =?us-ascii?Q?B6ck3fKco9gHekzjRHOABEni/Uq4gAZrSUJiTxQkvnz/9h+AH+AWJCS3hMiP?= =?us-ascii?Q?D6x/pWM6bPCzyGU2xxPmU8/sIVDlXq1BHGKZkTOxvLh0AzeEy6fKA2V3s0Kt?= =?us-ascii?Q?6SuE/cMJXdmpMzzDFJOlQq0n7ObFJIoA4s3h8XeEvN928uDpjdwcvyATJNvN?= =?us-ascii?Q?ZeC/6hhz6MOL0gtvpc+ausD04Aoe4zoCNoqy76Thqu400B7io/mdjbpC/JVW?= =?us-ascii?Q?mgUwkA9n5oxCZSTRl1yl4tuo4Nqo4vbyV3dyBT1VSNLqMsS4lOU7A4TucyIX?= =?us-ascii?Q?LBu33m9hk0iW2Bdu81UhzY+B45Oycn3hNO6oRjrTesbpXCJ5eoQhKSkJbPx0?= =?us-ascii?Q?3XU6DEQ2K1B6WCmICc2iAlwS5a35EkdYibZJ6cWKmgqOKrtc5Br2rLIACvAE?= =?us-ascii?Q?YQEpIshJNfHe2R11LEQDT7gi3MCmEn2jomN1Mbdcz9WWHjpUnc+LDCFmqYMv?= =?us-ascii?Q?XC98uidAAU7V9+tK2eCd6zJSU7svnQuNaTgvXIMTdfvqZxECyRhTTLm66v3V?= =?us-ascii?Q?iVA7wqVKIQng9tsfbR143I8slsFmUapbMyCN95MP8lTserCawcjWlCRwMa6J?= =?us-ascii?Q?njmjIA1I6t4StBr29iCDbY1AXpgr50jmSSI1taGB0WppYVGExpnddzyNFMLT?= =?us-ascii?Q?IYSVfDFBYcapJGh4He0aiB1j2rDC26c6NIL9yhaM/bY+CQdZ83/Zr84wG6HB?= =?us-ascii?Q?hiVSaZIcpten/lv8m+94QE1FcSJS2kmV61ZFoCzYh9cx9m57pSvTSqDqplgW?= =?us-ascii?Q?2TLc86NSmTaCKJNKBs9G0uMYNcqGw9lxuKDugOnuNpku4sBL5K0NeeWLDi68?= =?us-ascii?Q?oJ8yXXiHT1HzVTaTDUFFyVsWGAsEa0GWjBsu0pNajpMdqvbw66w+iRF8kPkG?= =?us-ascii?Q?knon7wYk866y/5GjM9v4JrIzjKgqQkRoKLJq63f0GcE7D2yDtnG4WKM4JEn1?= =?us-ascii?Q?5AD9n2Mups8p5f59PsorVcUFv/Tbc9eaNWzaKJmpOkjfL+LYTXhhDZAEibt/?= =?us-ascii?Q?KTtKL25cPAKy4Q1TZcm31baTecCsEDMFvDwa?= 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)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2025 05:41:00.4332 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e7d70f25-50eb-4fa2-5857-08ddc29903b8 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: SJ1PEPF00002311.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4396 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 --- drivers/net/ethernet/mellanox/mlx5/core/en.h | 5 +-- .../ethernet/mellanox/mlx5/core/en/params.c | 34 +++++++------------ .../ethernet/mellanox/mlx5/core/en/params.h | 4 --- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/eth= ernet/mellanox/mlx5/core/en.h index 64e69e616b1f..019bc6ca4455 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..616251ec6d69 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,10 +825,9 @@ static u32 mlx5e_shampo_get_log_cq_size(struct mlx5_co= re_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; + int rsrv_size =3D MLX5E_SHAMPO_WQ_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)); + int pkt_per_rsrv =3D BIT(mlx5e_shampo_get_log_pkt_per_rsrv(params)); u8 log_stride_sz =3D mlx5e_mpwqe_get_log_stride_size(mdev, params, xsk); int wq_size =3D BIT(mlx5e_mpwqe_get_log_rq_size(mdev, params, xsk)); int wqe_size =3D BIT(log_stride_sz) * num_strides; @@ -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; + int rsrv_size =3D MLX5E_SHAMPO_WQ_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)); + int pkt_per_resv =3D BIT(mlx5e_shampo_get_log_pkt_per_rsrv(params)); u8 log_stride_sz =3D mlx5e_mpwqe_get_log_stride_size(mdev, params, NULL); int wqe_size =3D BIT(log_stride_sz) * num_strides; u32 hd_per_wqe; =20 /* Assumption: hd_per_wqe % 8 =3D=3D 0. */ - hd_per_wqe =3D (wqe_size / resv_size) * pkt_per_resv; + hd_per_wqe =3D (wqe_size / rsrv_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); + __func__, hd_per_wqe, rsrv_size, wqe_size, pkt_per_resv); 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.40.1 From nobody Tue Oct 7 05:42:06 2025 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2086.outbound.protection.outlook.com [40.107.212.86]) (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 5D25A2222AB; Mon, 14 Jul 2025 05:41:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.86 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752471669; cv=fail; b=MBGTS9ZMkixWUefUWC+Yzm3svBJqmn8zjks2xHoBv4nEB++mdodLbVkeIqtt6hXv/1zNk1gcQowfjd/5NH/H/ZShrNuo46n09KRGuAZi76go6W+m8oJxKJdCyg2JxNl8wsNXuZYYxgoeO86lD39R9cHXXwYoUPI39OAy3r3B/78= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752471669; c=relaxed/simple; bh=NYGTPJ1VpUvO4h0ehiQjwUO0L+EYotpBwnmDOb0Ah5k=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=F5N7RMGdjuD9FmOO5bhIAO3r1W3W5c68q8tXwSw/fs6nT0oGyE5/HfDRQOznQi/lqBFvHsJjoZrpnEoafL2iV/wRWG8/Ud5KAjULQcAr0EiFn2pYVp7Az/jqY2O1Ksk1mY5q2+gdnh4HOt1Lt2wqOlc/9Cv+xn7ASNN3XahkjIQ= 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=q4GOs6HB; arc=fail smtp.client-ip=40.107.212.86 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="q4GOs6HB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JxXwU2gMCsR/30WNZ2zuHkqzW478KkZGvtt3e3tzIYLfKEGwBtwTAkJvWRdbZXMlycvQgcNo8IkznbIlD2Xg01utgKefrcTPjyuQ70Ca+V7qlwVc1jXzf6yb/yGWOUC2Y6R0Kgq6+sBs0U8lthkLxn36B5B17zneO4n4x9PQxGVGaxZyf70J4mDaHh7dNbntVD8OKgSCDHl+yS97nP0SezUqeIlbDaukCB8n3wo7lfaxMpcA4IvlKYkbKP93oKIZN2PVPH4rHv2+VD92kEt+kYR/aroKExjeGEdv3yK0d0aDpAqEaCvxHJYNUL1wWUGhVcu9jtFwZRFT3Ht1E44f0g== 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=MttrC1wskpx+lLGnslSAdc3AVFRFCR3iOfX3dUl6nsw=; b=etDzIlN/1Owt0UX9gzkKDnaYWpr7fDoP89yv0MY3/xsiAA731sPF6x+oUQrJWFdtaytTDP2YE2DH2h2hoDwz44HEhtMdb+X+8zWnaZRivkwPfrx1qOVEQ93yFuAaAKYZD2PIi56X96TtHFjN3avhqUFgDNeWD8V0HEBrmgreZtpOX+Ufj86pgVqad7uI+7UOsAC3xd+M0375L8oJS9dmRZ02mvnvm+opfGU1ormPIKhcuXm10EviomTgJ/iwnDIr2+fBr04ExvR+6y64HDrQOn2BfcY8i4t+FUAYsLDz4Qb3J6fKJA5/r+6Nin8dVR+h06qO28dfBMnAiOfTgj8CYA== 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=MttrC1wskpx+lLGnslSAdc3AVFRFCR3iOfX3dUl6nsw=; b=q4GOs6HBf4cb3nZsCBhcxG43Nmxm4nJ+TWrrGZ/Cyuo3rHJEUKi6iodJJsfrwjGMKS1xLxc1hNg4MytDzarN8t6pHgoXLQfGoCqmQsIbuNs8G1xRJfvTrvYthivP1otYnpNLZ/0iRX6C/iBoC8Tpy9Ol482fsXVJvH+8SBzZQ3sbqip8YBGHO/dZODNl4ClRnH8L4YctjmRI8qo7SpMv93DJAFjFxAHpT6/nj6MCszM1DG82Zj2UD3puNKv+49RB06LW5VzcOoKSnFtAfjtTwZuaonIUlSq7Z8fsCO6Rs4k+5Qz7Fw1lEPMx/0xNCCfgE0mOrkuWn0ZstZovnyvPRg== Received: from BYAPR07CA0015.namprd07.prod.outlook.com (2603:10b6:a02:bc::28) by PH7PR12MB7988.namprd12.prod.outlook.com (2603:10b6:510:26a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.26; Mon, 14 Jul 2025 05:41:03 +0000 Received: from SJ1PEPF00002311.namprd03.prod.outlook.com (2603:10b6:a02:bc:cafe::9e) by BYAPR07CA0015.outlook.office365.com (2603:10b6:a02:bc::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.32 via Frontend Transport; Mon, 14 Jul 2025 05:41: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 SJ1PEPF00002311.mail.protection.outlook.com (10.167.242.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Mon, 14 Jul 2025 05:41:02 +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; Sun, 13 Jul 2025 22:40:56 -0700 Received: from drhqmail203.nvidia.com (10.126.190.182) 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; Sun, 13 Jul 2025 22:40:55 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sun, 13 Jul 2025 22:40:51 -0700 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Gal Pressman , "Leon Romanovsky" , Saeed Mahameed , "Tariq Toukan" , Mark Bloch , , , , Lama Kayal Subject: [PATCH net-next 5/6] net/mlx5e: SHAMPO, Remove mlx5e_shampo_get_log_hd_entry_size() Date: Mon, 14 Jul 2025 08:39:44 +0300 Message-ID: <1752471585-18053-6-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1752471585-18053-1-git-send-email-tariqt@nvidia.com> References: <1752471585-18053-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: SJ1PEPF00002311:EE_|PH7PR12MB7988:EE_ X-MS-Office365-Filtering-Correlation-Id: 9312a408-c24d-4c3b-5241-08ddc2990536 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|7416014|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?AAz7DrVvJ3hDJ6fbzcfTj4p76lW50nR6roo0vww6dZ32WXtMD19n4NPd5w1p?= =?us-ascii?Q?GM6I+6gLJfzQkCa/4qoTjqaKmSEFOZM4JNMDtVNEvC2f/unBpv3Q+EPz9g+i?= =?us-ascii?Q?N7z/lDZEd3Cmn4VhsOKcCbs2WkvmBU1/T3b1HkrF6wYzj5J5ctzPpHMZcWAF?= =?us-ascii?Q?zSoTruWK7XAJ8Dw5Kg0Y/xKGp68ojZFtpCrKOgds687kgw/DLKS8YQoR2iSw?= =?us-ascii?Q?d9TWG6gZBehYOHUTDVVukuWa839n2v7Ih5Ak32vJkAa/coO81lNmVq2jMOii?= =?us-ascii?Q?lAQpapZaamo+Wcx/lBzYiN6MtGZafPXo1TByeoBmXLIpnBC5zq0lEkzy2r5U?= =?us-ascii?Q?W7u1Bj+14XKiIJv1VHrlGxKkaDHNtBbywDh3CcJbVL6xDDSOMYkGgdLSiBvG?= =?us-ascii?Q?7fLYljaGNLowN4NLdVS/hlNu5DEMNFxInptey+8yVRhwpx/aX4OpcB4lu9O1?= =?us-ascii?Q?7baRAGUTLpAytvlwdE1Wo3eZmmcEGSlEwmOLtUvNVkcu4ObdAfUIRhDfZaGu?= =?us-ascii?Q?yPqOTYtxr8fup8YzMOE48MCOU2NUyOrfYvafBYa7yxH7lYAxY8F63LRt67Lt?= =?us-ascii?Q?A+FjJ6lD1kzAVTpVjnljW49cdDFTlksbCh2ZuETR/WyOzYMFgacLkVhOIUkG?= =?us-ascii?Q?gIiJO2xl1GiVKkdViaPzPhsZ1YgOKWnO/0eGNXaFcVDHSbDPEapn2oV+h3uc?= =?us-ascii?Q?lqhO0IS6WAdS0De76NzeB1lDpNsz2f61pV8BkG/ZCukuPqTla5n84j2MqFL1?= =?us-ascii?Q?O9ta7tYCPyZuTOqWP48u1LaMIQzUnnM7K6WGNrQo8xgW40u5jvWWbRhAQBiz?= =?us-ascii?Q?/7OIyg3mInkqL4DIp47TDYSywqr+o76oxCP0p9z4qzKLYHZsFFMRUR3rmJDR?= =?us-ascii?Q?/X+SgLSj15WNfL2jDhE/uN0fciHNPILp4KYBZNkGOf834JQFoR/9NM1EUv76?= =?us-ascii?Q?geKhznHiJ8hYQeNS1fhxQv1MM+m99K/SbzK0rXKsGGoihahtS9m7qmra/q3y?= =?us-ascii?Q?jBdw8P8LfkpbRTEA4obAk6TX4axeloQi8JyFkq6tyfYlqwlVJ7n/wDRwk6ov?= =?us-ascii?Q?AWsJs+7ET7An+OTotodCV9dNDjmv01esi/w3kZpd6DOiSKIeeaAzGruFbZyD?= =?us-ascii?Q?MKeAwTtXXYoSMLMpPQgu/o6g1pbMk/XXKf92a7TYsook05D2rJ6ZECGEG7oP?= =?us-ascii?Q?9UgNT0T4kMtjuWJJEvIvioaNs+ZEhy4N1aWVqgYVOl0y0LJypT72Eshd4O+/?= =?us-ascii?Q?q2dfBUTziV9vSLbNsVVyCs8a7KYDSWmnYoK4tYoVtcC03VhhvqieqoMb+ePf?= =?us-ascii?Q?UqyFJIvpLn0LFHTLA/WPE7nJyI05eO778dTNvrNJGNdml13+VHIxFjzku0pz?= =?us-ascii?Q?FQ4ZkhJNf7dqNlDGKPRBwMPOjUJsHNtmUrQkC1iOtPdRp1ZXC6OA9imik7xI?= =?us-ascii?Q?S7OVq6FBr0dX6Qa1Cz3xVyCexYDImI0pT+W4Fc8NiqDAs3/d6aOsv4JnBZf0?= =?us-ascii?Q?Udnhb+uxOvKvuCs7vq5Q3tUEhSh2EZ6tYETV?= 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)(7416014)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2025 05:41:02.9021 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9312a408-c24d-4c3b-5241-08ddc2990536 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: SJ1PEPF00002311.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7988 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 --- 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 019bc6ca4455..22098c852570 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 616251ec6d69..de5c97ea4dd8 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.40.1 From nobody Tue Oct 7 05:42:06 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2042.outbound.protection.outlook.com [40.107.244.42]) (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 BD9EB229B0D; Mon, 14 Jul 2025 05:41:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.42 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752471675; cv=fail; b=TX9aKws1cnskgbEvUaTqhs0N9AKa+W0wmH2ZwBzOg10PdZ+mLeYKLYkTsUlav9IeJCawCcG+7yz4xFcr8z28kNInXsQp+/3w7P2yfBPxA4QIh++n2eW6YtQuhhtBOAcrT0f/PKcSo+KF6inpHXZTWy9E+gwJiexMX+j5pjoRhxE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752471675; c=relaxed/simple; bh=BY9O3rctfmlaPW2AbLNBjqw351xRl3WtBE68q6pYcuc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=H2lTcTvfAdUbQLo8jTfgiS94umZ6S18bniOW6YiqOPwzNSbjCeHkmfoBLuTU9LVViRaLZOkvAX+K2Ifv5krsXS18VFdie6VHjWND3BXrCPLFYCB0y/RHsngFaABKLBaBonhdKmWwL2lJ4zGylrUhc8LI//pH8VYptdovb5xA8oY= 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=HQR1Xo6c; arc=fail smtp.client-ip=40.107.244.42 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="HQR1Xo6c" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mr9O1A+bYRWVQPKDCaR6JY81+LV8MLwGlpEo5Z2Y+7tSniJs+OwelXjRSaFZMLYVIzUyywTENGEL2sJT6UgloB2AWqMniQjKVgqOI9asFSDztJafuonJjW9jw+WIhJdAg44JdrZa5I7rYjB5VvNdp4kkPQTjC6l03vqUKL9hoMeOBQqElRy2i//O9qHh05B5Vtl/tiZfwPlPM5LqxPxWV6VM6utgZFkGBBn7OV3f/e2D5aOtvyeXHWcAm2HXuZV8+xyvBYx2T0UvVHLO3nJKafmvMbgv1s65bsA8ODdPH9MujzOi9LZX+idZz1gdeTkVfOOoZ6sgQJsQDZ5Sbn+29Q== 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=c4/irpDPFdP8gJd25WUFJ+WuN2FQg5MmwhtF62cg6mk=; b=PU/PSCVzT75ywH/Ce/8wrTvwl3rLq1cRodIU/NG3oA9JbdTxYR9VSg1TM9sPaJTauqWYG9ernWN5kbsbuN3d0gDlJGgEYr1SFBcvV92/0rblky765pWLrjT/PKgk6NLVsw0YaYbGskImvMAhnppmoGfymwHZiYtjjdVWRM0Uk1jCLZJZFdutEX04wl+8PrrMfjQ/ZPyxjmg9+F/S42IoajYgrhd1wwYvoV7P1otqVyQ+tuwIH+MrUhN9zMD5bRYpWmTHyXo6ALoqFJ2puJi5sqbmEBAzj6c2uetvDKGKZpI1aEuJNZz9JG9hdY3VRBrJMEp7x6oHQeh6RzkrfV5Phg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) 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=c4/irpDPFdP8gJd25WUFJ+WuN2FQg5MmwhtF62cg6mk=; b=HQR1Xo6cbhF1gG9muiufMjk5gyCccJJ3sL6yFEyBFJfEJNYyfjjv5Q+auO/5Jb5NE65X0Rmj81/HHokLeiB/jIQ8PvEvMsbAv7woML1B9268dehLkKQLa6nXnOstb8WSHmxnSk3yyvrbEK0m9bZhAG+RBWzjDGQjXikhcRdv6vURoWE8yB/pkLA9L7VzlyLj8VG+66odmACQ2nTenoKgDK9l9u5Q/RVrbnDOSEXyqOp6TZiWfSPyAsK15gtVZ+udP6qT55aJU5kFHo8xJEbp+KrBmANAQO7vfft51zxoKSuK0PyqCUmKm2V+PxkmyfJDPynq+T15d3mZwZsFGq1u6g== Received: from CH2PR03CA0026.namprd03.prod.outlook.com (2603:10b6:610:59::36) by CH1PR12MB9623.namprd12.prod.outlook.com (2603:10b6:610:2b3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.25; Mon, 14 Jul 2025 05:41:09 +0000 Received: from CH1PEPF0000AD7A.namprd04.prod.outlook.com (2603:10b6:610:59:cafe::78) by CH2PR03CA0026.outlook.office365.com (2603:10b6:610:59::36) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.28 via Frontend Transport; Mon, 14 Jul 2025 05:41:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by CH1PEPF0000AD7A.mail.protection.outlook.com (10.167.244.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Mon, 14 Jul 2025 05:41:08 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 13 Jul 2025 22:40:59 -0700 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sun, 13 Jul 2025 22:40:59 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sun, 13 Jul 2025 22:40:55 -0700 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Saeed Mahameed , Gal Pressman , "Leon Romanovsky" , Saeed Mahameed , "Tariq Toukan" , Mark Bloch , , , , Lama Kayal Subject: [PATCH net-next 6/6] net/mlx5e: Remove duplicate mkey from SHAMPO header Date: Mon, 14 Jul 2025 08:39:45 +0300 Message-ID: <1752471585-18053-7-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1752471585-18053-1-git-send-email-tariqt@nvidia.com> References: <1752471585-18053-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: CH1PEPF0000AD7A:EE_|CH1PR12MB9623:EE_ X-MS-Office365-Filtering-Correlation-Id: 4ca5b3fa-551c-4468-0667-08ddc29908d4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|7416014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?yi9S4MRGwOxpwdcAI2RYnCQn512JLlFMRJTKp1yUfoMmIJYst147MTFfqfZs?= =?us-ascii?Q?FDxoDr6dV53xDtM3W/o503yBOOyICFmIzBzkdUE8tyGtIIjE/wTujDwBpy2y?= =?us-ascii?Q?aPskwHQ+HlQH5ETj5+8WFZihzlEp5a+oLVJ1USEaRo5arETG86vH93756eDS?= =?us-ascii?Q?lFGuUbEItdZXRx9HrcUyZ10pNw7WB0LA8b3tqgx0JBPMYqnbuKtzP627skjf?= =?us-ascii?Q?+y4jUgN0Jtx7ogexowX/8+40udsMnNLvO+LmgZamaZMl2zcI7WKQrjiQ4VBv?= =?us-ascii?Q?l5XCi5TPHG8gSWlCSze/wDjvnaJY2247OlOP4Khb6FeqQ3Z9YafzvuSGu3pF?= =?us-ascii?Q?Pz0mWpFegFNxpZDCFCO0bd+ERULrd6C9Vzk+I+9RjUKCXCZ2LOs569al30VL?= =?us-ascii?Q?JpzhUqLuXXTmt9zvyC2xniAkZQN8OzFNoXA8mZNwXcPAVxjdHTlaf4uvGk8/?= =?us-ascii?Q?qfQ0Z4TBMO0lkNmXLe/0SUStr5PeE40ecOYkIE7ebRxfVXX3K/lfMWMg8gqe?= =?us-ascii?Q?i5IsXPSKfeLvrgHX0+5A6GE1BgeLAIyluXL7AkfzDI+YjoCM/xEHkLyVZbxi?= =?us-ascii?Q?KyIvvgfNLrciZB0mTqYRNgGVhi2/e/7RYdKZe80xOzbXS/XenJ9BYkqEt0JO?= =?us-ascii?Q?OwujVlv1dnoYDusHfVjnokQaivw8CFjYJ95aILOBhL7A12moco35c5/vt+ie?= =?us-ascii?Q?xHVHTa14Oitr9pUBGi1MtXTVGA+rcEyRAW4sHaKLC6IkJuEpGcbrJumiIfGS?= =?us-ascii?Q?Yr6ySVb9c/7qEzEdcvvAF39X+ldpFzjEP9Lxx2DDdeNqLmFF8frI7uwv/vw2?= =?us-ascii?Q?xALm4NocF8/jXmwlJeLYxD+GlwtEvft+UCGUNBXuVHPYeBagEEf8Cxxr+ms4?= =?us-ascii?Q?Zvk9XiKva9LAdJrp3WH7xNHFw1d+qXeJ/gY//0oY5EGNeguoDgEB6H9H7kOu?= =?us-ascii?Q?80B1zuvKxtwFPzuUTjLoN3c1v1Cr+cDDwWV2YAGHz3/OEiU7hid8bBUUGAuw?= =?us-ascii?Q?aCljioJpbD794tvdC8R1sRra8wWM9QrWRKiIkkbDm6FeoDUwwHv96Gw6InjV?= =?us-ascii?Q?HzPgAsbfzbjd+dYgSpVf7/eNPTyvBNh5tnjUmKxsHopep+2TMGY0Tn2CXTxI?= =?us-ascii?Q?rM/aFuboRKpsqzs5pojXGh3w68i+72QYlrQhC3k9xYcSRI2FLsueepZitVlH?= =?us-ascii?Q?wPBboc99WhTMrc8EoTJJK3YV7+xKg/HE4wNtxZ1dUrGTX/7E0ZhFRkWrO5Bm?= =?us-ascii?Q?cllxmWCxogYayj8RS8oBDAybhvq74wkL06NAL8v0za5srwbknnqLmeqbBr96?= =?us-ascii?Q?M359Lt6cRYoHLahhq0+PKxSrAgfbfjtwnGehzcZIX67RWY82ZGB30XG09crz?= =?us-ascii?Q?J+zIkypY2oG1legWSUIyyv2hF5fQ3jmEpih4lXjoTiNHv0/rTU3VZq+34Y+O?= =?us-ascii?Q?Bx8wn9+gEj5rLcutH8FZs5ade/Ee51bebQL/acOpPQXNZ/VYBPT0KyzlMGHR?= =?us-ascii?Q?epFAGSfmwcRymVaee1GFm4k7K1uWXZFQXsXN?= X-Forefront-Antispam-Report: CIP:216.228.118.232;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge1.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2025 05:41:08.8811 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4ca5b3fa-551c-4468-0667-08ddc29908d4 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.232];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000AD7A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH1PR12MB9623 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 --- 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 22098c852570..2f9fea076c00 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 fee323ade522..cc1e134f9734 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -545,18 +545,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) @@ -782,11 +790,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)); @@ -831,7 +838,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: @@ -848,7 +855,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 @@ -1121,7 +1129,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 2bb32082bfcc..78159a5e7bbd 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.40.1