devlink: add helpers to get bus_name/dev_name

Introduce devlink_bus_name() and devlink_dev_name() helpers and
convert all direct accesses to devlink->dev->bus->name and
dev_name(devlink->dev) to use them.

This prepares for dev-less devlink instances where these helpers
will be extended to handle the missing device.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Link: https://patch.msgid.link/20260312100407.551173-3-jiri@resnulli.us
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/devlink.h b/include/net/devlink.h
index cb839e0435a17f7209535952dd14f0dd7f1e0013..0afb0958b910494cb3c7acd334cb181c8234605d 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -1611,6 +1611,8 @@ struct devlink_ops {
 void *devlink_priv(struct devlink *devlink);
 struct devlink *priv_to_devlink(void *priv);
 struct device *devlink_to_dev(const struct devlink *devlink);
+const char *devlink_bus_name(const struct devlink *devlink);
+const char *devlink_dev_name(const struct devlink *devlink);
 
 /* Devlink instance explicit locking */
 void devl_lock(struct devlink *devlink);

diff --git a/include/trace/events/devlink.h b/include/trace/events/devlink.h
index f241e204fe6b9913b695ffde073e61c5ddd30d7d..32304ce9ad15fac11434c8d1455413a665447418 100644 (file)
--- a/include/trace/events/devlink.h
+++ b/include/trace/events/devlink.h
@@ -21,8 +21,8 @@ TRACE_EVENT(devlink_hwmsg,
        TP_ARGS(devlink, incoming, type, buf, len),
 
        TP_STRUCT__entry(
-               __string(bus_name, devlink_to_dev(devlink)->bus->name)
-               __string(dev_name, dev_name(devlink_to_dev(devlink)))
+               __string(bus_name, devlink_bus_name(devlink))
+               __string(dev_name, devlink_dev_name(devlink))
                __string(driver_name, devlink_to_dev(devlink)->driver->name)
                __field(bool, incoming)
                __field(unsigned long, type)
@@ -55,8 +55,8 @@ TRACE_EVENT(devlink_hwerr,
        TP_ARGS(devlink, err, msg),
 
        TP_STRUCT__entry(
-               __string(bus_name, devlink_to_dev(devlink)->bus->name)
-               __string(dev_name, dev_name(devlink_to_dev(devlink)))
+               __string(bus_name, devlink_bus_name(devlink))
+               __string(dev_name, devlink_dev_name(devlink))
                __string(driver_name, devlink_to_dev(devlink)->driver->name)
                __field(int, err)
                __string(msg, msg)
@@ -85,8 +85,8 @@ TRACE_EVENT(devlink_health_report,
        TP_ARGS(devlink, reporter_name, msg),
 
        TP_STRUCT__entry(
-               __string(bus_name, devlink_to_dev(devlink)->bus->name)
-               __string(dev_name, dev_name(devlink_to_dev(devlink)))
+               __string(bus_name, devlink_bus_name(devlink))
+               __string(dev_name, devlink_dev_name(devlink))
                __string(driver_name, devlink_to_dev(devlink)->driver->name)
                __string(reporter_name, reporter_name)
                __string(msg, msg)
@@ -116,8 +116,8 @@ TRACE_EVENT(devlink_health_recover_aborted,
        TP_ARGS(devlink, reporter_name, health_state, time_since_last_recover),
 
        TP_STRUCT__entry(
-               __string(bus_name, devlink_to_dev(devlink)->bus->name)
-               __string(dev_name, dev_name(devlink_to_dev(devlink)))
+               __string(bus_name, devlink_bus_name(devlink))
+               __string(dev_name, devlink_dev_name(devlink))
                __string(driver_name, devlink_to_dev(devlink)->driver->name)
                __string(reporter_name, reporter_name)
                __field(bool, health_state)
@@ -150,8 +150,8 @@ TRACE_EVENT(devlink_health_reporter_state_update,
        TP_ARGS(devlink, reporter_name, new_state),
 
        TP_STRUCT__entry(
-               __string(bus_name, devlink_to_dev(devlink)->bus->name)
-               __string(dev_name, dev_name(devlink_to_dev(devlink)))
+               __string(bus_name, devlink_bus_name(devlink))
+               __string(dev_name, devlink_dev_name(devlink))
                __string(driver_name, devlink_to_dev(devlink)->driver->name)
                __string(reporter_name, reporter_name)
                __field(u8, new_state)
@@ -181,8 +181,8 @@ TRACE_EVENT(devlink_trap_report,
        TP_ARGS(devlink, skb, metadata),
 
        TP_STRUCT__entry(
-               __string(bus_name, devlink_to_dev(devlink)->bus->name)
-               __string(dev_name, dev_name(devlink_to_dev(devlink)))
+               __string(bus_name, devlink_bus_name(devlink))
+               __string(dev_name, devlink_dev_name(devlink))
                __string(driver_name, devlink_to_dev(devlink)->driver->name)
                __string(trap_name, metadata->trap_name)
                __string(trap_group_name, metadata->trap_group_name)

diff --git a/net/devlink/core.c b/net/devlink/core.c
index d8e509a669bf6c3eb6d1d76202cffa8a671a2f14..63709c132a7c18648b7fba074898ac4bcbbfea6b 100644 (file)
--- a/net/devlink/core.c
+++ b/net/devlink/core.c
@@ -248,6 +248,18 @@ struct device *devlink_to_dev(const struct devlink *devlink)
 }
 EXPORT_SYMBOL_GPL(devlink_to_dev);
 
+const char *devlink_bus_name(const struct devlink *devlink)
+{
+       return devlink->dev->bus->name;
+}
+EXPORT_SYMBOL_GPL(devlink_bus_name);
+
+const char *devlink_dev_name(const struct devlink *devlink)
+{
+       return dev_name(devlink->dev);
+}
+EXPORT_SYMBOL_GPL(devlink_dev_name);
+
 struct net *devlink_net(const struct devlink *devlink)
 {
        return read_pnet(&devlink->_net);

diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index 31fa98af418e810ebd4da32024119e01ef8fc8a1..1b770de0313ed43f547010735e2bd0e8e384ae40 100644 (file)
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -174,9 +174,9 @@ devlink_dump_state(struct netlink_callback *cb)
 static inline int
 devlink_nl_put_handle(struct sk_buff *msg, struct devlink *devlink)
 {
-       if (nla_put_string(msg, DEVLINK_ATTR_BUS_NAME, devlink->dev->bus->name))
+       if (nla_put_string(msg, DEVLINK_ATTR_BUS_NAME, devlink_bus_name(devlink)))
                return -EMSGSIZE;
-       if (nla_put_string(msg, DEVLINK_ATTR_DEV_NAME, dev_name(devlink->dev)))
+       if (nla_put_string(msg, DEVLINK_ATTR_DEV_NAME, devlink_dev_name(devlink)))
                return -EMSGSIZE;
        if (nla_put_uint(msg, DEVLINK_ATTR_INDEX, devlink->index))
                return -EMSGSIZE;
@@ -211,8 +211,8 @@ static inline void devlink_nl_obj_desc_init(struct devlink_obj_desc *desc,
                                            struct devlink *devlink)
 {
        memset(desc, 0, sizeof(*desc));
-       desc->bus_name = devlink->dev->bus->name;
-       desc->dev_name = dev_name(devlink->dev);
+       desc->bus_name = devlink_bus_name(devlink);
+       desc->dev_name = devlink_dev_name(devlink);
 }
 
 static inline void devlink_nl_obj_desc_port_set(struct devlink_obj_desc *desc,

diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c
index 593605c1b1ef4d32eab50c7701b329936b447351..56817b85a3f9ef7811cf72b03298792e1e01d906 100644 (file)
--- a/net/devlink/netlink.c
+++ b/net/devlink/netlink.c
@@ -193,8 +193,8 @@ devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs,
        devname = nla_data(attrs[DEVLINK_ATTR_DEV_NAME]);
 
        devlinks_xa_for_each_registered_get(net, index, devlink) {
-               if (strcmp(devlink->dev->bus->name, busname) == 0 &&
-                   strcmp(dev_name(devlink->dev), devname) == 0) {
+               if (strcmp(devlink_bus_name(devlink), busname) == 0 &&
+                   strcmp(devlink_dev_name(devlink), devname) == 0) {
                        devl_dev_lock(devlink, dev_lock);
                        if (devl_is_registered(devlink))
                                return devlink;

diff --git a/net/devlink/port.c b/net/devlink/port.c
index 1ff609571ea4ac4b1fd7c986841dfbf4582b7f7b..fa3e1597711b84fda8aa8cafc02d85988e100f7c 100644 (file)
--- a/net/devlink/port.c
+++ b/net/devlink/port.c
@@ -220,8 +220,8 @@ size_t devlink_nl_port_handle_size(struct devlink_port *devlink_port)
 {
        struct devlink *devlink = devlink_port->devlink;
 
-       return nla_total_size(strlen(devlink->dev->bus->name) + 1) /* DEVLINK_ATTR_BUS_NAME */
-            + nla_total_size(strlen(dev_name(devlink->dev)) + 1) /* DEVLINK_ATTR_DEV_NAME */
+       return nla_total_size(strlen(devlink_bus_name(devlink)) + 1) /* DEVLINK_ATTR_BUS_NAME */
+            + nla_total_size(strlen(devlink_dev_name(devlink)) + 1) /* DEVLINK_ATTR_DEV_NAME */
             + nla_total_size(8) /* DEVLINK_ATTR_INDEX */
             + nla_total_size(4); /* DEVLINK_ATTR_PORT_INDEX */
 }