From nobody Sat Oct 4 19:15:51 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2050.outbound.protection.outlook.com [40.107.244.50]) (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 584242F0673; Wed, 13 Aug 2025 14:32:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755095528; cv=fail; b=RPvu/irQ/7tmpH23uDMFOijh9kNTgBVdJPtS0tqoy75vmTmBoI9JnpGapVVQDu8UY7cBnn2tFxG0YvBhBpFGoWVRF4enVLokGoude8uonM8g/GDR0+c2MqeKGmPyAFQ133akEx4a0Om6Pf047b0PmSjRdSXXSBEp6B8Skf5Kab8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755095528; c=relaxed/simple; bh=Gue3iud2GRRdan5byNrxNuF/Hl7Yyw82lfOcJu184RM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=R24UomKLHVxXslQYq3Vt6+R/hU28TUSI7v/iopwBVDabO6vtyspZpUnJ/uJ9JNb0ozCnvz6UynUe4GwZEkyWl5ZxiqYiFpNGQ1KhmPcDTrizk4zt/lwuyY8OZRxBpgK/QavcB3//zT8AH6haSgfvRiU5sFKDcDQl7vRXeNmegDo= 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=riheHJ+i; arc=fail smtp.client-ip=40.107.244.50 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="riheHJ+i" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=r2xzBhrTgd1xqcuovWt7igqi4Ae7M13C2Ca1asCDyL3LcunlOwmzAeuWTh2XYP/V3ygkMt3wuQkJ0KzHZvOUUSuRrBRPd5AaMxjxGwDXCysBy03H4uR7xc2UBWyJRtPzSbRO0c8rKgBz4ngACOndyasn/a98dDI/xZXu1KQkECAzBEv2WOiJ9ChHjmPp1ABfJJ6Yzp6eY9j/LjvxK7XiqSxFKaVJIRmRuDWjqRidoECGAKbS4u2yQ6LGHTMFpvi3AGmvLOer3Jg9sF1QlmRW5XCirmVQE0U31sQdY4dC/QC25f2fINTOzRaCulPLDRglQL/iZjVg6BAkiPIGzwB/uQ== 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=44hKiA114csYRqAzqNq3GaZB4v9j/6d1nsGhor227/w=; b=n11hzMJUDFh8TXaemoX65KA4ZhWrpRD+UPcHlUg0/AJyh3Tzjfs4X/lodUTD/QrO0C/wZq2m7dqiWJnm/hKFgaBXicUlMEAbtR2C1idFxcNFOJpFSVFdYGEK9oYJR8Yr0dCjNTjQN5rKpmj7Mluqgmr2bBu4lbqkkFWe0YWFj+5y0LkHsoHb3W9kcU/l+S9vM6QwhH+AyDCBmR/xNAgR1L7NsSiN8Oe6dVkYFstdZAFw+455+C7Ehgak+0X7Zrbh+3n48kL8hMcXCqP7e/VlbR3XvXJYF1e6B90OmtUc+2V1nymtAQi+7y/je8tjefT189m4dj4yQlh4l39B4pAYAg== 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=44hKiA114csYRqAzqNq3GaZB4v9j/6d1nsGhor227/w=; b=riheHJ+iL9SSu6fUoBp6aEU48Sdz+/3H2oxT2id3Zz6LKi+BXhkygScMSUY4rbRgg0e+k0cu/6sbKzQ5P6MeNeGgcM625j3JjfX1+PG8jI/w7NVTIjxqaUGwYyXKLY3rA68V3q17tm219T0rshrKMXThoVcIcW0v3n0SrM+qXW+tPBiw5qhrFnfYLmzaJYWP8L/K1i6rdMXqaAyxTHrGHpGtbs/HoU35PaCTAKMS5IoOFdUp4lhgISjcoPokaQ3YM9lxCJ2yDZX1pKKn6K8YJHz1mzner74h7DofIzizMptC0+eUcPBnzUGwKKoar2vK107kBCs7aOa9WsXyVedQrw== Received: from SA9PR10CA0015.namprd10.prod.outlook.com (2603:10b6:806:a7::20) by CH1PR12MB9622.namprd12.prod.outlook.com (2603:10b6:610:2b2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.13; Wed, 13 Aug 2025 14:32:02 +0000 Received: from SN1PEPF0002636A.namprd02.prod.outlook.com (2603:10b6:806:a7:cafe::f5) by SA9PR10CA0015.outlook.office365.com (2603:10b6:806:a7::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9031.16 via Frontend Transport; Wed, 13 Aug 2025 14:32: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 SN1PEPF0002636A.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.11 via Frontend Transport; Wed, 13 Aug 2025 14:32: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.14; Wed, 13 Aug 2025 07:31:44 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) 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; Wed, 13 Aug 2025 07:31:44 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Wed, 13 Aug 2025 07:31: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 , , , , Gal Pressman , Dragos Tatulea , Daniel Jurgens Subject: [PATCH net 1/6] net/mlx5: Base ECVF devlink port attrs from 0 Date: Wed, 13 Aug 2025 17:31:11 +0300 Message-ID: <1755095476-414026-2-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1755095476-414026-1-git-send-email-tariqt@nvidia.com> References: <1755095476-414026-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: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636A:EE_|CH1PR12MB9622:EE_ X-MS-Office365-Filtering-Correlation-Id: da8147fc-a345-4ff5-ac36-08ddda762a6c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Z5kPcAXpoHGHlboVG7pciEPlDLSRgzgcFpmrHtm/ZeGJ7HxKif34BX8EaIO7?= =?us-ascii?Q?BuEA/AZsRG1ReUZmfwNqMTCeKLaqltfmJbuDZqYNUPmIkDCgIr6PS3DlqEYz?= =?us-ascii?Q?6g4SmdOTL+eKELTT2vOxIof9iNEIgKUQupTvu6D5XQVuxogPU/+X+4uOl0yL?= =?us-ascii?Q?GZzxXcg9+31Db4QK/8K3xj1Yx8xQcvPioVONg6aXvTUBt9aQH7WMrifQwF/m?= =?us-ascii?Q?txRmyIQrBjRmWU7la12N8Mh/KatcVjVgotQHYyp4pg1TsU6edIlgfUTfYrPW?= =?us-ascii?Q?ffsImXfYs3wtqMzrzTsRHBiCgknvSi7cg4k35TfFnu6ZwvNLJRxiqgDbAiNq?= =?us-ascii?Q?/bB0+i0OsX7v4YX2/ehp1LVZVotJOK88DnJ3D+sT+Z8RpIIKr2AsZgRfqr6/?= =?us-ascii?Q?InPUx5E1qTmiCrSRyznupD1mRauITro3mj/BG2coSF2LesHfV3W7OS/Nn3qI?= =?us-ascii?Q?BQTb08leSQdPi4Otlt4ZuAL7oA52HiaTP2S7Sdn26q/yz7Gp//6LlUc3UpLX?= =?us-ascii?Q?jsyFBR5yp2T/rV0c6BCyAS9FkaYDiNCgjBdusJ2lk4Bz7fQA7amwxeY5K5q1?= =?us-ascii?Q?GmPkg0/FoVBLkbsfinQAqdl3xAeODxPuvF+egnbtMcpcGmnoQjZ7ZQV5RVOa?= =?us-ascii?Q?t9TZjS239eNp0Ue9lhZlirg5ES5EuVkCgO7aG0NZ7rr1o6ozVEsjAFrirMOg?= =?us-ascii?Q?SorUFzL4+tbNMaalHeTge5UrheNqcjqj/ijfzFvzXcbSFgxBWRAIZOoId2sL?= =?us-ascii?Q?QjiSDNIcJhiba+9yqX73nZLYm4uDTk+eH3pOhONMezrdO6e3oEBFiHvMYcgF?= =?us-ascii?Q?UNhLAR5rWOx/umBMszWI0xjVC724z8QRKxgCiMLq/BmhY+9kZ4c/oq0Mlvvy?= =?us-ascii?Q?/UGhBQGwh75NpGAWswqDDAm+ki+P4CTybVR4wl+IqLbUrdO5M/l1ozIuMnLd?= =?us-ascii?Q?B20qbVD1Gus8uB1EZxy54qHOWMmv8TmRzGFx9HABD7XjNTAfV0jSYe8rsWA+?= =?us-ascii?Q?H1OGqQs0KiSC9jLmaQQQT1OYfi8SatChj7y0xDgaOzd4QM+4GraxwJL4qo11?= =?us-ascii?Q?UBhDOkVfrkml+GmWsnkcnDVEQ2w2x0RUsxZa+f7Jew0icrzlKIH6ZO+vtceK?= =?us-ascii?Q?R6H/Vc2pv+3icEq2mBHzkrTbaiJXqWDxcgFF76NMQRVTMAnJGml1u0ioJzxa?= =?us-ascii?Q?MCuEr+icR3JgLDmlOP0hE+T7MYjrS+sTvUpIW8tg0ejC4v5JJ9fD1HLNHB+P?= =?us-ascii?Q?rbICcQzUXWppfW1HWuiM2/nDoCz7zxzKF4NC/I4XK+oWnvdSfVLqN4bnCGVG?= =?us-ascii?Q?PbtjOjglxtUVUobLeo4z3b7QHXPjRF+2mKOOtkHTJWvun3i8xXVSUN9bMJxm?= =?us-ascii?Q?Q3UY+rmEt8dVVa9S2ecgpZXtidWoXCn0ZHwwlAHzXGp05rA/qxLnCMVu2AQo?= =?us-ascii?Q?w/eLNt1s0+250uA1JyCp78MpyqlylhGMe14uDGND8ISqc6BkwaT+vkw2+Lkr?= =?us-ascii?Q?B5QgWjCKJVc+OTeCP1xS5WcLWrsvf4bCbPyJ?= 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)(1800799024)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2025 14:32:00.7525 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: da8147fc-a345-4ff5-ac36-08ddda762a6c 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: SN1PEPF0002636A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH1PR12MB9622 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Daniel Jurgens Adjust the vport number by the base ECVF vport number so the port attributes start at 0. Previously the port attributes would start 1 after the maximum number of host VFs. Fixes: dc13180824b7 ("net/mlx5: Enable devlink port for embedded cpu VF vpo= rts") Signed-off-by: Daniel Jurgens Reviewed-by: Parav Pandit Reviewed-by: Saeed Mahameed Signed-off-by: Tariq Toukan --- drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c b/d= rivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c index b7102e14d23d..c33accadae0f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c @@ -47,10 +47,12 @@ static void mlx5_esw_offloads_pf_vf_devlink_port_attrs_= set(struct mlx5_eswitch * devlink_port_attrs_pci_vf_set(dl_port, controller_num, pfnum, vport_num - 1, external); } else if (mlx5_core_is_ec_vf_vport(esw->dev, vport_num)) { + u16 base_vport =3D mlx5_core_ec_vf_vport_base(dev); + memcpy(dl_port->attrs.switch_id.id, ppid.id, ppid.id_len); dl_port->attrs.switch_id.id_len =3D ppid.id_len; devlink_port_attrs_pci_vf_set(dl_port, 0, pfnum, - vport_num - 1, false); + vport_num - base_vport, false); } } =20 --=20 2.31.1 From nobody Sat Oct 4 19:15:51 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2042.outbound.protection.outlook.com [40.107.243.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 07F3D2F5467; Wed, 13 Aug 2025 14:32:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.42 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755095530; cv=fail; b=hlflmpsfpXCB38WbRe3ufRLyjcNw7USSh+CrTIulhlBImDk8NgXDY+OSbkayOTGd8EgSHNOu+SEXimFGCfsrQlzr6y4hQkBc0C0dovQzliifZ7AV0D7XkBXlx4ShHXrBJMwmHQi0sOFg/XE81eceatMCBrT3vIhJvVKZreQTOMY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755095530; c=relaxed/simple; bh=lOV1hJQfGfWvQKR/O4v57DzJJ2AIs0sCUIozrUJ3L1E=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZDXp3yYxscK5+YoiviFYLkPZdtMdrBfbOqErPsK9WJ9EuJDqmspnC+Q327PeY+O2sAMdRHFRqR1Fu3YVlp3buEyLwpgDv6BCtZmqwnq/ZbauKJsorhRrF6iJEUnjY+QmR3R8v/d4unjslqI9eqqaVC/iOWPNWiPg6J/sREoG/W0= 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=Xwel58V8; arc=fail smtp.client-ip=40.107.243.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="Xwel58V8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hVq0gI2UKF/4eNfZ0W+gknkga51M78IxO0FvIUKZNKZYIK5DbLvX5ob47qv4R2YOrJMR6lkACJu2MrY0ahg2TpiVeBRbJ2jtxSvHJ5aa/9W8KEt4o3WmS9DQLhywQ/Kx5iNuJGIVAKcO6bLqehVpq65Bq4zaEjGgaOh5bA9aiOJUwcmIQTYOSQsZNU6lC/gd9lPpdqs1IfOE5HbM2Qq88NnBYPGT92A0Et3312QFprOlFd0GzBBRfcUTM9peFGYyVxD7vGLMlu3fcHbOgXLTdTBbHVP340KKaTAmc/7mYNRBJt0zWi5BkCkd9OdOSQV1gw6fO9UfCb4tZnS4Vcv7/g== 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=vVpOt6uG7AIVl4aSuVKifmtjpaTNvixXv7sfO2+ianY=; b=sLqA7yvrLPfKz6x1w+Rr7YbDLucFYkPhG8WWG2h36y2DaHUwRPbNlgzMD9wwiSVdMz9km/tF6lRb7Nt6rfmD4Sr5evb9mvcjQeCaueVNiA4PqbXb1FMjQQYT/jbzvo2FgMDJPNW3Ou/gXotJR9vorsfcnK2OIqr36M5qqltv6vCXTDI4W+AJlnTxr5KV6NSiWRz/143s2xmMCMCmfiMtmM3l6UVPT0eiVdYWNcjYp6hCtKFgxScF3Cn6bc92EEeDEz7L8F/KaJTLJdZQaIwLIb0nDX/2rafaLQKWqdbBhQEfineq+t4CRXulWl+9L6pxiktUftTwN4uvF5un2acxgQ== 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=vVpOt6uG7AIVl4aSuVKifmtjpaTNvixXv7sfO2+ianY=; b=Xwel58V8RSoudK45Ml0Q6osTje7o/RO4mC/XC7vGke+bCcE9XSq9Ien8s9rritOxHEMkxbTHpEmklwThj9NGMzD6h1kOggRdCmTv3n5W4dfAiUNaqfSiGjQnZFnVwMEL8lKYFeuoApu75mwo7NwiAnmWSvVh0idyb2ChwbVzquZI7oSAtRtSBdjX90O9mTc8LdlUZDbhGYUrFslBWufczoUv9hPjXhXHn8WBfL3T0pOpN9cERR0oz9LN98dRU4QArJH74BQXBPO1ZdLnKJWyVIbVB+JP+24rnwuR5fJgYYL9oC4wfZKGwAdFBP8WkxKZW1vlOXLCFhrZSvUcELxOzA== Received: from SA0PR11CA0209.namprd11.prod.outlook.com (2603:10b6:806:1bc::34) by CH2PR12MB4103.namprd12.prod.outlook.com (2603:10b6:610:7e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.16; Wed, 13 Aug 2025 14:32:05 +0000 Received: from SN1PEPF00026367.namprd02.prod.outlook.com (2603:10b6:806:1bc:cafe::5e) by SA0PR11CA0209.outlook.office365.com (2603:10b6:806:1bc::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9031.16 via Frontend Transport; Wed, 13 Aug 2025 14:32:05 +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 SN1PEPF00026367.mail.protection.outlook.com (10.167.241.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.11 via Frontend Transport; Wed, 13 Aug 2025 14:32:05 +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.14; Wed, 13 Aug 2025 07:31:48 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 13 Aug 2025 07:31:48 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Wed, 13 Aug 2025 07:31: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 , , , , Gal Pressman , Dragos Tatulea , Carolina Jubran Subject: [PATCH net 2/6] net/mlx5: Fix QoS reference leak in vport enable error path Date: Wed, 13 Aug 2025 17:31:12 +0300 Message-ID: <1755095476-414026-3-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1755095476-414026-1-git-send-email-tariqt@nvidia.com> References: <1755095476-414026-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: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026367:EE_|CH2PR12MB4103:EE_ X-MS-Office365-Filtering-Correlation-Id: 836d612e-87bc-4d38-3ca5-08ddda762cee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?WMVyu+p7NilZfw09sjYQcY8h0VNDWaVVWws9JqisFpTu/SEUY3XC9Jzf2pH2?= =?us-ascii?Q?IUHRHhQhc/eaogD1gIIG2YM1/6EZs4I5vtX4Ewk8lzab8ui0VAHSrjk+rMNU?= =?us-ascii?Q?puBIyK1AGKZuDd7yaES2QbQ+aA9O+1RkBHL4dXen3WrybjQWm19i62Zq/AOG?= =?us-ascii?Q?veoeGaL5aPWWDL3dzj+lrNT//n2owMjE+0rxIINWIcYQwd/l9U4thxT3TCzU?= =?us-ascii?Q?3l8swPwLsSL8HeNWBkDfD71PCH9K+8vf+ejjDRl4koJCwEjN5ivyuhpAKhAo?= =?us-ascii?Q?R09ZO5MbLDnwKdHcPWqkr/GklPytgLA1Qlhs7E2pdmCxccgM97ERCUCbAmAo?= =?us-ascii?Q?TZX4h17LZ5GyoJuBEj036/9TcXUCSaTE1l5QMH1CJFux3QQyeU1znmi7qGge?= =?us-ascii?Q?e76Jb5fXxZxFdGOclhac8miSL6fP87NdjT9O0tbb8dbmKBsvaTtxmzx4iWNK?= =?us-ascii?Q?GThjLjm2OOJk6EA/F8VC9+9N48RArr/6Lyscdmwj0HnXoIUcy55//r6Q0JtN?= =?us-ascii?Q?QK59f80PPkKGYL7XglJvDkMq8fAkoRHhISw5FCsBwE9cW0QHmULL3Bu89HFh?= =?us-ascii?Q?QMEurtRuSxRCDBas1BszzrgqqLtNpMpD4IuHP5r+P4jAX2T8NJfSLN5LiQiN?= =?us-ascii?Q?GbfLUgAcnhNBvw3FRzk1ZTTYtsCfRYr9lDRF+pdrN2V5KCv4PxalxdY9HKky?= =?us-ascii?Q?7xGZaICw18Gy2FEOGHfb+93MpfnWwSinq3xgwIibgnFkWxfDDU33GtClvpWH?= =?us-ascii?Q?nSM1gxEVPVMKJa+yKVztS5Ihhh7l68d7rOGM4OMVoOjIh9aMjBKhe6meAF07?= =?us-ascii?Q?AVS0ktSw7OjIg4B1PCMkpMLhd/Rive8mli0nKgbNjym7qIzQYivowzz/iHde?= =?us-ascii?Q?uGCazHzZXGNpIQgQicQRGnbvZPZ0LPVFIAMvgTDVDIBBnXlb/oJpnCQsZNip?= =?us-ascii?Q?Sw8uNexYizBqQos6YInL6HBoGIj9Y61NeIrQinnz/qVaGSZNwvtdMIy2FaVO?= =?us-ascii?Q?aUOE0eWjHv7j5u2rHi+zZWrs8yYAntVRKFOjJNTnFtRRiP7xPgfUpyyUxG9x?= =?us-ascii?Q?KEu7b5CIXfl0ZKz3k+nUk2YA9Hd9hWBrT7D3WFmpNdBFnZVFYvh7upJP54LE?= =?us-ascii?Q?s7PmSOwJyT+BhwXzhGXlMs6iAB2FI2Dwheeo2GDivwtANjCqM/m7Ahp4BkTk?= =?us-ascii?Q?Z6ePVZrU5k/aAIpevgQ/WEyS8Jg83eN+DXFHPB4xYr08DCbnEPxQRFEvzFRh?= =?us-ascii?Q?35iS5EaK09lKiu6FhJ33XFN9LA8D4+6ySW8wxDvHstMF/cTc4Qpmt34xv3jH?= =?us-ascii?Q?gKDWZyF7Fabpg5T17ZIkpemiy5+GXuaAtjlscZKF8Yx7cV0z5n1JsHxBDqZ9?= =?us-ascii?Q?EnaUXfYv7o8loyrjltYJqgI8p5Xi02y+KOskkisOQ9mh8lSMNZT6DHSKKYfO?= =?us-ascii?Q?bO8SQVJh8GbU8yVfzb2wv253v2y2rH2BrGYuw6qheuJt+5Ikn6UlYVxSi7rY?= =?us-ascii?Q?szYcRCPBkQifgP4rubKpKLLTtsFwODeojJ1e?= 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)(376014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2025 14:32:05.0000 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 836d612e-87bc-4d38-3ca5-08ddda762cee 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: SN1PEPF00026367.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4103 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Carolina Jubran Add missing esw_qos_put() call when __esw_qos_alloc_node() fails in mlx5_esw_qos_vport_enable(). Fixes: be034baba83e ("net/mlx5: Make vport QoS enablement more flexible for= future extensions") Signed-off-by: Carolina Jubran Reviewed-by: Cosmin Ratiu Signed-off-by: Tariq Toukan --- drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c b/drivers/ne= t/ethernet/mellanox/mlx5/core/esw/qos.c index 91d863c8c152..79d6add402d7 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c @@ -1141,8 +1141,10 @@ static int mlx5_esw_qos_vport_enable(struct mlx5_vpo= rt *vport, enum sched_node_t =20 parent =3D parent ?: esw->qos.node0; sched_node =3D __esw_qos_alloc_node(parent->esw, 0, type, parent); - if (!sched_node) + if (!sched_node) { + esw_qos_put(esw); return -ENOMEM; + } =20 sched_node->max_rate =3D max_rate; sched_node->min_rate =3D min_rate; --=20 2.31.1 From nobody Sat Oct 4 19:15:51 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2069.outbound.protection.outlook.com [40.107.93.69]) (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 2CF4E2F49EF; Wed, 13 Aug 2025 14:32:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755095533; cv=fail; b=i6+w43fG6ZeQ11hlJtHVKOA81iNHrv185DFKIPyCtWEAkb+APm8rfXWuZ53oa79trRpK/CPpmNvJd2sa7fXs2qaqPoI5MVPO8CAsWhoyktkvBLIadXz8nOAcXXXeiGir1jR8lP51udbeQdXIqOzzK16GjItPzyuo/aa4nYQBlDs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755095533; c=relaxed/simple; bh=PtbRRw2C2HoinmwVI6t7kMnwEy8D2AuiZzlT8FtvzM0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FhPf870wVBfhQtxxPcrrWmrqjtlmwM8nWHAeuf9ZVmqHvQD6esf9caUb0ziwj9COguPkIwtYtxIyngj4/FXnBtLSB0Y7G34WlAu7RZ444sC/fGn+BbwtQBUD4MCi8DVWI/1pMVVkmE/8CZHrwRlRXN4V8jXI0hfrDKu5/kYfMr8= 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=XzHkgja2; arc=fail smtp.client-ip=40.107.93.69 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="XzHkgja2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dNRLclS2jRUSnwB1LYhrKSRS/blrjgfdtChJepuoImEb04UH11JdPqZt2Jnyqpu2uGgcoGnD5f5e2NIHjIMm0CSr9KWQHZR4updfAXnrVgFGiZy+zCxjxoJKm0Z7o9VRAMnuy49vQ7UnHYATA0szvdkYQ4ywokSteJOPYWHZX6sMzas1YWicQvbnNlpShqQm2A2qijFS6SOcND2+ZXbndL8Z/EbZf3TUDQOg5pGLn80LQ+qW44ZlSOs/NCa5H0snO+da0ymViWrCZZGp6PuxGb0HVUofIvG6PrSMTi1S2fLXjBikFcYN37EQVyZbfJAim3eG2gCXsH6Qv2XxwEjMXw== 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=g8xtoniXDLN6EaU1hL9d0pN8jBkQE73KaWN8OH8PiGg=; b=ebcY0NVGVsGPekLApA8i8Y1Cq+Ao8C1X4P48W79/VwuPxeQvp41FmJQ8CNKT4FCMiIyS4NDcTYYHZF6k2Ppua57Iv4dxILqD2qRHhttjy0ZZEy2ORoJGC2jtwaZYHFYsPV/6LUCZnawys/t1h8HyYiE/fahMEF0jhj1E/jU2iLWbCcMyJydWu+DOfFdxvVo6kya+Elafy7PC71Q6/+YnerP8jqmO303zLnuUd5qG/DfOHHOSsmnu+AJDXS6NnP/nbUn9CIQhTPjeAoKz3VGwcsCufQeo7xT916EnyYpQD2lWYhVgIaoXvE5s4BxCX2lUmBVweVqioP8rwpOXGEMQOg== 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=g8xtoniXDLN6EaU1hL9d0pN8jBkQE73KaWN8OH8PiGg=; b=XzHkgja2jH8A+I+CNaKY+bM+PVTsBkwnmrp/+gZP0E3molk/PJFnqwraVtlGRZ2+b4t64aJuQKFCsnBB1pn1/6sDbNPs24CfVmEsERyH20zaXE0XpPHJi/G+pFyq1VZ0ZyWBbcPHNRjFetmEtzQztVycmouN7xjMtLTkgSOQW844xI4hHoognlcMhvE92/chmIGO/s5Uaqji7KA+fFYKTARafaksG1hMFJVdpkWsY6UdWlqldt0xH9e0j0pRvmuAEEsxNEdRPtLWWEzy1I8jpHj0zOADliPC2yI5BlQ+6b4PuXYWfwGU9/nX+en+VwuppZMrAd9YmXy3C8VkOfONyA== Received: from SA0PR11CA0038.namprd11.prod.outlook.com (2603:10b6:806:d0::13) by DS0PR12MB9398.namprd12.prod.outlook.com (2603:10b6:8:1b3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.15; Wed, 13 Aug 2025 14:32:09 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:d0:cafe::a1) by SA0PR11CA0038.outlook.office365.com (2603:10b6:806:d0::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9031.15 via Frontend Transport; Wed, 13 Aug 2025 14:32:09 +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 SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.11 via Frontend Transport; Wed, 13 Aug 2025 14:32:09 +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.14; Wed, 13 Aug 2025 07:31:52 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 13 Aug 2025 07:31:51 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Wed, 13 Aug 2025 07:31:48 -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 , , , , Gal Pressman , Dragos Tatulea , Carolina Jubran Subject: [PATCH net 3/6] net/mlx5: Restore missing scheduling node cleanup on vport enable failure Date: Wed, 13 Aug 2025 17:31:13 +0300 Message-ID: <1755095476-414026-4-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1755095476-414026-1-git-send-email-tariqt@nvidia.com> References: <1755095476-414026-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: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|DS0PR12MB9398:EE_ X-MS-Office365-Filtering-Correlation-Id: 163b0d40-ce37-4cb6-6341-08ddda762f69 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?sn8WQgNFTkART1zhZirDTQLb2j7/pKWxf6e6VyAQ5C+HvuDJcq9/WmuyZRAK?= =?us-ascii?Q?kibmmPUKIbcrICQlWtRmbrEJUpVAVfc1j+BQtjybLjopp2O1dwveiJz9nA0R?= =?us-ascii?Q?UG/kBTtov+EqbkDA+qMbLBzHgCdTC57jjLXj+C6qlnRYlS56Ceuf2z7IMX+A?= =?us-ascii?Q?ZYiBX5MEvxpP6HoCjLxWp4ZYXBbOx1V0Op3RW2PeEZK14b/GMx6cQnQNu1kT?= =?us-ascii?Q?FdOG7MCSQnvXAZbgKghAJpbVg8YZugbBrq8kgdpBy9EGB+MMYX5ZeNVoQbAK?= =?us-ascii?Q?psm+OAHwp0zrMOuM0s4ydU9TfOBkY7G5TOx6KeBmiPaJ0nJihGn1ypJ+XpyS?= =?us-ascii?Q?Cy9CCdWAyLu5dkyoquROSktMcfjq+Zfh6WsK5udvGU7GAtYukcU7l22pPNK9?= =?us-ascii?Q?jXOrUS9iNp9ChZbR27DGcFjjnMk4EQpvc1i0WzA5EQ6Obj9nDu7YYthcnL0r?= =?us-ascii?Q?bB0fLa9bEWIF5QBXVOpyS3zaUOOmvVlCB2rzwftl4+pHmGaOXM4XIHa8txUz?= =?us-ascii?Q?NGyv/hv4shf9zXxgyDlOYDAouzXYo5aBQX1enCK5UA69cKHAJduzYW8DiNZd?= =?us-ascii?Q?UmbW5WkmSR5Xg/PauOcV9uQ+TTg5Fz0Y3I75AVBOLagWKMzLvGzSdt6AQsIk?= =?us-ascii?Q?qOTssQ6k0jVnHE6N1rg0/uMyWTw1jhPHcQoHyfgzHZla0oMLvFD7Z5K13lx0?= =?us-ascii?Q?dOq6/8UiZDtzPxVWlkSv1wBvRQrflp3Ddx1nqrWqsTc2FlS8CwPKdrz6yECX?= =?us-ascii?Q?3byxkZyPc8IpFszcfJNIQmyfQWrHlEoo5y53oRtGBZFqMqnE2duF8381aOnp?= =?us-ascii?Q?wKIi3Svy/JiYdkgRTRevSP8BHjQ44GsBUM55gclnRSL4na9PsXM+emdBdrmx?= =?us-ascii?Q?DKkEgS8OdnOowoHNW8rFTN3cggPTMo9f3uTAbSwK+LD2jd/sENoDwOthXTHQ?= =?us-ascii?Q?vKjH+Mg1Lql6LoFrwlQAGJFl4xuTGAzDpdSm0unSRh2O3eNUpI7/f7z4SYxk?= =?us-ascii?Q?NgVGgm4hoqR0iXH721lMgAedXPTwZr0N11PLFDxB6hvFGvs+s9h8wbc1W5Id?= =?us-ascii?Q?+6laLtRz7FznHIr5K/39mSpjM0LNwqShQWjfIOQh4pldNsdRjanzLp+cHxZX?= =?us-ascii?Q?hD0BibenkcA5RM58f7eJxn/MFQ8vEkWSwEpbZMXPi0uJq5x+fgxkv2CU6FIB?= =?us-ascii?Q?FqP2wbO4vkR/E1SglsrwFFvrSP4I2RS0lGj+q9v6PhVZyU4NCtjNWfBq3mTM?= =?us-ascii?Q?db/02YKZ2VyhWbQMxmzJ8bnCGqLwN04zy0PDO/L6AsEvi4WxrSvII2ntKOZ4?= =?us-ascii?Q?blGetUgAP85q08IIYz496MaIuUWJ56i/L2H53XU/OXtLA49CWDc9fKi9OgoH?= =?us-ascii?Q?Vz8x+FVAwWwQSrgAYD25QYb9n72GL3rHoUbtZLd0bvmkb55P9Hnqm9gehP71?= =?us-ascii?Q?V7ryUAAG+BKxow+G7XyzfoNjnmEi6CW3f5jmNVhvr6t3J09qW34UqCb8YopL?= =?us-ascii?Q?eUMoxIg6IjcHe11rk7SO7/Et+jTL9pS1iBwE?= 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: 13 Aug 2025 14:32:09.1627 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 163b0d40-ce37-4cb6-6341-08ddda762f69 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: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9398 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Carolina Jubran Restore the __esw_qos_free_node() call removed by the offending commit. Fixes: 97733d1e00a0 ("net/mlx5: Add traffic class scheduling support for vp= ort QoS") Signed-off-by: Carolina Jubran Reviewed-by: Cosmin Ratiu Signed-off-by: Tariq Toukan --- drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c b/drivers/ne= t/ethernet/mellanox/mlx5/core/esw/qos.c index 79d6add402d7..1dc98e4065af 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c @@ -1152,6 +1152,7 @@ static int mlx5_esw_qos_vport_enable(struct mlx5_vpor= t *vport, enum sched_node_t vport->qos.sched_node =3D sched_node; err =3D esw_qos_vport_enable(vport, type, parent, extack); if (err) { + __esw_qos_free_node(sched_node); esw_qos_put(esw); vport->qos.sched_node =3D NULL; } --=20 2.31.1 From nobody Sat Oct 4 19:15:51 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2041.outbound.protection.outlook.com [40.107.237.41]) (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 A7B562FAC02; Wed, 13 Aug 2025 14:32:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755095535; cv=fail; b=Hm0GvLCuJkj1RMGvhTIX106pmNpYcm2yzm1dZz90DpMw/z52cOizGaUtlHzBekypAEBCw5lVcDEz79RQilSSWZXgHWgaPQX4lzeZ+dQewcNO4SD988QTSglgUd91OxTWeXnmfd1XPdgn3p38rr5DrlH+J9TdU8S/g7ydkrrA5Uw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755095535; c=relaxed/simple; bh=aGmiApPT88CyLHYzVjDKbncSPPu6L5nfrbcq/tsWztA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=njBit3TzliOTUBePOMZe/YTqo1qHLfJoJc+c+aNY3FFtHWx22Isp/GVpFA9lsOPGiPgfil1dJNJ4n4uAvwnZp5K01HUO914zHSttcpHteG0iXDML5vkUvbFm1+QBeipwOW63Lw0V93rpifL4J5h7a3A5Hj/eXpeLVFBdxCfE594= 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=q9rUlzFd; arc=fail smtp.client-ip=40.107.237.41 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="q9rUlzFd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vzDtp8iMommBNtUt0FQxtGYuQbURnKGBX+9psRfCru0FYZ6+WhIgJwtTOd/gwDyNNVr5iBvqRX4sPeqW2yLQaEqCqJW4wbn+nfm/gI/kh1IY4LNoBLx0NXJ/fR3Ud/E5pvAVz6X1qXDc/pVNp2NpIvBStwLiTN+bxUFfTnepSYw//HN+cnmXErplCR+5U/qUEYEslLs49hjHJRcV9C7r/N/MBXCNTQjaGXj3tB0Cc09UIkWFFQrnkoA9x2LTuSoVkyONsC+Tzkcn6xFaa7hg+fYuYNLXraN2sfbLNqb8gEzWpz8Q71xuh/Vnwy8fHqUeutj1MzCZ6dvicTnopDg+fA== 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=Y+kI3Ho2T+xIfTff+EwJ8ayDGvqZUXM5qn6Ak6ZarO4=; b=QBp8Dl395Z5H7CqZkfSFeRGyVWN8KBekYIlMhVFpzcx6T9SFMdTQDpTdwOTKg8RuHeKfufFJdVANQPhS9Ry9SasGY0U9HmC+Pj4nIXCOENB4PhA12ySXXw7Y9sM67vcdY7Y3ev9TlQVRyRlKUez689P1e7vP0x2esa0k77+kcVT4uFthyJ6mE91DVngXWPj1QPievbJqNO/L5NqMp33KV+C8NW+zYjaS5uLfTLF3a58xMICPyxNbtBkdNN9BLgSIMOTs3MNlkJZBWAr9+J6ysj93Dtzbx03gt/x1fjyw+U9QiAaHmBUJqLmyhVSBZ4p8HE412iHdpBX0P1yiX3hNGA== 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=Y+kI3Ho2T+xIfTff+EwJ8ayDGvqZUXM5qn6Ak6ZarO4=; b=q9rUlzFdh+Ucm2/szwGpmW+DHLmRcJETnao38zLu/aKbWuoD1ZRFwTwxu0mkBnoz5to0vy/kOq7n1kYkklveLnTpOv0rAfL3qRPBkvxnnfbKt2cPPZDXHUBznhoPB8h0YWO45Y7oPosN0cccnyHLZXjjBfX9Ce52TxrANBoTctgSABNmEmsGQt6jGQiQCLiH5hNhq4JbA3xwit/M8+PtL6lbA/VWNgo4m7uOAlZlv2Fi4v5MwRoShi9Z9PNV7mEL9XYoKxygPyFrq7tjvz963AGYOHJCMyAXUkC5rwRD/nle4NKf3aNczKmw6d1iXHR0zgTiNjeg2BbV4Pmpww/HTg== Received: from CH0PR03CA0254.namprd03.prod.outlook.com (2603:10b6:610:e5::19) by DM4PR12MB6159.namprd12.prod.outlook.com (2603:10b6:8:a8::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.16; Wed, 13 Aug 2025 14:32:09 +0000 Received: from CH3PEPF0000000C.namprd04.prod.outlook.com (2603:10b6:610:e5:cafe::d4) by CH0PR03CA0254.outlook.office365.com (2603:10b6:610:e5::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9031.15 via Frontend Transport; Wed, 13 Aug 2025 14:32: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 CH3PEPF0000000C.mail.protection.outlook.com (10.167.244.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.11 via Frontend Transport; Wed, 13 Aug 2025 14:32:09 +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.14; Wed, 13 Aug 2025 07:31:56 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) 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; Wed, 13 Aug 2025 07:31:55 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Wed, 13 Aug 2025 07:31:52 -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 , , , , Gal Pressman , Dragos Tatulea , Carolina Jubran Subject: [PATCH net 4/6] net/mlx5: Destroy vport QoS element when no configuration remains Date: Wed, 13 Aug 2025 17:31:14 +0300 Message-ID: <1755095476-414026-5-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1755095476-414026-1-git-send-email-tariqt@nvidia.com> References: <1755095476-414026-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: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF0000000C:EE_|DM4PR12MB6159:EE_ X-MS-Office365-Filtering-Correlation-Id: 22ff6987-07a1-4ec8-ac52-08ddda762f74 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?+Mm/ijmlfsxpp3T70aWMaxapVQygBIg4bzDO3g67Pm/ZMDsUDe1hgJRYhaYf?= =?us-ascii?Q?IiyksswjJ6MGwr32Ejfh/SERQnBS4g+Dja1j9o6VkXoN7S0jVZN4jP8UiKzk?= =?us-ascii?Q?jEO2DkaPWE+ZEZWgp/sjoPDrBx1xTFCXraK/2h1Z+2N/Y62Je/C7+rK2Vbzj?= =?us-ascii?Q?x3K1IoWOnwM4Y2jkDeKX72H5bhBR+v5aSVoDIDSl9uZT8syg5Ael1+0G8LdG?= =?us-ascii?Q?awsNhjNSUQNUn4Cd9yuNTQ+S8riuDVLLzhdKaDYhoKtg1d/Rp/qoNIqLrQCz?= =?us-ascii?Q?P5OIWvOevbgvfypNC5nkQU4CwoumX61O3UOn7xJbO6R7y5FhQIvDxIIfiI2e?= =?us-ascii?Q?dWHhAo1W5z/1YuLF4wtFl/YXQZt0biS5hv8RP5kZQAAbaO6eDXhyQ6lwbw1y?= =?us-ascii?Q?SQiY+0Xw1Q5jzpIuZtFRrmt+SnuIDXI1kJLmRRsf3QvFJzdUG0+6z1SFqAko?= =?us-ascii?Q?5OxMwN1kn8Jxg2S2e3cEeVPjgGhO3zMuFlzTXNJCyfsLd6KyVoeWofrE1q9Q?= =?us-ascii?Q?J1/kMhHjreVqm2Ld4VkrlYrTvD7U6FfYUyLmusyjME9YB/xl4Co79cL3HAUd?= =?us-ascii?Q?UEeFHNivERmgXsrdvMYcqyLixFcJyhYM793rwNXZN0xNvy7HJ5Coocw+Wvfg?= =?us-ascii?Q?mo8RSjHRdX30sILdsQMxzkdb3O+43aVJXVGBhh/zUtFLJh/x02R4ns+uYuEF?= =?us-ascii?Q?qpkPN5PmfB08oqj13pwg9bsrQKgoXnuszyzxn1ldiUjESnIyDXDyNLwp0M9t?= =?us-ascii?Q?MtmucmEzX2d3+GjI2EcWvHRsdHCCBzf0Xsk++XodjotO4YqvkEt85BMJISZt?= =?us-ascii?Q?FnMwHoC4QlI7N4jvFV7+yNXWDQo/HF+dqqmYt1becQ+WhrNejuTI5FzO3rpb?= =?us-ascii?Q?guKHllqGwoQMvnCSXncvbkUFSdSOoybx/DW3QShI8MX60KmOQRd0G4RbX0F0?= =?us-ascii?Q?Z0Ibm4TX0mMLxX3flaUQYcSsGDmb9fLJHgWA/SMOuSJH/D/2hghd+Kucxabj?= =?us-ascii?Q?YxwCsq1fqAUM+2aR12UqkftVHN0Nm9uhvDb4aatJNmc77oHcheXDSV4pxXac?= =?us-ascii?Q?3hvKXrPrM6igVaim1wzQgv8+BStUrqCR/kiHpNmlRPDVJlPZAMAOJCzvZQpU?= =?us-ascii?Q?FlqNhn19EE/DJQVGU3H20pcvc7WCBM/ZRoLmaifv4hPdbQJv6Enr1ApuW2c/?= =?us-ascii?Q?2pOVLz9v0Z10TJKX6KtG3NiKbkSqFiN8SO8iU0GjafmTEcqwI7dmqLa9exBE?= =?us-ascii?Q?Ymg4rdCk5h1YwBIS6WL6oslL8vz+130YAb8MvmEx20fXuZQSgiL817/+oNSU?= =?us-ascii?Q?KVNGHpiCv5/tOF8YGH3rayN5FIWEp8I0p8fACcGcrLVle3CYbdCFi83g0aHY?= =?us-ascii?Q?RlzTEIGfsHu5hRe/3ZrS01P2h6VgyIBaT+wzuMugvzW691oONx1ajlk60y/q?= =?us-ascii?Q?BgOz/4dwS5I6C2g1AejKs/sRAOAwbCZYhb8pjAFMCR0JRy5+H6M+KgQQF336?= =?us-ascii?Q?4N1fjhp2YxQTK+D0ZeQJF//TLQ9797sKaOvF?= 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)(376014)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2025 14:32:09.2184 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 22ff6987-07a1-4ec8-ac52-08ddda762f74 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: CH3PEPF0000000C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6159 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Carolina Jubran If a VF has been configured and the user later clears all QoS settings, the vport element remains in the firmware QoS tree. This leads to inconsistent behavior compared to VFs that were never configured, since the FW assumes that unconfigured VFs are outside the QoS hierarchy. As a result, the bandwidth share across VFs may differ, even though none of them appear to have any configuration. Align the driver behavior with the FW expectation by destroying the vport QoS element when all configurations are removed. Fixes: c9497c98901c ("net/mlx5: Add support for setting VF min rate") Fixes: cf7e73770d1b ("net/mlx5: Manage TC arbiter nodes and implement full = support for tc-bw") Signed-off-by: Carolina Jubran Reviewed-by: Cosmin Ratiu Signed-off-by: Tariq Toukan --- .../net/ethernet/mellanox/mlx5/core/esw/qos.c | 54 +++++++++++++++++-- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c b/drivers/ne= t/ethernet/mellanox/mlx5/core/esw/qos.c index 1dc98e4065af..811c1a121c03 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c @@ -1160,6 +1160,19 @@ static int mlx5_esw_qos_vport_enable(struct mlx5_vpo= rt *vport, enum sched_node_t return err; } =20 +static void mlx5_esw_qos_vport_disable_locked(struct mlx5_vport *vport) +{ + struct mlx5_eswitch *esw =3D vport->dev->priv.eswitch; + + esw_assert_qos_lock_held(esw); + if (!vport->qos.sched_node) + return; + + esw_qos_vport_disable(vport, NULL); + mlx5_esw_qos_vport_qos_free(vport); + esw_qos_put(esw); +} + void mlx5_esw_qos_vport_disable(struct mlx5_vport *vport) { struct mlx5_eswitch *esw =3D vport->dev->priv.eswitch; @@ -1173,9 +1186,7 @@ void mlx5_esw_qos_vport_disable(struct mlx5_vport *vp= ort) parent =3D vport->qos.sched_node->parent; WARN(parent !=3D esw->qos.node0, "Disabling QoS on port before detaching = it from node"); =20 - esw_qos_vport_disable(vport, NULL); - mlx5_esw_qos_vport_qos_free(vport); - esw_qos_put(esw); + mlx5_esw_qos_vport_disable_locked(vport); unlock: esw_qos_unlock(esw); } @@ -1676,6 +1687,23 @@ static bool esw_qos_tc_bw_disabled(u32 *tc_bw) return true; } =20 +static bool esw_vport_qos_check_and_disable(struct mlx5_vport *vport, + struct devlink_rate *parent, + u64 tx_max, u64 tx_share, + u32 *tc_bw) +{ + struct mlx5_eswitch *esw =3D vport->dev->priv.eswitch; + + if (parent || tx_max || tx_share || !esw_qos_tc_bw_disabled(tc_bw)) + return false; + + esw_qos_lock(esw); + mlx5_esw_qos_vport_disable_locked(vport); + esw_qos_unlock(esw); + + return true; +} + int mlx5_esw_qos_init(struct mlx5_eswitch *esw) { if (esw->qos.domain) @@ -1703,6 +1731,11 @@ int mlx5_esw_devlink_rate_leaf_tx_share_set(struct d= evlink_rate *rate_leaf, void if (!mlx5_esw_allowed(esw)) return -EPERM; =20 + if (esw_vport_qos_check_and_disable(vport, rate_leaf->parent, + rate_leaf->tx_max, tx_share, + rate_leaf->tc_bw)) + return 0; + err =3D esw_qos_devlink_rate_to_mbps(vport->dev, "tx_share", &tx_share, e= xtack); if (err) return err; @@ -1724,6 +1757,11 @@ int mlx5_esw_devlink_rate_leaf_tx_max_set(struct dev= link_rate *rate_leaf, void * if (!mlx5_esw_allowed(esw)) return -EPERM; =20 + if (esw_vport_qos_check_and_disable(vport, rate_leaf->parent, tx_max, + rate_leaf->tx_share, + rate_leaf->tc_bw)) + return 0; + err =3D esw_qos_devlink_rate_to_mbps(vport->dev, "tx_max", &tx_max, extac= k); if (err) return err; @@ -1749,6 +1787,11 @@ int mlx5_esw_devlink_rate_leaf_tc_bw_set(struct devl= ink_rate *rate_leaf, if (!mlx5_esw_allowed(esw)) return -EPERM; =20 + if (esw_vport_qos_check_and_disable(vport, rate_leaf->parent, + rate_leaf->tx_max, + rate_leaf->tx_share, tc_bw)) + return 0; + disable =3D esw_qos_tc_bw_disabled(tc_bw); esw_qos_lock(esw); =20 @@ -1930,6 +1973,11 @@ int mlx5_esw_devlink_rate_leaf_parent_set(struct dev= link_rate *devlink_rate, struct mlx5_esw_sched_node *node; struct mlx5_vport *vport =3D priv; =20 + if (esw_vport_qos_check_and_disable(vport, parent, devlink_rate->tx_max, + devlink_rate->tx_share, + devlink_rate->tc_bw)) + return 0; + if (!parent) return mlx5_esw_qos_vport_update_parent(vport, NULL, extack); =20 --=20 2.31.1 From nobody Sat Oct 4 19:15:51 2025 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2089.outbound.protection.outlook.com [40.107.102.89]) (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 649B32FFDD8; Wed, 13 Aug 2025 14:32:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.89 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755095546; cv=fail; b=J94frTryFgf+AnrsCnGhL4nAQZGjaiUrKzVpJQASL9guyHgOVTrpHlYz8znVEQEzIZ+gyN7EX7pXVLBeiGSMWez9VWjPZDONxR4Ihx4uF2rIPwTijiDRw1s55g7IVEkyizC7KC0nkqmL2O0d6r3gjLAMHQW5Vug7WVM9SqJKQgw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755095546; c=relaxed/simple; bh=sSYH2XUAqdVcASWibtzTfWdeYJ6zjYzMz+EcEfCdKL4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gkpb/i/LRkLxXeGOTMFHTIJLklGLxKgc+Yd2ss8xOlFcQXlnhGq/175pztVQwPPhF/fO3BQLgYI2ctwZ7XnvHyozABwh4WuTHH8gNmjnTzPfeWBHgHM9hBzRMxzahFkUHfh48r6ApuULD/AvgRdkW/8dpp0U6ushi4hqHohBf8c= 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=ZZS203SP; arc=fail smtp.client-ip=40.107.102.89 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="ZZS203SP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=d5P2+FTasuD/fkDVRYGpKhDBKyKhNRSC5RIvTqKnNmFNBvVxhFCSz2HPYJPdJSoMAbUcTMMHdT6eKnXZ1aFPCZAxSH+ONDe9WmH3HuKtYwHbHX6xid73E1cmmn4SoVqbN7C6feYn3hwUxLq44E95wTmF8NCy8s9lVGHzSH69DaWxmBwvpZaWLXJSP+7Gxn52b9quIgdnIHfEDOaEGVwrdaD3MTzcAd6dVKojCd2THG5HtUtE5eIcY8b/71wKUbjl1wPONmHkmD0GqAdY3IiN5Qbc2mPZbSb58Fz3ghVlmppHlFpFzUNdMzMZ/1KhDvuAw+jClluNysT2rOFOIaBDVA== 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=yED1mEZrh4cDa2M7GlFr3hXzgNLglVismLwC6YinYow=; b=nSn0uP0Ep2ve3oLP8BJB0MjM8sJB1qrYy0rll8EkGZNGwLtqf/n+R6JbfD0I6AcLV2iF3QhcoJa5Ryc3/ftLqz/lqwp6SILUpriFC8oKROYYGbZYU8JtrTuMelkkr8vefFOYw0Z/D0D7hzSfZDhz/Kk5u8U4uPqgHuLSTAqsmGfYdeku8NyuBfAipCZ8Ac75dR+iyVRgZj4uQtuofjKrV9HpRXXD5XXtH27knpjhzTrTH4PpLijinDPBXGJslEFYZMgCjXRD1HGPjkUCVnng7gZkd9XsH5s3ZvVW519uJjrFR7tZpBRrcFlA6mKasRV8i+SMERIUNDKtCbF4au2zZA== 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=yED1mEZrh4cDa2M7GlFr3hXzgNLglVismLwC6YinYow=; b=ZZS203SPuBML64546hTAfU5pZMtihVQqAoiexJ90G7ZBsMVmdb5uv5hAiob41JERM+Xn5OrxEHFftqj2eEBkGnv/tZ3KlX3JbF8/nlLxlrPsiGqJLXSpn7MnNkdqz7judfNP4/gvZUO3nkd2wiy+mN+kE0OeKtJngODT+ZI+rejVUItAexYozktTebQbesmKfQRu1Inv/g+eOyd9TtGZJYSHiLQ18sdD0+1DJhb0/jG5MjxRtDBkDvisEXcBqdzOwUmgUIVazs7LIthK03yhe7EEh3YbY16YCjwnm/Kyt4ZDs1LIqqWmtveFU8E8y7EqX+LbJaRez2Omyb4AfmEAnA== Received: from SA0PR11CA0058.namprd11.prod.outlook.com (2603:10b6:806:d0::33) by LV2PR12MB5896.namprd12.prod.outlook.com (2603:10b6:408:172::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.13; Wed, 13 Aug 2025 14:32:21 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:d0:cafe::42) by SA0PR11CA0058.outlook.office365.com (2603:10b6:806:d0::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9031.15 via Frontend Transport; Wed, 13 Aug 2025 14:32:20 +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 SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.11 via Frontend Transport; Wed, 13 Aug 2025 14:32:20 +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.14; Wed, 13 Aug 2025 07:32:00 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) 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; Wed, 13 Aug 2025 07:31:59 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Wed, 13 Aug 2025 07:31:56 -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 , , , , Gal Pressman , Dragos Tatulea , Carolina Jubran Subject: [PATCH net 5/6] net/mlx5e: Preserve tc-bw during parent changes Date: Wed, 13 Aug 2025 17:31:15 +0300 Message-ID: <1755095476-414026-6-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1755095476-414026-1-git-send-email-tariqt@nvidia.com> References: <1755095476-414026-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: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|LV2PR12MB5896:EE_ X-MS-Office365-Filtering-Correlation-Id: 268951eb-a977-47d7-da23-08ddda76365c 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?PAizV9f2+UH6rvVD3YYavHEPq2D+TRkSZyN80DdJrxo+tXWNzgYUH8K4RJlm?= =?us-ascii?Q?AL6uKBr04KhHBpV/45dXR9L0t69H/wmuR3TZeqYCnqdPp1Uf9JMpk8CkL8co?= =?us-ascii?Q?OudCQhFKY5EVhDPXybbbOLyCaGKrwirz23TJU3ZUjmdjDRjtLJL2pGWg3KJr?= =?us-ascii?Q?pKLF6fH6NcEKmgb0TnUDYTc9gOO+O07kQcAEFN+ZKNm7sCFlxevR9NooZ/Vo?= =?us-ascii?Q?yf3O7WvJ6bm29i9wQUDUkmZWjdu/jxUeiUKjm3L+E52YJjqVC73XpF7R5XMx?= =?us-ascii?Q?3XNqCsHhndaaQySaWWu4CDgVLFQ98CHaUxrmcEa3aGsfvP1sQdOsdHC6vwH7?= =?us-ascii?Q?6zSEjBCa1vfqQysoJgdplD7jW6fiXYXiMZeES7GJUWuZuZPlAj60NP4O5dwQ?= =?us-ascii?Q?FgjVvm203xJ9kayUZ462nrQM/UptrPbWZL0w47T80572ncIK0jrgYPqksN7t?= =?us-ascii?Q?kZBdaczZ1x87GOTuD5C0K1XBegV8X+7GEVAeiB12CmTK1NUJq+KvnEZo9HXP?= =?us-ascii?Q?JJXhR5vNRUvXn9spcplNCYEVg2KioPjZasVzbmuKI1ylZGGcJhAn+H1JQj59?= =?us-ascii?Q?pTHxn5XiqWjyfyVPDcCpDH3a4/3zoNCikVGMHslh7lNSluI7psQiLag64HFf?= =?us-ascii?Q?0tzIl/Kobu/x9Qlpxn46s1q9X/gPcPvwCyjr33YGSpsI5yICk4LImR6YplrE?= =?us-ascii?Q?rOgI5dW1eOvQ3mBNNz9eR+E1Y/67sBRyjcZJe2fH06zKO8SocGFZGSU1DJYB?= =?us-ascii?Q?TfsIUbQxUOE9Ny98kATcj0ThhewDommWFRckYDSyW47ek3hpmJGIjwEdCfIJ?= =?us-ascii?Q?MWeqQapVEni4i+RIDmzbeTd41sSG6ppViNw61HHCrJbKWXi2Npk7rmZbekjo?= =?us-ascii?Q?o7LgAgFa2xjX6k15k72XIk2M4dSYz2uQYxnc6j/22BT+9+9BwePJWEEAj0x0?= =?us-ascii?Q?Eszyjx6Y00NKoNCNB549h77tRxRneaULrrsQpuoIiqRVu0+TufpN+in6Qm30?= =?us-ascii?Q?g3FL16J59SMmVHfHWEH2R0cCB2KVoT8rP6yPxr99yhYGc8jCQ5z/JopH1Kmo?= =?us-ascii?Q?28RF0jrDYhbVaXuiIlFLN4t90Hb0YVxtKAh6SNlgbSPkf9hH06A693M09RVL?= =?us-ascii?Q?2T0gV4SnIUQykx29OZNQcYmk5Cbycu2YMeOKRgJt/weovHNxJJucvPYzDUw9?= =?us-ascii?Q?Yw0gTW6PJ8yETxRfbBnUwvF0mgH90hTWogqHuRGUQptTxCTSPnqlKZO90vkj?= =?us-ascii?Q?9pdzNx5Hno59OkFsxZM+7QHCRZVJypsLw9u8UwembIFt5PHTihveDTQXIDJP?= =?us-ascii?Q?7msUdBGrc1TzsMlYqLeoCaOFcUEBRJsXd4byK+Fyd/weZK8i4lptx40Qd9gb?= =?us-ascii?Q?TIgKFDPfTtHu8wAEDveOxLFNLoJ9HTCgQHo4TKyP/jd+NuaRZq/XiSX0qfbq?= =?us-ascii?Q?nTHGzPGm8y2GdbxV/fOJi6UGMCcx/8nSA2Os8/3LIRq15nclRsjhN6FenAHo?= =?us-ascii?Q?i4U3X4fvWeiYBsslJta6CdWOwaKvWbgFZGVy?= 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: 13 Aug 2025 14:32:20.8270 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 268951eb-a977-47d7-da23-08ddda76365c 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: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5896 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Carolina Jubran When changing parent of a node/leaf with tc-bw configured, the code saves and restores tc-bw values. However, it was reading the converted hardware bw_share values (where 0 becomes 1) instead of the original user values, causing incorrect tc-bw calculations after parent change. Store original tc-bw values in the node structure and use them directly for save/restore operations. Fixes: cf7e73770d1b ("net/mlx5: Manage TC arbiter nodes and implement full = support for tc-bw") Signed-off-by: Carolina Jubran Reviewed-by: Cosmin Ratiu Signed-off-by: Tariq Toukan --- .../net/ethernet/mellanox/mlx5/core/esw/qos.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c b/drivers/ne= t/ethernet/mellanox/mlx5/core/esw/qos.c index 811c1a121c03..e774f6fa3377 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c @@ -102,6 +102,8 @@ struct mlx5_esw_sched_node { u8 level; /* Valid only when this node represents a traffic class. */ u8 tc; + /* Valid only for a TC arbiter node or vport TC arbiter. */ + u32 tc_bw[DEVLINK_RATE_TCS_MAX]; }; =20 static void esw_qos_node_attach_to_parent(struct mlx5_esw_sched_node *node) @@ -608,10 +610,7 @@ static void esw_qos_tc_arbiter_get_bw_shares(struct mlx5_esw_sched_node *tc_arbiter_no= de, u32 *tc_bw) { - struct mlx5_esw_sched_node *vports_tc_node; - - list_for_each_entry(vports_tc_node, &tc_arbiter_node->children, entry) - tc_bw[vports_tc_node->tc] =3D vports_tc_node->bw_share; + memcpy(tc_bw, tc_arbiter_node->tc_bw, sizeof(tc_arbiter_node->tc_bw)); } =20 static void @@ -628,6 +627,7 @@ esw_qos_set_tc_arbiter_bw_shares(struct mlx5_esw_sched_= node *tc_arbiter_node, u8 tc =3D vports_tc_node->tc; u32 bw_share; =20 + tc_arbiter_node->tc_bw[tc] =3D tc_bw[tc]; bw_share =3D tc_bw[tc] * fw_max_bw_share; bw_share =3D esw_qos_calc_bw_share(bw_share, divider, fw_max_bw_share); @@ -1276,8 +1276,9 @@ static int esw_qos_vport_update(struct mlx5_vport *vp= ort, struct mlx5_esw_sched_node *parent, struct netlink_ext_ack *extack) { - struct mlx5_esw_sched_node *curr_parent =3D vport->qos.sched_node->parent; - enum sched_node_type curr_type =3D vport->qos.sched_node->type; + struct mlx5_esw_sched_node *vport_node =3D vport->qos.sched_node; + struct mlx5_esw_sched_node *curr_parent =3D vport_node->parent; + enum sched_node_type curr_type =3D vport_node->type; u32 curr_tc_bw[DEVLINK_RATE_TCS_MAX] =3D {0}; int err; =20 @@ -1290,10 +1291,8 @@ static int esw_qos_vport_update(struct mlx5_vport *v= port, if (err) return err; =20 - if (curr_type =3D=3D SCHED_NODE_TYPE_TC_ARBITER_TSAR && curr_type =3D=3D = type) { - esw_qos_tc_arbiter_get_bw_shares(vport->qos.sched_node, - curr_tc_bw); - } + if (curr_type =3D=3D SCHED_NODE_TYPE_TC_ARBITER_TSAR && curr_type =3D=3D = type) + esw_qos_tc_arbiter_get_bw_shares(vport_node, curr_tc_bw); =20 esw_qos_vport_disable(vport, extack); =20 --=20 2.31.1 From nobody Sat Oct 4 19:15:51 2025 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2081.outbound.protection.outlook.com [40.107.100.81]) (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 D15601DE8A0; Wed, 13 Aug 2025 14:32:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755095543; cv=fail; b=qbykkgUueDzbSwlP1MKhmQ8un0laP2byf/yq3+pumLyvo8gugAApQZ8LnhPdKnG/hrMnRTkBzVtZg3IPbSWFfTaalYiz4ibH3AtfbaTQ9z/ThyIXbd5IiEuIXsCs7CnUEMOZ9HkTIb4hiP+b7zR6FxoekdXVI4NrwX4yo5cT7ng= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755095543; c=relaxed/simple; bh=gp4c3S0bTdcxKqu7KTD6jyvd8wXpoxfhLd6iegnPJSQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tQ3wOnY09rw2RGu0Si3myGB8gLAi/RAvJa1XPyWxnhcdABS727agxlolKv9ZupgP7fH3C4wxhoOqoKSK62ljxZDkVgaJRIk/Sd5E99rE2usyzxZkKdVmckCAuss9O2qHFXXRBQ0nB0hIo60gl/LBY0iaIF53x60kSJDwdo4s+E8= 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=IRo8Lc2J; arc=fail smtp.client-ip=40.107.100.81 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="IRo8Lc2J" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=o5z/KlPRG6Ff6tv4Wso3JwrmHrH5PdC8UDiVGHsKRk9Dxa1iOkcJEfUChR9TZe5QdEwAjjWHdxnMyc0ENVYxrJFrTkAgKweezazWy12ijX40eDaUFS0QMrYKUJEy3/43Zuy+QOdAKIRWKDKL8Da3vz4gt58nzAnuy7UCLQSnk0UMkM/1pXNr3P8QHFbXbWLAKWEvIj6Cp6z1oV9jOe/mHuimAWXBPSEzl/GrVcsZ0yE50HmlWCoZKXyLx1R+jO0PXier+R3mS0q1dLeEUCnpFKOGepNsxRBpgVlNSJEstcp+AduiQ1yqVjmawevmWS1IAWJPUBpHd0jeLevzRQd8Bw== 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=JhrVlwoAs7f+gkborNatB6dus2rwANbyKHcyC/ECOnY=; b=JKU8nVzxeaELhB0jfJNg2Gqq9WvzvE7A6pmdgj3dWvIc4zXoE+VZz2rJA8ToR/rRgwf1DgnqdGE4dAPUexvQoWfm1kvehdSZyu9kSsF1oOUG0lMAxGmc0pQ2S9BLugFcr+LSW5rlsb4485+fJOP8biR3+jb71ZK+lZBW/0e6DUANgjO2q1CUZFUzAhe3/3E7g01X2ti5bIjOF8gIaZcCHyvIhYENT4raQprvL6eTVV4AQ355VGEUlsjHlyPnr31k95KhXls1PafMBerR8AqfY200ojGo19ioem6OGWTsjcfczAq1hb5Dk6Fxzs6TiiEDNVraPil+Pr80bUb/ltZreQ== 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=JhrVlwoAs7f+gkborNatB6dus2rwANbyKHcyC/ECOnY=; b=IRo8Lc2Jse7iyO0hamgK0XTcQ9Z7qmQtirGNj/vlBy/4Kqr74x/tHtYq0P7wQWnZE+TY1CnxnaqtFtM3U8pUbvnMjg9vV2WvtE5xSeH8GIvDng4VuWPtIZ2hWOyQBHMO7r7Hqk/ej5yvA95ouvSbxk3Bxhc9+T2mHuv7bLIqoJQ5+L88hVi2BwqdD5moLkt0syjFeKfV4535vMBDMXJuUxlAu80//CfAnOvHVc4IbJVnSit0XNa/Sp1BEP0dqu72TKIuflFtmAp49W5/cjPCe//iTuSrySfQo0HtPOq2RgcuZRBtQXF9KeX66Fj+y5wdjUyG4uqUJ2kGwghnsm4pcg== Received: from CH0PR03CA0266.namprd03.prod.outlook.com (2603:10b6:610:e5::31) by DS5PPF1ADAD2878.namprd12.prod.outlook.com (2603:10b6:f:fc00::646) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8943.28; Wed, 13 Aug 2025 14:32:18 +0000 Received: from CH3PEPF0000000C.namprd04.prod.outlook.com (2603:10b6:610:e5:cafe::2) by CH0PR03CA0266.outlook.office365.com (2603:10b6:610:e5::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9031.15 via Frontend Transport; Wed, 13 Aug 2025 14:32:18 +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 CH3PEPF0000000C.mail.protection.outlook.com (10.167.244.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.11 via Frontend Transport; Wed, 13 Aug 2025 14:32:18 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) 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.14; Wed, 13 Aug 2025 07:32:04 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 13 Aug 2025 07:32:03 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Wed, 13 Aug 2025 07:32:00 -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 , , , , Gal Pressman , Dragos Tatulea , Alexei Lazar Subject: [PATCH net 6/6] net/mlx5e: Query FW for buffer ownership Date: Wed, 13 Aug 2025 17:31:16 +0300 Message-ID: <1755095476-414026-7-git-send-email-tariqt@nvidia.com> X-Mailer: git-send-email 2.8.0 In-Reply-To: <1755095476-414026-1-git-send-email-tariqt@nvidia.com> References: <1755095476-414026-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: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF0000000C:EE_|DS5PPF1ADAD2878:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b5f2ed6-365b-4f2d-7964-08ddda763513 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?zDZd70FXsBFbgNoPTpVGA7LzjsOdPOrMzHGM8sEMXNp2QGOb4xzzBhOkk2UZ?= =?us-ascii?Q?oC3WIwPYO/+wniogfL+hLKO94ntz53RV06raBwJkWPUR5IcHMJYQn9BNYzIA?= =?us-ascii?Q?l4+49jdybO/dMLGa205ycGgHm7j63WKqEtMr/qpfmo/I6L+tcI12J21XBTow?= =?us-ascii?Q?cpYZRBlvoGCn7SJTxWR9QkzC/aeKAOQRvE2ZzQnlyJHhW4MnVlD92wnaVSBZ?= =?us-ascii?Q?9/MHl45FuGTQcVbQoBf5xVdiMiG23JS8XIHIaiwXX4m7R0UuwXsxmkdVfyvI?= =?us-ascii?Q?/Fx+a3g96EYV4N3vAf0qqe6asZz53h4ZalMArCWk30WJUfUYd6hYvIWCSya9?= =?us-ascii?Q?RadTMxxXJNTOK3qColGNPyfxyp8IfAAhf12AN9ZhOxikHR6aR17Agh+LAjcK?= =?us-ascii?Q?V17aqkZoSjG5ctvt/ZjHYGpTRIaJXq8fnXw3cRBFdrJPJEi2DX4iACWycS0p?= =?us-ascii?Q?z9bOif2XrsVIoO/rriAu1Re6m3sWgO+sKMk5j73u/nZ7rKXM2Mu9LS9pc4hK?= =?us-ascii?Q?7euHe0eNF6wBQungxAwswWXkZEF3XnzUzut/ktZX6d/M9Hw6PawbXDLE40OZ?= =?us-ascii?Q?UbokMbsA6PKzpSAVGdNoSLMLwYNUnl155K3dQ584yetGlPKzn0WVXvTmMRV4?= =?us-ascii?Q?Nr1095NiaTpw4Qioj57q22ek04XMxAdcJTIcjo+Z/Km9CK3ex4CRyIEVOFQm?= =?us-ascii?Q?XvSdBzbjQykIiJ22sUNVHqG29xVkBE4wKraH3H8149NROsMbB5+1AVVGN/LZ?= =?us-ascii?Q?GD/lBL8SJi1+XRjvvxVV32VXgWZUr6Ntf+YjuwEo7NFx6ayi9kBOc6V3BCyG?= =?us-ascii?Q?2eqrdkNQx8O7vnQUEX9TRuzmcxueTSuBIz7seVPDtA4kCj2vDRruns1efJmd?= =?us-ascii?Q?CvWiNMcxvmYIT39QLY/AC8tQkIq3MnI7SZdhqP+d9ElqZXTo5rTkpdczqLMP?= =?us-ascii?Q?GC5ZceUfxKZ6b4Ec3gaod5PgAkNbLXEgGziH2OZgcvplC0A0q01WsPRgXIbf?= =?us-ascii?Q?YOPUtfWbX7FdlpCpzazejAnBCmHBAsCuPS1H9TLnc9tssgP9QL7hthcc8eRw?= =?us-ascii?Q?mCPVr7aFf3GhgNKmUqZSZrUyKdg7wGAbY27yVofzt3ofgW60unCneSpkZeLJ?= =?us-ascii?Q?//a/ANZpxhx/HNyIJRM16hi5170DtAs1ywAlytbRGlYT73GqUZFQfZ6zbG0j?= =?us-ascii?Q?aTGkm6wIjwPPyjLqyJ1rlJ1M25+BQzfDAbzOXC8LkNXdmcBZW5mqSbEqs1Zc?= =?us-ascii?Q?XoLOQyaJMbGGMX4WF4JXG9A8Ib9/rYCc7vgcjyz716lRd6pAonsREihd6MbZ?= =?us-ascii?Q?MAZORrDUFTcpxQuIFnzzxNH6ysZPKa5YHnumZPbL9MQWW6g7r3+TDIdWYytO?= =?us-ascii?Q?bZt9fjX9/9so8iMx/ZaBFWNK1GwOGcUG13QlItu2pyCPBQuidG/yYYHAcqr/?= =?us-ascii?Q?2Y0B6PUUAKADLTc9eHkXs+I9gkd7WISKdD0sCM0zdM2S+18P05S2zxYHAn0x?= =?us-ascii?Q?2rM46O9hUjbBgb1lDZXS/bwN/ZH9oy16injJ?= 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)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2025 14:32:18.6477 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b5f2ed6-365b-4f2d-7964-08ddda763513 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: CH3PEPF0000000C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS5PPF1ADAD2878 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Alexei Lazar The SW currently saves local buffer ownership when setting the buffer. This means that the SW assumes it has ownership of the buffer after the command is set. If setting the buffer fails and we remain in FW ownership, the local buffer ownership state incorrectly remains as SW-owned. This leads to incorrect behavior in subsequent PFC commands, causing failures. Instead of saving local buffer ownership in SW, query the FW for buffer ownership when setting the buffer. This ensures that the buffer ownership state is accurately reflected, avoiding the issues caused by incorrect ownership states. Fixes: ecdf2dadee8e ("net/mlx5e: Receive buffer support for DCBX") Signed-off-by: Alexei Lazar Reviewed-by: Shahar Shitrit Reviewed-by: Dragos Tatulea Signed-off-by: Tariq Toukan --- .../ethernet/mellanox/mlx5/core/en/dcbnl.h | 1 - .../ethernet/mellanox/mlx5/core/en_dcbnl.c | 12 ++++++++--- .../ethernet/mellanox/mlx5/core/mlx5_core.h | 2 ++ .../net/ethernet/mellanox/mlx5/core/port.c | 20 +++++++++++++++++++ 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/dcbnl.h b/drivers/n= et/ethernet/mellanox/mlx5/core/en/dcbnl.h index b59aee75de94..2c98a5299df3 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/dcbnl.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/dcbnl.h @@ -26,7 +26,6 @@ struct mlx5e_dcbx { u8 cap; =20 /* Buffer configuration */ - bool manual_buffer; u32 cable_len; u32 xoff; u16 port_buff_cell_sz; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c b/drivers/n= et/ethernet/mellanox/mlx5/core/en_dcbnl.c index 5fe016e477b3..d166c0d5189e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c @@ -362,6 +362,7 @@ static int mlx5e_dcbnl_ieee_getpfc(struct net_device *d= ev, static int mlx5e_dcbnl_ieee_setpfc(struct net_device *dev, struct ieee_pfc *pfc) { + u8 buffer_ownership =3D MLX5_BUF_OWNERSHIP_UNKNOWN; struct mlx5e_priv *priv =3D netdev_priv(dev); struct mlx5_core_dev *mdev =3D priv->mdev; u32 old_cable_len =3D priv->dcbx.cable_len; @@ -389,7 +390,14 @@ static int mlx5e_dcbnl_ieee_setpfc(struct net_device *= dev, =20 if (MLX5_BUFFER_SUPPORTED(mdev)) { pfc_new.pfc_en =3D (changed & MLX5E_PORT_BUFFER_PFC) ? pfc->pfc_en : cur= r_pfc_en; - if (priv->dcbx.manual_buffer) + ret =3D mlx5_query_port_buffer_ownership(mdev, + &buffer_ownership); + if (ret) + netdev_err(dev, + "%s, Failed to get buffer ownership: %d\n", + __func__, ret); + + if (buffer_ownership =3D=3D MLX5_BUF_OWNERSHIP_SW_OWNED) ret =3D mlx5e_port_manual_buffer_config(priv, changed, dev->mtu, &pfc_new, NULL, NULL); @@ -982,7 +990,6 @@ static int mlx5e_dcbnl_setbuffer(struct net_device *dev, if (!changed) return 0; =20 - priv->dcbx.manual_buffer =3D true; err =3D mlx5e_port_manual_buffer_config(priv, changed, dev->mtu, NULL, buffer_size, prio2buffer); return err; @@ -1252,7 +1259,6 @@ void mlx5e_dcbnl_initialize(struct mlx5e_priv *priv) priv->dcbx.cap |=3D DCB_CAP_DCBX_HOST; =20 priv->dcbx.port_buff_cell_sz =3D mlx5e_query_port_buffers_cell_size(priv); - priv->dcbx.manual_buffer =3D false; priv->dcbx.cable_len =3D MLX5E_DEFAULT_CABLE_LEN; =20 mlx5e_ets_init(priv); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/= net/ethernet/mellanox/mlx5/core/mlx5_core.h index b6d53db27cd5..9d3504f5abfa 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h @@ -367,6 +367,8 @@ int mlx5_query_port_dcbx_param(struct mlx5_core_dev *md= ev, u32 *out); int mlx5_set_port_dcbx_param(struct mlx5_core_dev *mdev, u32 *in); int mlx5_set_trust_state(struct mlx5_core_dev *mdev, u8 trust_state); int mlx5_query_trust_state(struct mlx5_core_dev *mdev, u8 *trust_state); +int mlx5_query_port_buffer_ownership(struct mlx5_core_dev *mdev, + u8 *buffer_ownership); int mlx5_set_dscp2prio(struct mlx5_core_dev *mdev, u8 dscp, u8 prio); int mlx5_query_dscp2prio(struct mlx5_core_dev *mdev, u8 *dscp2prio); =20 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/port.c b/drivers/net/e= thernet/mellanox/mlx5/core/port.c index 549f1066d2a5..2d7adf7444ba 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/port.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c @@ -968,6 +968,26 @@ int mlx5_query_trust_state(struct mlx5_core_dev *mdev,= u8 *trust_state) return err; } =20 +int mlx5_query_port_buffer_ownership(struct mlx5_core_dev *mdev, + u8 *buffer_ownership) +{ + u32 out[MLX5_ST_SZ_DW(pfcc_reg)] =3D {}; + int err; + + if (!MLX5_CAP_PCAM_FEATURE(mdev, buffer_ownership)) { + *buffer_ownership =3D MLX5_BUF_OWNERSHIP_UNKNOWN; + return 0; + } + + err =3D mlx5_query_pfcc_reg(mdev, out, sizeof(out)); + if (err) + return err; + + *buffer_ownership =3D MLX5_GET(pfcc_reg, out, buf_ownership); + + return 0; +} + int mlx5_set_dscp2prio(struct mlx5_core_dev *mdev, u8 dscp, u8 prio) { int sz =3D MLX5_ST_SZ_BYTES(qpdpm_reg); --=20 2.31.1