leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: devlink: introduce devlink_compat_switch_id_get() helper

Browse Source 
Introduce devlink_compat_switch_id_get() helper which fills up switch_id
according to passed netdev pointer. Call it directly from
dev_get_port_parent_id() as a fallback when ndo_get_port_parent_id
is not defined for given netdev.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2019-04-03 14:24:17 +02:00 committed by David S. Miller
parent bec5267cde
commit 7e1146e8c1
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/net/devlink.h
View File

@ -743,6 +743,8 @@ void devlink_compat_running_version(struct net_device *dev,
int devlink_compat_flash_update(struct net_device *dev, const char *file_name); int devlink_compat_flash_update(struct net_device *dev, const char *file_name);
int devlink_compat_phys_port_name_get(struct net_device *dev, int devlink_compat_phys_port_name_get(struct net_device *dev,
char *name, size_t len); char *name, size_t len);
int devlink_compat_switch_id_get(struct net_device *dev,
struct netdev_phys_item_id *ppid);
#else #else
@ -764,6 +766,13 @@ devlink_compat_phys_port_name_get(struct net_device *dev,
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
static inline int
devlink_compat_switch_id_get(struct net_device *dev,
struct netdev_phys_item_id *ppid)
{
return -EOPNOTSUPP;
}
#endif #endif
#endif /* _NET_DEVLINK_H_ */ #endif /* _NET_DEVLINK_H_ */

15
net/core/dev.c
View File

@ -7900,13 +7900,20 @@ int dev_get_port_parent_id(struct net_device *dev,
struct netdev_phys_item_id first = { }; struct netdev_phys_item_id first = { };
struct net_device *lower_dev; struct net_device *lower_dev;
struct list_head *iter; struct list_head *iter;
int err = -EOPNOTSUPP; int err;
if (ops->ndo_get_port_parent_id) if (ops->ndo_get_port_parent_id) {
return ops->ndo_get_port_parent_id(dev, ppid); err = ops->ndo_get_port_parent_id(dev, ppid);
if (err != -EOPNOTSUPP)
return err;
}
err = devlink_compat_switch_id_get(dev, ppid);
if (!err || err != -EOPNOTSUPP)
return err;
if (!recurse) if (!recurse)
return err; return -EOPNOTSUPP;
netdev_for_each_lower_dev(dev, lower_dev, iter) { netdev_for_each_lower_dev(dev, lower_dev, iter) {
err = dev_get_port_parent_id(lower_dev, ppid, recurse); err = dev_get_port_parent_id(lower_dev, ppid, recurse);

19
net/core/devlink.c
View File

@ -6508,6 +6508,25 @@ int devlink_compat_phys_port_name_get(struct net_device *dev,
return __devlink_port_phys_port_name_get(devlink_port, name, len); return __devlink_port_phys_port_name_get(devlink_port, name, len);
} }
int devlink_compat_switch_id_get(struct net_device *dev,
struct netdev_phys_item_id *ppid)
{
struct devlink_port *devlink_port;
/* RTNL mutex is held here which ensures that devlink_port
* instance cannot disappear in the middle. No need to take
* any devlink lock as only permanent values are accessed.
*/
ASSERT_RTNL();
devlink_port = netdev_to_devlink_port(dev);
if (!devlink_port || !devlink_port->attrs.switch_port)
return -EOPNOTSUPP;
memcpy(ppid, &devlink_port->attrs.switch_id, sizeof(*ppid));
return 0;
}
static int __init devlink_init(void) static int __init devlink_init(void)
{ {
return genl_register_family(&devlink_nl_family); return genl_register_family(&devlink_nl_family);