From: Ian Pilcher <arequipeno@gmail.com>
To: axboe@kernel.dk, pavel@ucw.cz
Cc: linux-leds@vger.kernel.org, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org,
kabel@kernel.org
Subject: [PATCH v2 15/15] leds: trigger: blkdev: Add disk cleanup and init/exit functions
Date: Thu, 9 Sep 2021 17:25:13 -0500 [thread overview]
Message-ID: <20210909222513.2184795-16-arequipeno@gmail.com> (raw)
In-Reply-To: <20210909222513.2184795-1-arequipeno@gmail.com>
Disk cleanup function - blkdev_disk_cleanup():
* Called when block device is being removed
* Called via __ledtrig_blkdev_disk_cleanup function pointer from
ledtrig_blkdev_disk_cleanup() in ledtrig-blkdev-core.c
Init function - blkdev_init():
* Initialize interval (convert default value to jiffies)
* Initialize __ledtrig_blkdev_disk_cleanup function pointer
* Register the block device LED trigger
Exit function - blkdev_exit():
* Unregister the LED trigger
* Set __ledtrig_blkdev_disk_cleanup back to NULL
Make LED trigger struct (ledtrig_blkdev_trigger) static (as it's now
referenced in blkdev_init()).
Signed-off-by: Ian Pilcher <arequipeno@gmail.com>
---
drivers/leds/trigger/ledtrig-blkdev.c | 65 ++++++++++++++++++++++++++-
1 file changed, 64 insertions(+), 1 deletion(-)
diff --git a/drivers/leds/trigger/ledtrig-blkdev.c b/drivers/leds/trigger/ledtrig-blkdev.c
index 4b88f877ee81..96ea694ce29f 100644
--- a/drivers/leds/trigger/ledtrig-blkdev.c
+++ b/drivers/leds/trigger/ledtrig-blkdev.c
@@ -435,6 +435,23 @@ static ssize_t unlink_device_store(struct device *const dev,
static DEVICE_ATTR_WO(unlink_device);
+/*
+ *
+ * Disassociate all LEDs from a block device (because it's going away)
+ *
+ */
+
+static void blkdev_disk_cleanup(struct gendisk *const gd)
+{
+ struct ledtrig_blkdev_link *link;
+ struct hlist_node *next;
+
+ hlist_for_each_entry_safe(link, next,
+ &gd->ledtrig->leds, disk_leds_node)
+ blkdev_disk_unlink_locked(link->led, link, gd->ledtrig);
+}
+
+
/*
*
* Disassociate an LED from the trigger
@@ -615,9 +632,55 @@ static const struct attribute_group *ledtrig_blkdev_attr_groups[] = {
NULL
};
-struct led_trigger ledtrig_blkdev_trigger = {
+static struct led_trigger ledtrig_blkdev_trigger = {
.name = "blkdev",
.activate = blkdev_activate,
.deactivate = blkdev_deactivate,
.groups = ledtrig_blkdev_attr_groups,
};
+
+static int __init blkdev_init(void)
+{
+ int ret;
+
+ ret = mutex_lock_interruptible(&ledtrig_blkdev_mutex);
+ if (ret != 0)
+ return ret;
+
+ ledtrig_blkdev_interval = msecs_to_jiffies(LEDTRIG_BLKDEV_INTERVAL);
+ __ledtrig_blkdev_disk_cleanup = blkdev_disk_cleanup;
+
+ /*
+ * Can't call led_trigger_register() with ledtrig_blkdev_mutex locked.
+ * If an LED has blkdev as its default_trigger, blkdev_activate() will
+ * be called for that LED, and it will try to lock the mutex, which will
+ * hang.
+ */
+ mutex_unlock(&ledtrig_blkdev_mutex);
+
+ ret = led_trigger_register(&ledtrig_blkdev_trigger);
+ if (ret != 0) {
+ mutex_lock(&ledtrig_blkdev_mutex);
+ __ledtrig_blkdev_disk_cleanup = NULL;
+ mutex_unlock(&ledtrig_blkdev_mutex);
+ }
+
+ return ret;
+}
+module_init(blkdev_init);
+
+static void __exit blkdev_exit(void)
+{
+ mutex_lock(&ledtrig_blkdev_mutex);
+
+ /*
+ * It's OK to call led_trigger_unregister() with the mutex locked,
+ * because the module can only be unloaded when no LEDs are using
+ * the blkdev trigger, so blkdev_deactivate() won't be called.
+ */
+ led_trigger_unregister(&ledtrig_blkdev_trigger);
+ __ledtrig_blkdev_disk_cleanup = NULL;
+
+ mutex_unlock(&ledtrig_blkdev_mutex);
+}
+module_exit(blkdev_exit);
--
2.31.1
next prev parent reply other threads:[~2021-09-09 22:25 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-09 22:24 [PATCH v2 00/15] Introduce block device LED trigger Ian Pilcher
2021-09-09 22:24 ` [PATCH v2 01/15] docs: Add block device (blkdev) LED trigger documentation Ian Pilcher
2021-09-09 22:25 ` [PATCH v2 02/15] leds: trigger: blkdev: Add build infrastructure Ian Pilcher
2021-09-10 1:32 ` Marek Behún
2021-09-09 22:25 ` [PATCH v2 03/15] leds: trigger: blkdev: Add functions needed by block changes Ian Pilcher
2021-09-09 22:25 ` [PATCH v2 04/15] block: Add block device LED trigger integrations Ian Pilcher
2021-09-09 23:27 ` Chaitanya Kulkarni
2021-09-10 1:23 ` Marek Behún
2021-09-10 15:00 ` Ian Pilcher
2021-09-10 1:38 ` Marek Behún
2021-09-09 22:25 ` [PATCH v2 05/15] leds: trigger: blkdev: Complete functions called by block subsys Ian Pilcher
2021-09-09 22:25 ` [PATCH v2 06/15] leds: trigger: blkdev: Add function to get gendisk by name Ian Pilcher
2021-09-10 6:45 ` Greg KH
2021-09-10 15:17 ` Ian Pilcher
2021-09-10 15:23 ` Greg KH
2021-09-10 16:28 ` Ian Pilcher
2021-09-09 22:25 ` [PATCH v2 07/15] leds: trigger: blkdev: Add constants and types Ian Pilcher
2021-09-09 22:25 ` [PATCH v2 08/15] leds: trigger: blkdev: Add stub LED trigger structure Ian Pilcher
2021-09-09 22:25 ` [PATCH v2 09/15] leds: trigger: blkdev: Check devices for activity and blink LEDs Ian Pilcher
2021-09-10 1:48 ` Marek Behún
2021-09-10 2:17 ` Marek Behún
2021-09-10 15:09 ` Ian Pilcher
2021-09-10 15:12 ` Marek Behún
2021-09-10 21:23 ` Ian Pilcher
2021-09-09 22:25 ` [PATCH v2 10/15] leds: trigger: blkdev: Add LED trigger activate function Ian Pilcher
2021-09-10 6:47 ` Greg KH
2021-09-10 16:10 ` Ian Pilcher
2021-09-09 22:25 ` [PATCH v2 11/15] leds: trigger: blkdev: Enable linking block devices to LEDs Ian Pilcher
2021-09-10 6:48 ` Greg KH
2021-09-10 16:25 ` Ian Pilcher
2021-09-09 22:25 ` [PATCH v2 12/15] leds: trigger: blkdev: Enable unlinking block devices from LEDs Ian Pilcher
2021-09-14 9:58 ` Dan Carpenter
2021-09-09 22:25 ` [PATCH v2 13/15] leds: trigger: blkdev: Add LED trigger deactivate function Ian Pilcher
2021-09-09 22:25 ` [PATCH v2 14/15] leds: trigger: blkdev: Add remaining sysfs attributes Ian Pilcher
2021-09-09 22:25 ` Ian Pilcher [this message]
2021-09-10 2:09 ` [PATCH v2 00/15] Introduce block device LED trigger Marek Behún
2021-09-10 14:04 ` Ian Pilcher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210909222513.2184795-16-arequipeno@gmail.com \
--to=arequipeno@gmail.com \
--cc=axboe@kernel.dk \
--cc=gregkh@linuxfoundation.org \
--cc=kabel@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).