xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devlink: create a special NDO for getting the devlink instance

Browse Source 
Instead of iterating over all devlink ports add a NDO which
will return the devlink instance from the driver.

v2: add the netdev_to_devlink() helper (Michal)
v3: check that devlink has ops (Florian)
v4: hold devlink_mutex (Jiri)

Suggested-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski
2019-02-25 19:34:03 -08:00
committed by David S. Miller
parent f4b6bcc700
commit b473b0d235
3 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
net/core/devlink.c
View File

@@ -6397,9 +6397,6 @@ static void __devlink_compat_running_version(struct devlink *devlink,
struct sk_buff *msg;
int rem, err;
if (!devlink->ops->info_get)
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
if (!msg)
return;
@@ -6431,55 +6428,36 @@ free_msg:
void devlink_compat_running_version(struct net_device *dev,
char *buf, size_t len)
{
struct devlink_port *devlink_port;
struct devlink *devlink;
mutex_lock(&devlink_mutex);
list_for_each_entry(devlink, &devlink_list, list) {
mutex_lock(&devlink->lock);
list_for_each_entry(devlink_port, &devlink->port_list, list) {
if (devlink_port->type == DEVLINK_PORT_TYPE_ETH &&
devlink_port->type_dev == dev) {
__devlink_compat_running_version(devlink,
buf, len);
mutex_unlock(&devlink->lock);
goto out;
}
}
mutex_unlock(&devlink->lock);
}
out:
devlink = netdev_to_devlink(dev);
if (!devlink || !devlink->ops || !devlink->ops->info_get)
goto unlock_list;
mutex_lock(&devlink->lock);
__devlink_compat_running_version(devlink, buf, len);
mutex_unlock(&devlink->lock);
unlock_list:
mutex_unlock(&devlink_mutex);
}
int devlink_compat_flash_update(struct net_device *dev, const char *file_name)
{
struct devlink_port *devlink_port;
struct devlink *devlink;
int ret = -EOPNOTSUPP;
mutex_lock(&devlink_mutex);
list_for_each_entry(devlink, &devlink_list, list) {
mutex_lock(&devlink->lock);
list_for_each_entry(devlink_port, &devlink->port_list, list) {
int ret = -EOPNOTSUPP;
devlink = netdev_to_devlink(dev);
if (!devlink || !devlink->ops || !devlink->ops->flash_update)
goto unlock_list;
if (devlink_port->type != DEVLINK_PORT_TYPE_ETH ||
devlink_port->type_dev != dev)
continue;
mutex_unlock(&devlink_mutex);
if (devlink->ops->flash_update)
ret = devlink->ops->flash_update(devlink,
file_name,
NULL, NULL);
mutex_unlock(&devlink->lock);
return ret;
}
mutex_unlock(&devlink->lock);
}
mutex_lock(&devlink->lock);
ret = devlink->ops->flash_update(devlink, file_name, NULL, NULL);
mutex_unlock(&devlink->lock);
unlock_list:
mutex_unlock(&devlink_mutex);
return -EOPNOTSUPP;
return ret;
}
static int __init devlink_init(void)