ethtool: ethtool_get_drvinfo: populate drvinfo fields even if callback exits

If ethtool_ops::get_drvinfo() callback isn't set,
ethtool_get_drvinfo() will fill the ethtool_drvinfo::name and
ethtool_drvinfo::bus_info fields.

However, if the driver provides the callback function, those two
fields are not touched. This means that the driver has to fill these
itself.

Allow the driver to leave those two fields empty and populate them in
such case. This way, the driver can rely on the default values for the
name and the bus_info. If the driver provides values, do nothing.

Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/r/20221108035754.2143-1-mailhol.vincent@wanadoo.fr
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index e40f5e9..99272a6 100644 (file)
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -706,15 +706,22 @@ static int
 ethtool_get_drvinfo(struct net_device *dev, struct ethtool_devlink_compat *rsp)
 {
        const struct ethtool_ops *ops = dev->ethtool_ops;
+       struct device *parent = dev->dev.parent;
 
        rsp->info.cmd = ETHTOOL_GDRVINFO;
        strscpy(rsp->info.version, UTS_RELEASE, sizeof(rsp->info.version));
        if (ops->get_drvinfo) {
                ops->get_drvinfo(dev, &rsp->info);
-       } else if (dev->dev.parent && dev->dev.parent->driver) {
-               strscpy(rsp->info.bus_info, dev_name(dev->dev.parent),
+               if (!rsp->info.bus_info[0] && parent)
+                       strscpy(rsp->info.bus_info, dev_name(parent),
+                               sizeof(rsp->info.bus_info));
+               if (!rsp->info.driver[0] && parent && parent->driver)
+                       strscpy(rsp->info.driver, parent->driver->name,
+                               sizeof(rsp->info.driver));
+       } else if (parent && parent->driver) {
+               strscpy(rsp->info.bus_info, dev_name(parent),
                        sizeof(rsp->info.bus_info));
-               strscpy(rsp->info.driver, dev->dev.parent->driver->name,
+               strscpy(rsp->info.driver, parent->driver->name,
                        sizeof(rsp->info.driver));
        } else if (dev->rtnl_link_ops) {
                strscpy(rsp->info.driver, dev->rtnl_link_ops->kind,