From nobody Mon Feb 9 15:26:56 2026 Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11010042.outbound.protection.outlook.com [52.101.85.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 4D99B34F47E; Wed, 28 Jan 2026 11:28:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.85.42 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769599696; cv=fail; b=k3WPMsVS/VZ5e3BJ25+j9xND1A4gdHbrKp36JFX9qBo29Vs5qpyVDMvJt/ok7bmWaYVcLqTd0KvCm6X8Ant+d0TfQwo8TOJqjs5Y+Y5H1jWYAdHW9Sx0jmoNR+ebcK+IgFkBl6R7QyK8+Ajb6yY/78xIVRIGe3oyW681XqNoHvA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769599696; c=relaxed/simple; bh=RjAnyV49OpqLxH1Y/1/JYniSm6cVIzb8TL2yHKgRTfY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=fLknPQia8d9K+s05flkZWPXi9p7yOpKwgZMSL8K62KHL5/aW4k9x8j5KGOuUqIoBMknuWgWXcPT7loIcu262UaXTAUsFVL+aY7rn5Gs5mnlDmQF+JPO1B47SM1CWIVGvQwDXe3H94o3KTmGWDRiKATX7xN5HZZP6UhSi4jGtzpU= 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=gAqv1Em9; arc=fail smtp.client-ip=52.101.85.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="gAqv1Em9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=k5+hoT3kisFsXerhHiZBBzVipPRbpjylYgobBGakPcqXzxdiUUM9zJGBDf07f6J6rNt41oGkMmQx/3+gJoHMhJSF6qUzcj6EovdiLRnwkSkhupgKR5LJAl9YjkVKV8VT+bbg9ozFsZ2CLxHSySopqHz16eGIDdbGIeZos8N353fa+Sq2kkNq8keHrDYp1y8+tYB1g36/NdvoecfQmQnJkulhiLqDTeJvmWk0qE05O2EZEMLvleLuMH/8jckNk9py7ZLaVFk22iAdf1OEUmrfoRBBAU3M25MXsalxvnOz3pIud/iLUomhbpIU+Pmul6gAvffyjokUB1hUut1GeEm6mg== 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=P2GtwMvng+TR169kHZ1pzGoSguw7VuTInPh8458bkCg=; b=vyZs6gdr2OjlOtuXM045HQEXDtxmiAVNq9QcWbVZKMm+oGRP2dXXlPtTJGinkH/VKTXA6QYVbJGxdkdyGclJ8xG5NwBaqau5R1ZDooOapHOFOQRNDbZPjeqd4ysfxYoPDk6WHAwAnN0979D1LjKP00xeXl60/BZ+mxYJjLspMpvqD0Eg5py3y0FsOoZS4oi5BwusE+zYKikLyoeDwTID/YsYtLsjs2qO18vF06Dc/6IIceUf82ayclYiIajNm0SvnJRGVrLXQ+pmPCoDqHuBWjLT9BkkEzVOU+V8q+XDzCafbsF6PYLP3T8ycsYzMmSbJ/v1zBIboxcSqxPC2sfjOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=P2GtwMvng+TR169kHZ1pzGoSguw7VuTInPh8458bkCg=; b=gAqv1Em9fOuElc0s7z7X+akbb7mouMeS5e4GnTwDINx2IiCZFkbZlDHXXuB5qdJVaa7D4LdPoPoLU1fRPQrQtTL9QS9aTaGdRj64Q0EjwypWcmBsozbqWroBz1BU+R87+mW3lqLFhB1CQtjIj3b3jLhJNFyDmQe4F8iPC/b4wllQtPQQPVQYNpzOuDRZPOeKbaKoWcc7mMoLNT1AbMYroBFXxB/3xjKpC20Exy7WH874Jg6Gycx5j7q6HNJsSuD/NTxRDc3Hu1oJO93OqwH8Sn9SWz9KgpJpBVUc4AKlxzIWtWMQz/4z89zuBFxNfdtgJb96mAQGfnv/0YyCgmZ80g== Received: from BN9PR03CA0738.namprd03.prod.outlook.com (2603:10b6:408:110::23) by CH2PR12MB4070.namprd12.prod.outlook.com (2603:10b6:610:ae::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9564.7; Wed, 28 Jan 2026 11:28:07 +0000 Received: from BN1PEPF00004686.namprd03.prod.outlook.com (2603:10b6:408:110:cafe::3a) by BN9PR03CA0738.outlook.office365.com (2603:10b6:408:110::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9564.7 via Frontend Transport; Wed, 28 Jan 2026 11:28:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN1PEPF00004686.mail.protection.outlook.com (10.167.243.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9564.3 via Frontend Transport; Wed, 28 Jan 2026 11:28:07 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Wed, 28 Jan 2026 03:27:54 -0800 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Wed, 28 Jan 2026 03:27:53 -0800 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.2562.20 via Frontend Transport; Wed, 28 Jan 2026 03:27:48 -0800 From: Tariq Toukan To: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , "David S. Miller" CC: Donald Hunter , Jiri Pirko , Jonathan Corbet , Saeed Mahameed , "Leon Romanovsky" , Tariq Toukan , Mark Bloch , , , , , Gal Pressman , Moshe Shemesh , Carolina Jubran , Cosmin Ratiu , Jiri Pirko , Randy Dunlap , Simon Horman , Krzysztof Kozlowski Subject: [PATCH net-next V7 05/14] devlink: Refactor devlink_rate_nodes_check Date: Wed, 28 Jan 2026 13:25:35 +0200 Message-ID: <20260128112544.1661250-6-tariqt@nvidia.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20260128112544.1661250-1-tariqt@nvidia.com> References: <20260128112544.1661250-1-tariqt@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00004686:EE_|CH2PR12MB4070:EE_ X-MS-Office365-Filtering-Correlation-Id: 94477fd3-f323-4926-7184-08de5e604f43 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|7416014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bS74l7JpbFaTCvnqw7WdUWr51Ls4CZA8JWmOR0OqtX0+27QY2uzFPqPRKoiH?= =?us-ascii?Q?36w//7+9afs2OtnK4DoGsvvfEMKqrz2kGuyqffJL6yxeVQbOksNYqW3VfYDz?= =?us-ascii?Q?5Ddj9KRo5t5SYTLLG1HhQElJ8wBWMiU0IulgNqes3OEBOreLqsl8fBBPhobT?= =?us-ascii?Q?pMlmPcQWa5DNrovVeT2EnnYRzfzgnK5Vac+RNEYpmlruCpp0Mc5i3Hg5rNMz?= =?us-ascii?Q?0iMV0/TFnOEyo99PW6dFAesREKyBz8BEGC6PBimS/GcmBeFW9WOvC113T8R+?= =?us-ascii?Q?SQeHw6IBTBASoIKFL7l/UqSJYKtk5mSfU4HRryFKDUseLkpeoOSPwCcGys1G?= =?us-ascii?Q?F0npNzypptbjgm8bctA1RwE/+BKsfsMAe/7OOiK+UGZ5sFbLQbJ7p+HVk6ux?= =?us-ascii?Q?QW7PMB58OQYmFjCXVCEUldEPPXtUzK6OM9WNcaU9vXcArxBXW3oL0crv41L8?= =?us-ascii?Q?OY24KxLOJ7bOS6rTs4VdOQ8g+Tn7jqu2p62+OKMI6MnDuyTqFMPzhMLNeBSm?= =?us-ascii?Q?kdOZ5blu/IdxVYwu70P6Cm8pAdQO+hoMM49ya2MoqAPSmrFJMEUgbBn9qPsU?= =?us-ascii?Q?2YHbpI3dPzdPI/UqVaoRkv3lkmbwc/QaRShPhPoeukNSnTZV0JyleUiOT5xf?= =?us-ascii?Q?/P4qwNuQXNHOAPaK15yFbC+wc/IpkBN/Rt65fdDs/7pfjOWeovEB60XRvgbM?= =?us-ascii?Q?X6a8qw+FT4gTVQdW30jXEiQ4pDgDqgJdceEfQ7rXmR8tk398+63ha5aeYFp6?= =?us-ascii?Q?TGJoZJWCMmgpniHtqrk3DMK+CgTJuVb01HsU3u5qGaMT/2z2cg7xsyFQlzyd?= =?us-ascii?Q?+6sv+7KTzhKNyr651veU6agxFfHbiHsGnMLlBC4ZxLLQl6s1AmfJAkVfuL0j?= =?us-ascii?Q?6q+3ysvcsOpVox7YW6HvOHLSUlrVmzPLoVFtHPhBx6rOfGvguXbxMKynC/mI?= =?us-ascii?Q?j+AGu8wvBC3q6ez9/sLVHKbqcEz3bKQp+kJF0Z/i4p8UBrolP1m2DDaM6eFp?= =?us-ascii?Q?wk6LaHYwRMopqYULwFnrjb/ik++QKQZm9eipmW3fP/Rtz7XpsS94LnHV82ED?= =?us-ascii?Q?1HvALafVih4PlfoWC8S4S6AQBsT0sxjcpUoEF475FosCBHth7kR3IIFBNTJj?= =?us-ascii?Q?46UXegEZrQmgGB/ITgoX7uI1oVRLbfzI57DbuazlT/LhkDV7p+BKjuL8IzQW?= =?us-ascii?Q?+8u0lmGaCQ4eu8MSi241CKx5IBoPVQ1ikRNnLYuozO63zciarOAk2YdkYMFR?= =?us-ascii?Q?dAsgNm4B3i2Ym1W4DP2sLiz6hsCP0kd8RYk+RjsQP0Ouuz1fsmf9DGUHsJrf?= =?us-ascii?Q?hZwT8ZyKC/QqowpVc5GMyYrkb2+Mdi0hqe5osUirLkY0ciWUn/n1BzHVqgxa?= =?us-ascii?Q?X8CgfhEg3CbwM2jzedv91ATYRURjdlH84GJgrCJVsI8Uz5ZgmWnndljQOgmb?= =?us-ascii?Q?Qevb5u34Kq2yVS7Aq2EYMwkcWuu0axqjMBGP78iDYM856LKizjYGHGwdGWBO?= =?us-ascii?Q?5gCjhy9yCa+CBQ5gW2sCutLdYX6movxRrQ4tAn/Vr+GojkAuZDjSAWxzx9C0?= =?us-ascii?Q?opA0AXDxX4WcL+XV+g6fF0M3aYCJL8pefJEcNGC24lcnTPdEivPongoKLW8B?= =?us-ascii?Q?xuZhGZT9/jXi1+o1Vv34cY9fyE1j6BnOSThXT5iqZxL13fYEZlgIwqFo1E2V?= =?us-ascii?Q?4Jb6uQ=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(82310400026)(376014)(7416014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2026 11:28:07.1015 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 94477fd3-f323-4926-7184-08de5e604f43 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF00004686.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4070 Content-Type: text/plain; charset="utf-8" From: Cosmin Ratiu devlink_rate_nodes_check() was used to verify there are no devlink rate nodes created when switching the esw mode. Rate management code is about to become more complex, so refactor this function: - remove unused param 'mode'. - add a new 'rate_filter' param. - rename to devlink_rates_check(). - expose devlink_rate_is_node() to be used as a rate filter. This makes it more usable from multiple places, so use it from those places as well. Signed-off-by: Cosmin Ratiu Reviewed-by: Carolina Jubran Reviewed-by: Jiri Pirko Signed-off-by: Tariq Toukan --- net/devlink/core.c | 2 +- net/devlink/dev.c | 7 ++++--- net/devlink/devl_internal.h | 6 ++++-- net/devlink/rate.c | 13 +++++++------ 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/net/devlink/core.c b/net/devlink/core.c index f228190df346..f72d8cc0d6dd 100644 --- a/net/devlink/core.c +++ b/net/devlink/core.c @@ -517,7 +517,7 @@ void devlink_free(struct devlink *devlink) WARN_ON(!list_empty(&devlink->resource_list)); WARN_ON(!list_empty(&devlink->dpipe_table_list)); WARN_ON(!list_empty(&devlink->sb_list)); - WARN_ON(!list_empty(&devlink->rate_list)); + WARN_ON(devlink_rates_check(devlink, NULL, NULL)); WARN_ON(!list_empty(&devlink->linecard_list)); WARN_ON(!xa_empty(&devlink->ports)); =20 diff --git a/net/devlink/dev.c b/net/devlink/dev.c index 02602704bdea..e3a36de4f4ae 100644 --- a/net/devlink/dev.c +++ b/net/devlink/dev.c @@ -434,7 +434,7 @@ static void devlink_reload_reinit_sanity_check(struct d= evlink *devlink) WARN_ON(!list_empty(&devlink->trap_list)); WARN_ON(!list_empty(&devlink->dpipe_table_list)); WARN_ON(!list_empty(&devlink->sb_list)); - WARN_ON(!list_empty(&devlink->rate_list)); + WARN_ON(devlink_rates_check(devlink, NULL, NULL)); WARN_ON(!list_empty(&devlink->linecard_list)); WARN_ON(!xa_empty(&devlink->ports)); } @@ -713,10 +713,11 @@ int devlink_nl_eswitch_set_doit(struct sk_buff *skb, = struct genl_info *info) if (info->attrs[DEVLINK_ATTR_ESWITCH_MODE]) { if (!ops->eswitch_mode_set) return -EOPNOTSUPP; - mode =3D nla_get_u16(info->attrs[DEVLINK_ATTR_ESWITCH_MODE]); - err =3D devlink_rate_nodes_check(devlink, mode, info->extack); + err =3D devlink_rates_check(devlink, devlink_rate_is_node, + info->extack); if (err) return err; + mode =3D nla_get_u16(info->attrs[DEVLINK_ATTR_ESWITCH_MODE]); err =3D ops->eswitch_mode_set(devlink, mode, info->extack); if (err) return err; diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h index aea43d750d23..8374c9cab6ce 100644 --- a/net/devlink/devl_internal.h +++ b/net/devlink/devl_internal.h @@ -300,8 +300,10 @@ int devlink_resources_validate(struct devlink *devlink, struct genl_info *info); =20 /* Rates */ -int devlink_rate_nodes_check(struct devlink *devlink, u16 mode, - struct netlink_ext_ack *extack); +bool devlink_rate_is_node(const struct devlink_rate *devlink_rate); +int devlink_rates_check(struct devlink *devlink, + bool (*rate_filter)(const struct devlink_rate *), + struct netlink_ext_ack *extack); =20 /* Linecards */ unsigned int devlink_linecard_index(struct devlink_linecard *linecard); diff --git a/net/devlink/rate.c b/net/devlink/rate.c index d157a8419bca..0d68b5c477dc 100644 --- a/net/devlink/rate.c +++ b/net/devlink/rate.c @@ -12,8 +12,7 @@ devlink_rate_is_leaf(struct devlink_rate *devlink_rate) return devlink_rate->type =3D=3D DEVLINK_RATE_TYPE_LEAF; } =20 -static inline bool -devlink_rate_is_node(struct devlink_rate *devlink_rate) +bool devlink_rate_is_node(const struct devlink_rate *devlink_rate) { return devlink_rate->type =3D=3D DEVLINK_RATE_TYPE_NODE; } @@ -688,14 +687,16 @@ int devlink_nl_rate_del_doit(struct sk_buff *skb, str= uct genl_info *info) return err; } =20 -int devlink_rate_nodes_check(struct devlink *devlink, u16 mode, - struct netlink_ext_ack *extack) +int devlink_rates_check(struct devlink *devlink, + bool (*rate_filter)(const struct devlink_rate *), + struct netlink_ext_ack *extack) { struct devlink_rate *devlink_rate; =20 list_for_each_entry(devlink_rate, &devlink->rate_list, list) - if (devlink_rate_is_node(devlink_rate)) { - NL_SET_ERR_MSG(extack, "Rate node(s) exists."); + if (!rate_filter || rate_filter(devlink_rate)) { + if (extack) + NL_SET_ERR_MSG(extack, "Rate node(s) exists."); return -EBUSY; } return 0; --=20 2.44.0