[net-next,v3,2/6] devlink: create a special NDO for getting the devlink instance
diff mbox series

Message ID 20190222220758.7117-3-jakub.kicinski@netronome.com
State Changes Requested
Delegated to: David Miller
Headers show
Series
  • devlink: make ethtool compat reliable
Related show

Commit Message

Jakub Kicinski Feb. 22, 2019, 10:07 p.m. UTC
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)

Suggested-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
 include/linux/netdevice.h |  6 ++++
 include/net/devlink.h     |  9 ++++++
 net/core/devlink.c        | 58 ++++++++++-----------------------------
 3 files changed, 30 insertions(+), 43 deletions(-)

Comments

Jiri Pirko Feb. 24, 2019, 10:51 a.m. UTC | #1
Fri, Feb 22, 2019 at 11:07:53PM CET, jakub.kicinski@netronome.com wrote:
>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)
>
>Suggested-by: Jiri Pirko <jiri@resnulli.us>
>Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
>Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

[...]


> 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:
>-	mutex_unlock(&devlink_mutex);
>+	devlink = netdev_to_devlink(dev);

What prevents devlink from being unregistered now from another thread?
I think you should hold &devlink_mutex here to prevent it.



>+	if (!devlink || !devlink->ops || !devlink->ops->info_get)
>+		return;
>+
>+	mutex_lock(&devlink->lock);
>+	__devlink_compat_running_version(devlink, buf, len);
>+	mutex_unlock(&devlink->lock);
> }
> 
> int devlink_compat_flash_update(struct net_device *dev, const char *file_name)
> {
>-	struct devlink_port *devlink_port;
> 	struct devlink *devlink;
>+	int ret;
> 
>-	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;
>-
>-			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_unlock(&devlink_mutex);
>+	devlink = netdev_to_devlink(dev);

Same here.


>+	if (!devlink || !devlink->ops || !devlink->ops->flash_update)
>+		return -EOPNOTSUPP;
> 
>-	return -EOPNOTSUPP;
>+	mutex_lock(&devlink->lock);
>+	ret = devlink->ops->flash_update(devlink, file_name, NULL, NULL);
>+	mutex_unlock(&devlink->lock);
>+	return ret;
> }
> 
> static int __init devlink_init(void)
>-- 
>2.19.2
>

Patch
diff mbox series

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index aab4d9f6613d..eebcef6b8191 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -940,6 +940,8 @@  struct dev_ifalias {
 	char ifalias[];
 };
 
+struct devlink;
+
 /*
  * This structure defines the management hooks for network devices.
  * The following hooks can be defined; unless noted otherwise, they are
@@ -1248,6 +1250,9 @@  struct dev_ifalias {
  *	that got dropped are freed/returned via xdp_return_frame().
  *	Returns negative number, means general error invoking ndo, meaning
  *	no frames were xmit'ed and core-caller will free all frames.
+ * struct devlink *(*ndo_get_devlink)(struct net_device *dev);
+ *	Get devlink instance associated with a given netdev.
+ *	Called with a reference on the device only, rtnl_lock is not held.
  */
 struct net_device_ops {
 	int			(*ndo_init)(struct net_device *dev);
@@ -1446,6 +1451,7 @@  struct net_device_ops {
 						u32 flags);
 	int			(*ndo_xsk_async_xmit)(struct net_device *dev,
 						      u32 queue_id);
+	struct devlink *	(*ndo_get_devlink)(struct net_device *dev);
 };
 
 /**
diff --git a/include/net/devlink.h b/include/net/devlink.h
index f9f7fe974652..7f5a0bdca228 100644
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -538,6 +538,15 @@  static inline struct devlink *priv_to_devlink(void *priv)
 	return container_of(priv, struct devlink, priv);
 }
 
+static inline struct devlink *netdev_to_devlink(struct net_device *dev)
+{
+#if IS_ENABLED(CONFIG_NET_DEVLINK)
+	if (dev->netdev_ops->ndo_get_devlink)
+		return dev->netdev_ops->ndo_get_devlink(dev);
+#endif
+	return NULL;
+}
+
 struct ib_device;
 
 #if IS_ENABLED(CONFIG_NET_DEVLINK)
diff --git a/net/core/devlink.c b/net/core/devlink.c
index 05e04ea0a5c7..a13055160be0 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -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,30 @@  static void __devlink_compat_running_version(struct devlink *devlink,
 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:
-	mutex_unlock(&devlink_mutex);
+	devlink = netdev_to_devlink(dev);
+	if (!devlink || !devlink->ops || !devlink->ops->info_get)
+		return;
+
+	mutex_lock(&devlink->lock);
+	__devlink_compat_running_version(devlink, buf, len);
+	mutex_unlock(&devlink->lock);
 }
 
 int devlink_compat_flash_update(struct net_device *dev, const char *file_name)
 {
-	struct devlink_port *devlink_port;
 	struct devlink *devlink;
+	int ret;
 
-	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;
-
-			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_unlock(&devlink_mutex);
+	devlink = netdev_to_devlink(dev);
+	if (!devlink || !devlink->ops || !devlink->ops->flash_update)
+		return -EOPNOTSUPP;
 
-	return -EOPNOTSUPP;
+	mutex_lock(&devlink->lock);
+	ret = devlink->ops->flash_update(devlink, file_name, NULL, NULL);
+	mutex_unlock(&devlink->lock);
+	return ret;
 }
 
 static int __init devlink_init(void)