diff mbox series

[net-next,12/15] dsa: Make use of the list of tag drivers

Message ID 20190418023120.17067-13-andrew@lunn.ch
State Changes Requested
Delegated to: David Miller
Headers show
Series Make DSA tag drivers kernel modules | expand

Commit Message

Andrew Lunn April 18, 2019, 2:31 a.m. UTC 
Implement the _get and _put functions to make use of the list of tag
drivers. Also, trigger the loading of the module, based on the alias
information. The _get function takes a reference on the tag driver, so
it cannot be unloaded, and the _put function releases the reference.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 net/dsa/dsa.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

Comments

Florian Fainelli April 19, 2019, 3:33 p.m. UTC | #1 
On 4/17/2019 7:31 PM, Andrew Lunn wrote:
> Implement the _get and _put functions to make use of the list of tag
> drivers. Also, trigger the loading of the module, based on the alias
> information. The _get function takes a reference on the tag driver, so
> it cannot be unloaded, and the _put function releases the reference.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
diff mbox series

Patch

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index a3210b2f88a2..17d26cc7a128 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -129,20 +129,38 @@  const char *dsa_tag_protocol_to_str(const struct dsa_device_ops *ops)
 
 const struct dsa_device_ops *dsa_tag_driver_get(int tag_protocol)
 {
-	const struct dsa_device_ops *ops;
+	struct dsa_device_ops *ops;
+	char module_name[128];
+	bool found = false;
 
-	if (tag_protocol >= DSA_TAG_LAST)
-		return ERR_PTR(-EINVAL);
-	ops = dsa_device_ops[tag_protocol];
+	snprintf(module_name, 127, "%s%d", DSA_TAG_DRIVER_ALIAS,
+		 tag_protocol);
 
-	if (!ops)
-		return ERR_PTR(-ENOPROTOOPT);
+	request_module(module_name);
+
+	mutex_lock(&dsa_tag_drivers_lock);
+	list_for_each_entry(ops, &dsa_tag_drivers_list, list) {
+		if (ops->proto == tag_protocol) {
+			found = true;
+			break;
+		}
+	}
+
+	if (found) {
+		if (!try_module_get(ops->owner))
+			ops = ERR_PTR(-ENOPROTOOPT);
+	} else {
+		ops = ERR_PTR(-ENOPROTOOPT);
+	}
+
+	mutex_unlock(&dsa_tag_drivers_lock);
 
 	return ops;
 }
 
 void dsa_tag_driver_put(const struct dsa_device_ops *ops)
 {
+	module_put(ops->owner);
 }
 
 static int dev_is_class(struct device *dev, void *class)