From: Jiri Pirko <jiri@nvidia.com>
Date: Wed, 18 Jan 2023 15:21:15 +0000 (+0100)
Subject: devlink: add instance lock assertion in devl_is_registered()
X-Git-Tag: v6.6-pxa1908~1869^2~251^2
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=63ba54a52c417a0c632a5f85a2b912b8a2320358;p=linux.git

devlink: add instance lock assertion in devl_is_registered()

After region and linecard lock removals, this helper is always supposed
to be called with instance lock held. So put the assertion here and
remove the comment which is no longer accurate.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index 75752f8c4a26..1aa1a9549549 100644
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -85,9 +85,7 @@ struct devlink *devlinks_xa_find_get(struct net *net, unsigned long *indexp);
 
 static inline bool devl_is_registered(struct devlink *devlink)
 {
-	/* To prevent races the caller must hold the instance lock
-	 * or another lock taken during unregistration.
-	 */
+	devl_assert_locked(devlink);
 	return xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED);
 }