devlink: introduce __devl_is_registered() helper and use it instead of xa_get_mark()

Introduce __devl_is_registered() which does not assert on devlink
instance lock and use it in notifications which may be called
without devlink instance lock held.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index 5ea2e2012e930695e7850e486588be18daf50b15..59ae4761d10a7a82da5c637a70c12861e4c1c926 100644 (file)
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -91,10 +91,15 @@ extern struct genl_family devlink_nl_family;
 
 struct devlink *devlinks_xa_find_get(struct net *net, unsigned long *indexp);
 
+static inline bool __devl_is_registered(struct devlink *devlink)
+{
+       return xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED);
+}
+
 static inline bool devl_is_registered(struct devlink *devlink)
 {
        devl_assert_locked(devlink);
-       return xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED);
+       return __devl_is_registered(devlink);
 }
 
 static inline void devl_dev_lock(struct devlink *devlink, bool dev_lock)

diff --git a/net/devlink/linecard.c b/net/devlink/linecard.c
index 2f1c317b64cd8c1b0c5a32f70b5484104ce07eb1..9d080ac1734bc2f449c648ca7e2b77ac6216f132 100644 (file)
--- a/net/devlink/linecard.c
+++ b/net/devlink/linecard.c
@@ -136,7 +136,7 @@ static void devlink_linecard_notify(struct devlink_linecard *linecard,
        WARN_ON(cmd != DEVLINK_CMD_LINECARD_NEW &&
                cmd != DEVLINK_CMD_LINECARD_DEL);
 
-       if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+       if (!__devl_is_registered(devlink))
                return;
 
        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

diff --git a/net/devlink/port.c b/net/devlink/port.c
index 7634f187fa5055e9db15cb72b0e93ce7070eddbf..f229a86992149f8170d401537e1a67c081ca5c49 100644 (file)
--- a/net/devlink/port.c
+++ b/net/devlink/port.c
@@ -512,7 +512,7 @@ static void devlink_port_notify(struct devlink_port *devlink_port,
 
        WARN_ON(cmd != DEVLINK_CMD_PORT_NEW && cmd != DEVLINK_CMD_PORT_DEL);
 
-       if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+       if (!__devl_is_registered(devlink))
                return;
 
        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

diff --git a/net/devlink/region.c b/net/devlink/region.c
index e3bab458db940c2b3a2b3c568ee991ff138c9de0..b65181aa269aef01df55602d26de6d1f5e11f966 100644 (file)
--- a/net/devlink/region.c
+++ b/net/devlink/region.c
@@ -234,7 +234,8 @@ static void devlink_nl_region_notify(struct devlink_region *region,
        struct sk_buff *msg;
 
        WARN_ON(cmd != DEVLINK_CMD_REGION_NEW && cmd != DEVLINK_CMD_REGION_DEL);
-       if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+
+       if (!__devl_is_registered(devlink))
                return;
 
        msg = devlink_nl_region_notify_build(region, snapshot, cmd, 0, 0);