Skip to contentSkip to conversation

leds: trigger: load trigger modules on-demand if used as default trigger

PATCH Applied Heiner Kallweit 2 participants 4 messages Dec 21, 2023 – Jan 11, 2024 LED

lore
Share & tools
lore
#0 lore raw

cover leds: trigger: load trigger modules on-demand if used as default trigger

Even if a trigger is set as default trigger for a LED device, the respective trigger module (if built as module) isn't automatically loaded by the kernel if the LED device is registered. I think we can do better. Try to load the module asynchronously by alias ledtrig:<trigger name>. This requires that such an alias is added to relevant triggers. At first do this for the netdev trigger.

Tested with the recently added r8169 LED support using the netdev trigger.

Heiner Kallweit (2):
leds: trigger: load trigger modules on-demand if used as default
trigger
leds: trigger: netdev: Add module alias ledtrig:netdev

 drivers/leds/led-triggers.c           | 9 +++++++++
 drivers/leds/trigger/ledtrig-netdev.c | 1 +
 2 files changed, 10 insertions(+)
Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/2 leds: trigger: load trigger modules on-demand if used as default trigger

Even if a trigger is set as default trigger for a LED device, the respective trigger module (if built as module) isn't automatically loaded by the kernel if the LED device is registered. I think we can do better. Try to load the module asynchronously by alias ledtrig:<trigger name>. This requires that such an alias is added to relevant triggers.

---
 drivers/leds/led-triggers.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/leds/led-triggers.c +9 -0
index bd59a14a4..71cb0aee5 100644
@@ -250,6 +250,7 @@ EXPORT_SYMBOL_GPL(led_trigger_remove);
 void led_trigger_set_default(struct led_classdev *led_cdev)
 {
 	struct led_trigger *trig;
+	bool found = false;
 
 	if (!led_cdev->default_trigger)
 		return;
@@ -259,6 +260,7 @@ void led_trigger_set_default(struct led_classdev *led_cdev)
 	list_for_each_entry(trig, &trigger_list, next_trig) {
 		if (!strcmp(led_cdev->default_trigger, trig->name) &&
 		    trigger_relevant(led_cdev, trig)) {
+			found = true;
 			led_cdev->flags |= LED_INIT_DEFAULT_TRIGGER;
 			led_trigger_set(led_cdev, trig);
 			break;
@@ -266,6 +268,13 @@ void led_trigger_set_default(struct led_classdev *led_cdev)
 	}
 	up_write(&led_cdev->trigger_lock);
 	up_read(&triggers_list_lock);
+
+	/*
+	 * If default trigger wasn't found, maybe trigger module isn't loaded yet.
+	 * Once loaded it will re-probe with all led_cdev's.
+	 */
+	if (!found)
+		request_module_nowait("ledtrig:%s", led_cdev->default_trigger);
 }
 EXPORT_SYMBOL_GPL(led_trigger_set_default);
 
Signature · 1 line
2.43.0
#2 lore raw

PATCH 2/2 leds: trigger: netdev: Add module alias ledtrig:netdev

In reply to Heiner Kallweit

Add module alias ledtrig:netdev to enable auto-loading of the module.

---
 drivers/leds/trigger/ledtrig-netdev.c | 1 +
 1 file changed, 1 insertion(+)
drivers/leds/trigger/ledtrig-netdev.c +1 -0
index 6cbba44dd..2df77825a 100644
@@ -651,3 +651,4 @@ MODULE_AUTHOR("Ben Whitten <[email protected]>");
 MODULE_AUTHOR("Oliver Jowett <[email protected]>");
 MODULE_DESCRIPTION("Netdev LED trigger");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("ledtrig:netdev");
Signature · 1 line
2.43.0
maintainer Applied
#3 lore raw
In reply to Heiner Kallweit
Quoted 8 lines · Heiner Kallweit

Even if a trigger is set as default trigger for a LED device, the respective trigger module (if built as module) isn't automatically loaded by the kernel if the LED device is registered. I think we can do better. Try to load the module asynchronously by alias ledtrig:<trigger name>. This requires that such an alias is added to relevant triggers. At first do this for the netdev trigger.

[...]

Applied, thanks!

[1/2] leds: trigger: load trigger modules on-demand if used as default trigger

      commit: 5edf7f11313d99dc96d30b5d99b68e56d7c3d4e1
[2/2] leds: trigger: netdev: Add module alias ledtrig:netdev
      commit: defaca9f7cfb27681064e20f4aaa8dcf4dc09590

--
Lee Jones [李琼斯]