Skip to contentSkip to conversation

introduce LED block device activity trigger

PATCH Superseded Akinobu Mita 3 participants 14 messages Aug 10, 2019 – Aug 13, 2019

Subsystems (5)
SCSI Block layer NVMe LED +1 more subsystems

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover introduce LED block device activity trigger

This work is inspired by the report on linux-nvme mailing list.

disk-activity trigger not working for nvme disk:
http://lists.infradead.org/pipermail/linux-nvme/2019-July/025253.html

This LED block device activity trigger works with any block devices.

* v3
- Avoid the name collision with LED_OFF and LED_ON
- Add ABI documentation
- Add more detail to Kconfig help text

* v2
- Remove "move declaration of led_stop_software_blink() to linux/leds.h" patch
- Move the trigger implementation to drivers/leds/trigger
- s/blk_ledtrig/ledtrig_blk/
- Add CONFIG_LEDS_TRIGGER_BLOCK
- Fix wrong bitops usages
- Add interface to stop and restart polling disk stats
- Stop polling disk stats for scsi disk during runtime suspend

Akinobu Mita (6):
block: umem: rename LED_* macros to MEMCTRL_LED_*
scsi: mvsas: rename LED_* enums to SGPIO_LED_*
scsi: nsp32: rename LED_* macros to EXT_PORT_LED_*
block: introduce LED block device activity trigger
ledtrig-blk: add interface to stop and restart polling disk stats
scsi: sd: stop polling disk stats by ledtrig-blk during runtime
suspend

 .../ABI/testing/sysfs-class-led-trigger-blk        |  37 +++
 block/genhd.c                                      |   2 +
 drivers/block/umem.c                               |  20 +-
 drivers/block/umem.h                               |  20 +-
 drivers/leds/trigger/Kconfig                       |   9 +
 drivers/leds/trigger/Makefile                      |   1 +
 drivers/leds/trigger/ledtrig-blk.c                 | 258 +++++++++++++++++++++
 drivers/scsi/mvsas/mv_94xx.c                       |   2 +-
 drivers/scsi/mvsas/mv_94xx.h                       |  24 +-
 drivers/scsi/nsp32.c                               |   7 +-
 drivers/scsi/nsp32.h                               |   4 +-
 drivers/scsi/sd.c                                  |  40 ++--
 include/linux/genhd.h                              |   3 +
 include/linux/leds.h                               |  38 +++
 14 files changed, 410 insertions(+), 55 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-blk
 create mode 100644 drivers/leds/trigger/ledtrig-blk.c
Cc Frank Steiner <fsteiner-mail1 at bio.ifi.lmu.de>
Cc Jacek Anaszewski <jacek.anaszewski at gmail.com>
Cc Pavel Machek <pavel at ucw.cz>
Cc Dan Murphy <dmurphy at ti.com>
Cc Jens Axboe <axboe at kernel.dk>
Cc "James E.J. Bottomley" <jejb at linux.ibm.com>
Cc "Martin K. Petersen" <martin.petersen at oracle.com>
Cc GOTO Masanori <gotom at debian.or.jp>
Cc YOKOTA Hiroshi <yokota at netlab.is.tsukuba.ac.jp>
Cc Hannes Reinecke <hare at suse.com>
Signature · 1 line
2.7.4
#1 lore raw

PATCH v3 1/6 block: umem: rename LED_* macros to MEMCTRL_LED_*

The umem driver defines LED_* macros for MEMCTRLCMD_LEDCTRL register values. The LED_OFF and LED_ON macros conflict with the LED subsystem's LED_OFF and LED_ON enums.

This renames these LED_* macros to MEMCTRL_LED_* in umem driver.

Cc Frank Steiner <fsteiner-mail1 at bio.ifi.lmu.de>
Cc Jacek Anaszewski <jacek.anaszewski at gmail.com>
Cc Pavel Machek <pavel at ucw.cz>
Cc Dan Murphy <dmurphy at ti.com>
Cc Jens Axboe <axboe at kernel.dk>
Cc "James E.J. Bottomley" <jejb at linux.ibm.com>
Cc "Martin K. Petersen" <martin.petersen at oracle.com>
Cc Hannes Reinecke <hare at suse.com>
Signed-off-by Akinobu Mita <akinobu.mita at gmail.com>
---
 drivers/block/umem.c | 20 ++++++++++----------
 drivers/block/umem.h | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)
drivers/block/umem.c +10 -10
index 1f3f9e0..1109308 100644
@@ -167,14 +167,14 @@ static int set_userbit(struct cardinfo *card, int bit, unsigned char state)
 }
 
 /*
- * NOTE: For the power LED, use the LED_POWER_* macros since they differ
+ * NOTE: For the power LED, use the MEMCTRL_LED_POWER_* macros since they differ
  */
 static void set_led(struct cardinfo *card, int shift, unsigned char state)
 {
 	unsigned char led;
 
 	led = readb(card->csr_remap + MEMCTRLCMD_LEDCTRL);
-	if (state == LED_FLIP)
+	if (state == MEMCTRL_LED_FLIP)
 		led ^= (1<<shift);
 	else {
 		led &= ~(0x03 << shift);
@@ -268,7 +268,7 @@ static void mm_start_io(struct cardinfo *card)
 
 
 	if (debug & DEBUG_LED_ON_TRANSFER)
-		set_led(card, LED_REMOVE, LED_ON);
+		set_led(card, MEMCTRL_LED_REMOVE, MEMCTRL_LED_ON);
 
 	desc = &page->desc[page->headcnt];
 	writel(0, card->csr_remap + DMA_PCI_ADDR);
@@ -477,7 +477,7 @@ static void process_page(unsigned long data)
 	}
 
 	if (debug & DEBUG_LED_ON_TRANSFER)
-		set_led(card, LED_REMOVE, LED_OFF);
+		set_led(card, MEMCTRL_LED_REMOVE, MEMCTRL_LED_OFF);
 
 	if (card->check_batteries) {
 		card->check_batteries = 0;
@@ -652,13 +652,13 @@ HW_TRACE(0x36);
 static void set_fault_to_battery_status(struct cardinfo *card)
 {
 	if (card->battery[0].good && card->battery[1].good)
-		set_led(card, LED_FAULT, LED_OFF);
+		set_led(card, MEMCTRL_LED_FAULT, MEMCTRL_LED_OFF);
 	else if (card->battery[0].warned || card->battery[1].warned)
-		set_led(card, LED_FAULT, LED_ON);
+		set_led(card, MEMCTRL_LED_FAULT, MEMCTRL_LED_ON);
 	else if (!card->battery[0].good && !card->battery[1].good)
-		set_led(card, LED_FAULT, LED_FLASH_7_0);
+		set_led(card, MEMCTRL_LED_FAULT, MEMCTRL_LED_FLASH_7_0);
 	else
-		set_led(card, LED_FAULT, LED_FLASH_3_5);
+		set_led(card, MEMCTRL_LED_FAULT, MEMCTRL_LED_FLASH_3_5);
 }
 
 static void init_battery_timer(void);
@@ -919,8 +919,8 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 	}
 
 	/* Clear the LED's we control */
-	set_led(card, LED_REMOVE, LED_OFF);
-	set_led(card, LED_FAULT, LED_OFF);
+	set_led(card, MEMCTRL_LED_REMOVE, MEMCTRL_LED_OFF);
+	set_led(card, MEMCTRL_LED_FAULT, MEMCTRL_LED_OFF);
 
 	batt_status = readb(card->csr_remap + MEMCTRLSTATUS_BATTERY);
 
drivers/block/umem.h +10 -10
index 5838497..cc9cb37 100644
@@ -32,16 +32,16 @@
 #define  MEM_2_GB		0xe0
 
 #define MEMCTRLCMD_LEDCTRL	0x08
-#define  LED_REMOVE		2
-#define  LED_FAULT		4
-#define  LED_POWER		6
-#define	 LED_FLIP		255
-#define  LED_OFF		0x00
-#define  LED_ON			0x01
-#define  LED_FLASH_3_5		0x02
-#define  LED_FLASH_7_0		0x03
-#define  LED_POWER_ON		0x00
-#define  LED_POWER_OFF		0x01
+#define  MEMCTRL_LED_REMOVE	2
+#define  MEMCTRL_LED_FAULT	4
+#define  MEMCTRL_LED_POWER	6
+#define  MEMCTRL_LED_FLIP	255
+#define  MEMCTRL_LED_OFF	0x00
+#define  MEMCTRL_LED_ON		0x01
+#define  MEMCTRL_LED_FLASH_3_5	0x02
+#define  MEMCTRL_LED_FLASH_7_0	0x03
+#define  MEMCTRL_LED_POWER_ON	0x00
+#define  MEMCTRL_LED_POWER_OFF	0x01
 #define  USER_BIT1		0x01
 #define  USER_BIT2		0x02
 
Signature · 1 line
2.7.4
Acked-by on v3 1/6
#2 lore raw

Re: [PATCH v3 1/6] block: umem: rename LED_* macros to MEMCTRL_LED_*

Quoted 8 lines · Akinobu Mita

The umem driver defines LED_* macros for MEMCTRLCMD_LEDCTRL register values. The LED_OFF and LED_ON macros conflict with the LED subsystem's LED_OFF and LED_ON enums.

This renames these LED_* macros to MEMCTRL_LED_* in umem driver.

Cc Frank Steiner <fsteiner-mail1 at bio.ifi.lmu.de>
Cc Jacek Anaszewski <jacek.anaszewski at gmail.com>
Acked-by Pavel Machek <pavel at ucw.cz>
Signature · 9 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-nvme/attachments/20190813/9f14a906/attachment.sig>
#3 lore raw

PATCH v3 2/6 scsi: mvsas: rename LED_* enums to SGPIO_LED_*

In reply to Akinobu Mita

The mvsas driver declares LED_* enums for enum sgpio_led_status. The LED_OFF and LED_ON enums cause redeclaration of enumerator with the LED subsystem's LED_OFF and LED_ON enums.

This adds 'SGPIO_' prefix to these enums in mvsas driver.

Cc Frank Steiner <fsteiner-mail1 at bio.ifi.lmu.de>
Cc Jacek Anaszewski <jacek.anaszewski at gmail.com>
Cc Pavel Machek <pavel at ucw.cz>
Cc Dan Murphy <dmurphy at ti.com>
Cc Jens Axboe <axboe at kernel.dk>
Cc "James E.J. Bottomley" <jejb at linux.ibm.com>
Cc "Martin K. Petersen" <martin.petersen at oracle.com>
Cc Hannes Reinecke <hare at suse.com>
Reviewed-by Hannes Reinecke <hare at suse.com>
Acked-by Pavel Machek <pavel at ucw.cz>
Signed-off-by Akinobu Mita <akinobu.mita at gmail.com>
---
 drivers/scsi/mvsas/mv_94xx.c |  2 +-
 drivers/scsi/mvsas/mv_94xx.h | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)
drivers/scsi/mvsas/mv_94xx.c +1 -1
index fc0b8eb..3558a625 100644
@@ -1085,7 +1085,7 @@ static int mvs_94xx_gpio_write(struct mvs_prv_info *mvs_prv,
 				block &= ~((0x7 << MVS_SGPIO_DCTRL_ACT_SHIFT)
 					<< driveshift);
 					/* hardwire activity bit to SOF */
-				block |= LED_BLINKA_SOF << (
+				block |= SGPIO_LED_BLINKA_SOF << (
 					MVS_SGPIO_DCTRL_ACT_SHIFT +
 					driveshift);
 				break;
drivers/scsi/mvsas/mv_94xx.h +12 -12
index a243182..2c96ff1 100644
@@ -275,23 +275,23 @@ enum sgpio_registers {
 };
 
 enum sgpio_led_status {
-	LED_OFF	= 0,
-	LED_ON	= 1,
-	LED_BLINKA	= 2,
-	LED_BLINKA_INV	= 3,
-	LED_BLINKA_SOF	= 4,
-	LED_BLINKA_EOF	= 5,
-	LED_BLINKB	= 6,
-	LED_BLINKB_INV	= 7,
+	SGPIO_LED_OFF		= 0,
+	SGPIO_LED_ON		= 1,
+	SGPIO_LED_BLINKA	= 2,
+	SGPIO_LED_BLINKA_INV	= 3,
+	SGPIO_LED_BLINKA_SOF	= 4,
+	SGPIO_LED_BLINKA_EOF	= 5,
+	SGPIO_LED_BLINKB	= 6,
+	SGPIO_LED_BLINKB_INV	= 7,
 };
 
-#define DEFAULT_SGPIO_BITS ((LED_BLINKA_SOF << \
+#define DEFAULT_SGPIO_BITS ((SGPIO_LED_BLINKA_SOF << \
 				MVS_SGPIO_DCTRL_ACT_SHIFT) << (8 * 3) | \
-			(LED_BLINKA_SOF << \
+			(SGPIO_LED_BLINKA_SOF << \
 				MVS_SGPIO_DCTRL_ACT_SHIFT) << (8 * 2) | \
-			(LED_BLINKA_SOF << \
+			(SGPIO_LED_BLINKA_SOF << \
 				MVS_SGPIO_DCTRL_ACT_SHIFT) << (8 * 1) | \
-			(LED_BLINKA_SOF << \
+			(SGPIO_LED_BLINKA_SOF << \
 				MVS_SGPIO_DCTRL_ACT_SHIFT) << (8 * 0))
 
 /*
Signature · 1 line
2.7.4
Acked-by on v3 2/6
#4 lore raw

Re: [PATCH v3 2/6] scsi: mvsas: rename LED_* enums to SGPIO_LED_*

Quoted 8 lines · Akinobu Mita

The mvsas driver declares LED_* enums for enum sgpio_led_status. The LED_OFF and LED_ON enums cause redeclaration of enumerator with the LED subsystem's LED_OFF and LED_ON enums.

This adds 'SGPIO_' prefix to these enums in mvsas driver.

Cc Frank Steiner <fsteiner-mail1 at bio.ifi.lmu.de>
Cc Jacek Anaszewski <jacek.anaszewski at gmail.com>
Acked-by Pavel Machek <pavel at ucw.cz>
Signature · 9 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-nvme/attachments/20190813/bcaeee53/attachment.sig>
#5 lore raw

PATCH v3 3/6 scsi: nsp32: rename LED_* macros to EXT_PORT_LED_*

In reply to Akinobu Mita

The nsp32 driver defines LED_ON and LED_OFF macros for EXT_PORT_DDR or EXT_PORT register values. The LED_OFF and LED_ON macros conflict with the LED subsystem's LED_OFF and LED_ON enums.

This renames these LED_* macros to EXT_PORT_LED_* in nsp32 driver.

Cc Frank Steiner <fsteiner-mail1 at bio.ifi.lmu.de>
Cc Jacek Anaszewski <jacek.anaszewski at gmail.com>
Cc Pavel Machek <pavel at ucw.cz>
Cc Dan Murphy <dmurphy at ti.com>
Cc Jens Axboe <axboe at kernel.dk>
Cc "James E.J. Bottomley" <jejb at linux.ibm.com>
Cc "Martin K. Petersen" <martin.petersen at oracle.com>
Cc GOTO Masanori <gotom at debian.or.jp>
Cc YOKOTA Hiroshi <yokota at netlab.is.tsukuba.ac.jp>
Cc Hannes Reinecke <hare at suse.com>
Reviewed-by Hannes Reinecke <hare at suse.com>
Acked-by Pavel Machek <pavel at ucw.cz>
Signed-off-by Akinobu Mita <akinobu.mita at gmail.com>
---
 drivers/scsi/nsp32.c | 7 ++++---
 drivers/scsi/nsp32.h | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/scsi/nsp32.c +4 -3
index 70db792..8170358 100644
@@ -763,7 +763,8 @@ static int nsp32_arbitration(struct scsi_cmnd *SCpnt, unsigned int base)
 	if (arbit & ARBIT_WIN) {
 		/* Arbitration succeeded */
 		SCpnt->result = DID_OK << 16;
-		nsp32_index_write1(base, EXT_PORT, LED_ON); /* PCI LED on */
+		/* PCI LED on */
+		nsp32_index_write1(base, EXT_PORT, EXT_PORT_LED_ON);
 	} else if (arbit & ARBIT_FAIL) {
 		/* Arbitration failed */
 		SCpnt->result = DID_BUS_BUSY << 16;
@@ -1137,8 +1138,8 @@ static int nsp32hw_init(nsp32_hw_data *data)
 	nsp32_write2(base, IRQ_CONTROL, 0);
 
 	/* PCI LED off */
-	nsp32_index_write1(base, EXT_PORT_DDR, LED_OFF);
-	nsp32_index_write1(base, EXT_PORT,     LED_OFF);
+	nsp32_index_write1(base, EXT_PORT_DDR, EXT_PORT_LED_OFF);
+	nsp32_index_write1(base, EXT_PORT,     EXT_PORT_LED_OFF);
 
 	return TRUE;
 }
drivers/scsi/nsp32.h +2 -2
index ab0726c..a7553ea 100644
@@ -306,8 +306,8 @@ typedef u16 u16_le;
 
 #define EXT_PORT_DDR		0x02	/* BASE+08, IDX+02, B, R/W */
 #define EXT_PORT		0x03	/* BASE+08, IDX+03, B, R/W */
-# define LED_ON	 (0)
-# define LED_OFF BIT(0)
+# define EXT_PORT_LED_ON	(0)
+# define EXT_PORT_LED_OFF	BIT(0)
 
 #define IRQ_SELECT		0x04	/* BASE+08, IDX+04, W, R/W */
 # define IRQSELECT_RESELECT_IRQ      BIT(0)
Signature · 1 line
2.7.4
#6 lore raw

PATCH v3 4/6 block: introduce LED block device activity trigger

In reply to Akinobu Mita

This allows LEDs to be controlled by block device activity.

We already have ledtrig-disk (LED disk activity trigger), but the lower level disk drivers need to utilize ledtrig_disk_activity() to make the LED blink.

The LED block device trigger doesn't require the lower level drivers to have any instrumentation. The activity is collected by polling the disk stats.

Example:

echo block-nvme0n1 > /sys/class/leds/diy/trigger

Cc Frank Steiner <fsteiner-mail1 at bio.ifi.lmu.de>
Cc Jacek Anaszewski <jacek.anaszewski at gmail.com>
Cc Pavel Machek <pavel at ucw.cz>
Cc Dan Murphy <dmurphy at ti.com>
Cc Jens Axboe <axboe at kernel.dk>
Cc "James E.J. Bottomley" <jejb at linux.ibm.com>
Cc "Martin K. Petersen" <martin.petersen at oracle.com>
Cc Hannes Reinecke <hare at suse.com>
Signed-off-by Akinobu Mita <akinobu.mita at gmail.com>

---
* v3
- Add ABI documentation
- Add more detail to Kconfig help text

 .../ABI/testing/sysfs-class-led-trigger-blk        |  37 ++++
 block/genhd.c                                      |   2 +
 drivers/leds/trigger/Kconfig                       |   9 +
 drivers/leds/trigger/Makefile                      |   1 +
 drivers/leds/trigger/ledtrig-blk.c                 | 225 +++++++++++++++++++++
 include/linux/genhd.h                              |   3 +
 include/linux/leds.h                               |  27 +++
 7 files changed, 304 insertions(+)
 create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-blk
 create mode 100644 drivers/leds/trigger/ledtrig-blk.c
Documentation/ABI/testing/sysfs-class-led-trigger-blk new file +37 -0
new file mode 100644
index 0000000..73472c3
@@ -0,0 +1,37 @@
+What:		/sys/class/leds/<led>/interval
+Date:		Aug 2019
+KernelVersion:	5.4
+Contact:	linux-leds at vger.kernel.org
+Description:
+		Specifies the duration of the LED blink in milliseconds.
+		Defaults to 50 ms.
+
+What:		/sys/class/leds/<led>/read
+Date:		Aug 2019
+KernelVersion:	5.4
+Contact:	linux-leds at vger.kernel.org
+Description:
+		Signal data read on the block device.
+		If set to 0, the LED will not blink on data read.
+		If set to 1 (default), the LED will blink for the milliseconds
+		specified in interval to signal data read.
+
+What:		/sys/class/leds/<led>/write
+Date:		Aug 2019
+KernelVersion:	5.4
+Contact:	linux-leds at vger.kernel.org
+Description:
+		Signal data written on the block device.
+		If set to 0, the LED will not blink on data written.
+		If set to 1 (default), the LED will blink for the milliseconds
+		specified in interval to signal data written.
+
+What:		/sys/class/leds/<led>/discard
+Date:		Aug 2019
+KernelVersion:	5.4
+Contact:	linux-leds at vger.kernel.org
+Description:
+		Signal data discarded on the block device.
+		If set to 0, the LED will not blink on data discarded.
+		If set to 1 (default), the LED will blink for the milliseconds
+		specified in interval to signal data discarded.
block/genhd.c +2 -0
index 54f1f0d3..1c68861 100644
@@ -745,6 +745,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
 
 	disk_add_events(disk);
 	blk_integrity_add(disk);
+	ledtrig_blk_register(disk);
 }
 
 void device_add_disk(struct device *parent, struct gendisk *disk,
@@ -766,6 +767,7 @@ void del_gendisk(struct gendisk *disk)
 	struct disk_part_iter piter;
 	struct hd_struct *part;
 
+	ledtrig_blk_unregister(disk);
 	blk_integrity_del(disk);
 	disk_del_events(disk);
 
drivers/leds/trigger/Kconfig +9 -0
index ce9429c..e399a11 100644
@@ -144,4 +144,13 @@ config LEDS_TRIGGER_AUDIO
 	  the audio mute and mic-mute changes.
 	  If unsure, say N
 
+config LEDS_TRIGGER_BLOCK
+	bool "LED Block device Trigger"
+	depends on BLOCK
+	help
+	  This allows LEDs to be controlled by block device activity.
+	  This trigger doesn't require the lower level drivers to have any
+	  instrumentation. The activity is collected by polling the disk stats.
+	  If unsure, say Y.
+
 endif # LEDS_TRIGGERS
drivers/leds/trigger/Makefile +1 -0
index 733a83e..60200eb 100644
@@ -15,3 +15,4 @@ obj-$(CONFIG_LEDS_TRIGGER_PANIC)	+= ledtrig-panic.o
 obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
 obj-$(CONFIG_LEDS_TRIGGER_PATTERN)	+= ledtrig-pattern.o
 obj-$(CONFIG_LEDS_TRIGGER_AUDIO)	+= ledtrig-audio.o
+obj-$(CONFIG_LEDS_TRIGGER_BLOCK)	+= ledtrig-blk.o
drivers/leds/trigger/ledtrig-blk.c new file +225 -0

225 lines not on this page · raw message

include/linux/genhd.h +3 -0
index 8b5330d..b2c934e 100644
@@ -17,6 +17,7 @@
 #include <linux/percpu-refcount.h>
 #include <linux/uuid.h>
 #include <linux/blk_types.h>
+#include <linux/leds.h>
 #include <asm/local.h>
 
 #ifdef CONFIG_BLOCK
@@ -219,6 +220,8 @@ struct gendisk {
 	int node_id;
 	struct badblocks *bb;
 	struct lockdep_map lockdep_map;
+
+	struct ledtrig_blk led;
 };
 
 static inline struct gendisk *part_to_disk(struct hd_struct *part)
include/linux/leds.h +27 -0
index 9b2bf57..395fa61 100644
@@ -517,4 +517,31 @@ static inline void ledtrig_audio_set(enum led_audio type,
 }
 #endif
 
+struct gendisk;
+
+#ifdef CONFIG_LEDS_TRIGGER_BLOCK
+
+struct ledtrig_blk {
+	struct led_trigger trig;
+};
+
+int ledtrig_blk_register(struct gendisk *disk);
+void ledtrig_blk_unregister(struct gendisk *disk);
+
+#else
+
+struct ledtrig_blk {
+};
+
+static inline int ledtrig_blk_register(struct gendisk *disk)
+{
+	return 0;
+}
+
+static inline void ledtrig_blk_unregister(struct gendisk *disk)
+{
+}
+
+#endif /* CONFIG_LEDS_TRIGGER_BLOCK */
+
 #endif		/* __LINUX_LEDS_H_INCLUDED */
Signature · 1 line
2.7.4
#7 lore raw

Re: [PATCH v3 4/6] block: introduce LED block device activity trigger

Hi Akinobu,

Thank you for the update. I have one more remark to this patch below.

Quoted 39 lines · Akinobu Mita

This allows LEDs to be controlled by block device activity.

We already have ledtrig-disk (LED disk activity trigger), but the lower level disk drivers need to utilize ledtrig_disk_activity() to make the LED blink.

The LED block device trigger doesn't require the lower level drivers to have any instrumentation. The activity is collected by polling the disk stats.

Example:

echo block-nvme0n1 > /sys/class/leds/diy/trigger

Cc Frank Steiner <fsteiner-mail1 at bio.ifi.lmu.de>
Cc Jacek Anaszewski <jacek.anaszewski at gmail.com>
Cc Pavel Machek <pavel at ucw.cz>
Cc Dan Murphy <dmurphy at ti.com>
Cc Jens Axboe <axboe at kernel.dk>
Cc "James E.J. Bottomley" <jejb at linux.ibm.com>
Cc "Martin K. Petersen" <martin.petersen at oracle.com>
Cc Hannes Reinecke <hare at suse.com>
Signed-off-by Akinobu Mita <akinobu.mita at gmail.com>

---
* v3
- Add ABI documentation
- Add more detail to Kconfig help text

 .../ABI/testing/sysfs-class-led-trigger-blk        |  37 ++++
 block/genhd.c                                      |   2 +
 drivers/leds/trigger/Kconfig                       |   9 +
 drivers/leds/trigger/Makefile                      |   1 +
 drivers/leds/trigger/ledtrig-blk.c                 | 225 +++++++++++++++++++++
 include/linux/genhd.h                              |   3 +
 include/linux/leds.h                               |  27 +++
 7 files changed, 304 insertions(+)
 create mode 100644 Documentation/ABI/testing/sysfs-class-led-trigger-blk
 create mode 100644 drivers/leds/trigger/ledtrig-blk.c

[...]

Quoted 14 lines
drivers/leds/trigger/ledtrig-blk.c new file +1 -0
+EXPORT_SYMBOL_GPL(ledtrig_blk_unregister);
include/linux/genhd.h +1 -0
index 8b5330d..b2c934e 100644
@@ -17,6 +17,7 @@
 #include <linux/percpu-refcount.h>
 #include <linux/uuid.h>
 #include <linux/blk_types.h>
+#include <linux/leds.h>
 #include <asm/local.h>
 
 #ifdef CONFIG_BLOCK

include/linux/genhd.h struct gendisk { · line 224

Quoted 5 lines
include/linux/genhd.h +2 -0
@@ -219,6 +220,8 @@ struct gendisk {
 	int node_id;
 	struct badblocks *bb;
 	struct lockdep_map lockdep_map;
+
+	struct ledtrig_blk led;

Please rename this property to led_trig to reflect its purpose accurately.

Quoted 40 lines
include/linux/genhd.h +0 -0
 };
 
 static inline struct gendisk *part_to_disk(struct hd_struct *part)
include/linux/leds.h +27 -0
index 9b2bf57..395fa61 100644
@@ -517,4 +517,31 @@ static inline void ledtrig_audio_set(enum led_audio type,
 }
 #endif
 
+struct gendisk;
+
+#ifdef CONFIG_LEDS_TRIGGER_BLOCK
+
+struct ledtrig_blk {
+	struct led_trigger trig;
+};
+
+int ledtrig_blk_register(struct gendisk *disk);
+void ledtrig_blk_unregister(struct gendisk *disk);
+
+#else
+
+struct ledtrig_blk {
+};
+
+static inline int ledtrig_blk_register(struct gendisk *disk)
+{
+	return 0;
+}
+
+static inline void ledtrig_blk_unregister(struct gendisk *disk)
+{
+}
+
+#endif /* CONFIG_LEDS_TRIGGER_BLOCK */
+
 #endif		/* __LINUX_LEDS_H_INCLUDED */
Signature · 2 lines
Best regards,
Jacek Anaszewski
#8 lore raw

Re: [PATCH v3 4/6] block: introduce LED block device activity trigger

In reply to Akinobu Mita
Quoted 6 lines · Akinobu Mita

This allows LEDs to be controlled by block device activity.

We already have ledtrig-disk (LED disk activity trigger), but the lower level disk drivers need to utilize ledtrig_disk_activity() to make the LED blink.

Quoted 7 lines

The LED block device trigger doesn't require the lower level drivers to have any instrumentation. The activity is collected by polling the disk stats.

Example:

echo block-nvme0n1 > /sys/class/leds/diy/trigger

Some machines have lots of block devices... Should we perhaps have "echo block > trigger; echo nvme0n1 > device"?

Best regards,
Pavel

Signature · 9 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-nvme/attachments/20190813/a5a8ffbc/attachment.sig>
#9 lore raw

Re: [PATCH v3 4/6] block: introduce LED block device activity trigger

2019?8?13?(?) 19:33 Pavel Machek <pavel at ucw.cz>:

Quoted 12 lines · Akinobu Mita
Quoted 10 lines

This allows LEDs to be controlled by block device activity.

We already have ledtrig-disk (LED disk activity trigger), but the lower level disk drivers need to utilize ledtrig_disk_activity() to make the LED blink.

The LED block device trigger doesn't require the lower level drivers to have any instrumentation. The activity is collected by polling the disk stats.

Quoted 6 lines
Quoted 3 lines

Example:

echo block-nvme0n1 > /sys/class/leds/diy/trigger

Some machines have lots of block devices... Should we perhaps have "echo block > trigger; echo nvme0n1 > device"?

I originally considered doing so, just like ledtrig-netdev. However, it turned out that we needed an additional mechanism to mediate between the led trigger registration and the block device unregistration.

#10 lore raw

PATCH v3 5/6 ledtrig-blk: add interface to stop and restart polling disk stats

In reply to Akinobu Mita

The LED block device activity trigger periodically polls the disk stats to collect the activity. However, it is pointless to poll while the block device is in quiescent state.

This provides an optional interface to stop and restart polling disk stats for the lower-level block drivers.

Cc Frank Steiner <fsteiner-mail1 at bio.ifi.lmu.de>
Cc Jacek Anaszewski <jacek.anaszewski at gmail.com>
Cc Pavel Machek <pavel at ucw.cz>
Cc Dan Murphy <dmurphy at ti.com>
Cc Jens Axboe <axboe at kernel.dk>
Cc "James E.J. Bottomley" <jejb at linux.ibm.com>
Cc "Martin K. Petersen" <martin.petersen at oracle.com>
Cc Hannes Reinecke <hare at suse.com>
Signed-off-by Akinobu Mita <akinobu.mita at gmail.com>
---
 drivers/leds/trigger/ledtrig-blk.c | 37 +++++++++++++++++++++++++++++++++++--
 include/linux/leds.h               | 11 +++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)
drivers/leds/trigger/ledtrig-blk.c +35 -2
index d5808c9..6b826ed 100644
@@ -153,8 +153,9 @@ static void ledtrig_blk_work(struct work_struct *work)
 		trig_data->last_activity = activity;
 	}
 
-	schedule_delayed_work(&trig_data->work,
-			      atomic_read(&trig_data->interval) * 2);
+	if (atomic_read(&disk->led.enable_count))
+		schedule_delayed_work(&trig_data->work,
+				      atomic_read(&trig_data->interval) * 2);
 }
 
 static int ledtrig_blk_activate(struct led_classdev *led_cdev)
@@ -190,6 +191,36 @@ static void ledtrig_blk_deactivate(struct led_classdev *led_cdev)
 	kfree(trig_data);
 }
 
+void ledtrig_blk_disable(struct gendisk *disk)
+{
+	if (disk)
+		atomic_dec(&disk->led.enable_count);
+}
+EXPORT_SYMBOL_GPL(ledtrig_blk_disable);
+
+void ledtrig_blk_enable(struct gendisk *disk)
+{
+	struct led_classdev *led_cdev;
+
+	if (!disk)
+		return;
+
+	atomic_inc(&disk->led.enable_count);
+
+	read_lock(&disk->led.trig.leddev_list_lock);
+
+	list_for_each_entry(led_cdev, &disk->led.trig.led_cdevs, trig_list) {
+		struct ledtrig_blk_data *trig_data =
+			led_get_trigger_data(led_cdev);
+
+		schedule_delayed_work(&trig_data->work,
+				      atomic_read(&trig_data->interval) * 2);
+	}
+
+	read_unlock(&disk->led.trig.leddev_list_lock);
+}
+EXPORT_SYMBOL_GPL(ledtrig_blk_enable);
+
 int ledtrig_blk_register(struct gendisk *disk)
 {
 	int ret;
@@ -203,6 +234,8 @@ int ledtrig_blk_register(struct gendisk *disk)
 	disk->led.trig.deactivate = ledtrig_blk_deactivate;
 	disk->led.trig.groups = ledtrig_blk_groups;
 
+	atomic_set(&disk->led.enable_count, 1);
+
 	ret = led_trigger_register(&disk->led.trig);
 	if (ret) {
 		kfree(disk->led.trig.name);
include/linux/leds.h +11 -0
index 395fa61..fd2eb7c 100644
@@ -523,8 +523,11 @@ struct gendisk;
 
 struct ledtrig_blk {
 	struct led_trigger trig;
+	atomic_t enable_count;
 };
 
+void ledtrig_blk_enable(struct gendisk *disk);
+void ledtrig_blk_disable(struct gendisk *disk);
 int ledtrig_blk_register(struct gendisk *disk);
 void ledtrig_blk_unregister(struct gendisk *disk);
 
@@ -533,6 +536,14 @@ void ledtrig_blk_unregister(struct gendisk *disk);
 struct ledtrig_blk {
 };
 
+static inline void ledtrig_blk_enable(struct gendisk *disk)
+{
+}
+
+static inline void ledtrig_blk_disable(struct gendisk *disk)
+{
+}
+
 static inline int ledtrig_blk_register(struct gendisk *disk)
 {
 	return 0;
Signature · 1 line
2.7.4
#11 lore raw

Re: [PATCH v3 5/6] ledtrig-blk: add interface to stop and restart polling disk stats

Hi Akinobu,

I don't see any vital reason to keep this change separately. We're introducing new trigger, so please just squash it with the patch 4/6.

Best regards,
Jacek Anaszewski

Quoted 115 lines · Akinobu Mita

The LED block device activity trigger periodically polls the disk stats to collect the activity. However, it is pointless to poll while the block device is in quiescent state.

This provides an optional interface to stop and restart polling disk stats for the lower-level block drivers.

Cc Frank Steiner <fsteiner-mail1 at bio.ifi.lmu.de>
Cc Jacek Anaszewski <jacek.anaszewski at gmail.com>
Cc Pavel Machek <pavel at ucw.cz>
Cc Dan Murphy <dmurphy at ti.com>
Cc Jens Axboe <axboe at kernel.dk>
Cc "James E.J. Bottomley" <jejb at linux.ibm.com>
Cc "Martin K. Petersen" <martin.petersen at oracle.com>
Cc Hannes Reinecke <hare at suse.com>
Signed-off-by Akinobu Mita <akinobu.mita at gmail.com>
---
 drivers/leds/trigger/ledtrig-blk.c | 37 +++++++++++++++++++++++++++++++++++--
 include/linux/leds.h               | 11 +++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)
drivers/leds/trigger/ledtrig-blk.c +35 -2
index d5808c9..6b826ed 100644
@@ -153,8 +153,9 @@ static void ledtrig_blk_work(struct work_struct *work)
 		trig_data->last_activity = activity;
 	}
 
-	schedule_delayed_work(&trig_data->work,
-			      atomic_read(&trig_data->interval) * 2);
+	if (atomic_read(&disk->led.enable_count))
+		schedule_delayed_work(&trig_data->work,
+				      atomic_read(&trig_data->interval) * 2);
 }
 
 static int ledtrig_blk_activate(struct led_classdev *led_cdev)
@@ -190,6 +191,36 @@ static void ledtrig_blk_deactivate(struct led_classdev *led_cdev)
 	kfree(trig_data);
 }
 
+void ledtrig_blk_disable(struct gendisk *disk)
+{
+	if (disk)
+		atomic_dec(&disk->led.enable_count);
+}
+EXPORT_SYMBOL_GPL(ledtrig_blk_disable);
+
+void ledtrig_blk_enable(struct gendisk *disk)
+{
+	struct led_classdev *led_cdev;
+
+	if (!disk)
+		return;
+
+	atomic_inc(&disk->led.enable_count);
+
+	read_lock(&disk->led.trig.leddev_list_lock);
+
+	list_for_each_entry(led_cdev, &disk->led.trig.led_cdevs, trig_list) {
+		struct ledtrig_blk_data *trig_data =
+			led_get_trigger_data(led_cdev);
+
+		schedule_delayed_work(&trig_data->work,
+				      atomic_read(&trig_data->interval) * 2);
+	}
+
+	read_unlock(&disk->led.trig.leddev_list_lock);
+}
+EXPORT_SYMBOL_GPL(ledtrig_blk_enable);
+
 int ledtrig_blk_register(struct gendisk *disk)
 {
 	int ret;
@@ -203,6 +234,8 @@ int ledtrig_blk_register(struct gendisk *disk)
 	disk->led.trig.deactivate = ledtrig_blk_deactivate;
 	disk->led.trig.groups = ledtrig_blk_groups;
 
+	atomic_set(&disk->led.enable_count, 1);
+
 	ret = led_trigger_register(&disk->led.trig);
 	if (ret) {
 		kfree(disk->led.trig.name);
include/linux/leds.h +11 -0
index 395fa61..fd2eb7c 100644
@@ -523,8 +523,11 @@ struct gendisk;
 
 struct ledtrig_blk {
 	struct led_trigger trig;
+	atomic_t enable_count;
 };
 
+void ledtrig_blk_enable(struct gendisk *disk);
+void ledtrig_blk_disable(struct gendisk *disk);
 int ledtrig_blk_register(struct gendisk *disk);
 void ledtrig_blk_unregister(struct gendisk *disk);
 
@@ -533,6 +536,14 @@ void ledtrig_blk_unregister(struct gendisk *disk);
 struct ledtrig_blk {
 };
 
+static inline void ledtrig_blk_enable(struct gendisk *disk)
+{
+}
+
+static inline void ledtrig_blk_disable(struct gendisk *disk)
+{
+}
+
 static inline int ledtrig_blk_register(struct gendisk *disk)
 {
 	return 0;
#12 lore raw

Re: [PATCH v3 5/6] ledtrig-blk: add interface to stop and restart polling disk stats

2019?8?13?(?) 4:31 Jacek Anaszewski <jacek.anaszewski at gmail.com>:

Quoted 6 lines

Hi Akinobu,

I don't see any vital reason to keep this change separately. We're introducing new trigger, so please just squash it with the patch 4/6.

OK. I'll take care of renaming led to led_trig in the patch 3/6, too.

#13 lore raw

PATCH v3 6/6 scsi: sd: stop polling disk stats by ledtrig-blk during runtime suspend

In reply to Akinobu Mita

The LED block device activity trigger periodically polls the disk stats to collect the activity. However, it is pointless to poll while the scsi device is in runtime suspend.

This stops polling disk stats when the device is successfully runtime suspended, and restarts polling when the device is successfully runtime resumed.

Cc Frank Steiner <fsteiner-mail1 at bio.ifi.lmu.de>
Cc Jacek Anaszewski <jacek.anaszewski at gmail.com>
Cc Pavel Machek <pavel at ucw.cz>
Cc Dan Murphy <dmurphy at ti.com>
Cc Jens Axboe <axboe at kernel.dk>
Cc "James E.J. Bottomley" <jejb at linux.ibm.com>
Cc "Martin K. Petersen" <martin.petersen at oracle.com>
Cc Hannes Reinecke <hare at suse.com>
Signed-off-by Akinobu Mita <akinobu.mita at gmail.com>
---
 drivers/scsi/sd.c | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)
drivers/scsi/sd.c +23 -17
index 149d406..5f73142 100644
@@ -3538,7 +3538,7 @@ static int sd_suspend_common(struct device *dev, bool ignore_stop_errors)
 {
 	struct scsi_disk *sdkp = dev_get_drvdata(dev);
 	struct scsi_sense_hdr sshdr;
-	int ret = 0;
+	int ret;
 
 	if (!sdkp)	/* E.g.: runtime suspend following sd_remove() */
 		return 0;
@@ -3550,18 +3550,16 @@ static int sd_suspend_common(struct device *dev, bool ignore_stop_errors)
 		if (ret) {
 			/* ignore OFFLINE device */
 			if (ret == -ENODEV)
-				return 0;
-
-			if (!scsi_sense_valid(&sshdr) ||
-			    sshdr.sense_key != ILLEGAL_REQUEST)
-				return ret;
+				goto success;
 
 			/*
 			 * sshdr.sense_key == ILLEGAL_REQUEST means this drive
 			 * doesn't support sync. There's not much to do and
 			 * suspend shouldn't fail.
 			 */
-			ret = 0;
+			if (!scsi_sense_valid(&sshdr) ||
+			    sshdr.sense_key != ILLEGAL_REQUEST)
+				return ret;
 		}
 	}
 
@@ -3569,11 +3567,14 @@ static int sd_suspend_common(struct device *dev, bool ignore_stop_errors)
 		sd_printk(KERN_NOTICE, sdkp, "Stopping disk\n");
 		/* an error is not worth aborting a system sleep */
 		ret = sd_start_stop_device(sdkp, 0);
-		if (ignore_stop_errors)
-			ret = 0;
+		if (ret && !ignore_stop_errors)
+			return ret;
 	}
 
-	return ret;
+success:
+	ledtrig_blk_disable(sdkp->disk);
+
+	return 0;
 }
 
 static int sd_suspend_system(struct device *dev)
@@ -3589,19 +3590,24 @@ static int sd_suspend_runtime(struct device *dev)
 static int sd_resume(struct device *dev)
 {
 	struct scsi_disk *sdkp = dev_get_drvdata(dev);
-	int ret;
 
 	if (!sdkp)	/* E.g.: runtime resume at the start of sd_probe() */
 		return 0;
 
-	if (!sdkp->device->manage_start_stop)
-		return 0;
+	if (sdkp->device->manage_start_stop) {
+		int ret;
+
+		sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
+		ret = sd_start_stop_device(sdkp, 1);
+		if (ret)
+			return ret;
 
-	sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
-	ret = sd_start_stop_device(sdkp, 1);
-	if (!ret)
 		opal_unlock_from_suspend(sdkp->opal_dev);
-	return ret;
+	}
+
+	ledtrig_blk_enable(sdkp->disk);
+
+	return 0;
 }
 
 /**
Signature · 1 line
2.7.4