Skip to contentSkip to conversation

Add support for block disk resize notification

PATCH In review Balbir Singh 2 participants 11 messages Mar 13, 2020

Subsystems (7)
SCSI Block layer virtio core NVMe +3 more subsystems
lore
Share & tools
lore
#0 lore raw

v3 cover Add support for block disk resize notification

Allow block/genhd to notify user space about disk size changes using a new helper set_capacity_revalidate_and_notify(), which is a wrapper on top of set_capacity(). set_capacity_revalidate_and_notify() will only notify iff the current capacity or the target capacity is not zero and the capacity really changes.

Background:

As a part of a patch to allow sending the RESIZE event on disk capacity change, Christoph ([email protected]) requested that the patch be made generic and the hacks for virtio block and xen block devices be removed and merged via a generic helper.

This series consists of 5 changes. The first one adds the basic support for changing the size and notifying. The follow up patches are per block subsystem changes. Other block drivers can add their changes as necessary on top of this series. Since not all devices are resizable, the default was to add a new API and let users slowly convert over as needed.

Testing:
1. I did some basic testing with an NVME device, by resizing it in the backend and ensured that udevd received the event.

Changelog v3:
- Repost after rebasing
- Trim details of the subsystem/files in the subject Changelog v2:
- Rename disk_set_capacity to set_capacity_revalidate_and_notify
- set_capacity_revalidate_and_notify can call revalidate disk if needed, a new bool parameter is passed (suggested by Bob Liu)

Balbir Singh (5):
block/genhd: Notify udev about capacity change virtio_blk.c: Convert to use set_capacity_revalidate_and_notify xen-blkfront.c: Convert to use set_capacity_revalidate_and_notify
nvme: Convert to use set_capacity_revalidate_and_notify
scsi: Convert to use set_capacity_revalidate_and_notify

 block/genhd.c                | 24 ++++++++++++++++++++++++
 drivers/block/virtio_blk.c   |  5 +----
 drivers/block/xen-blkfront.c |  6 +-----
 drivers/nvme/host/core.c     |  2 +-
 drivers/scsi/sd.c            |  3 ++-
 include/linux/genhd.h        |  2 ++
 6 files changed, 31 insertions(+), 11 deletions(-)
Signature · 1 line
2.16.6
#1 lore raw

PATCH v3 1/5 block/genhd: Notify udev about capacity change

Allow block/genhd to notify user space (via udev) about disk size changes using a new helper set_capacity_revalidate_and_notify(), which is a wrapper on top of set_capacity(). set_capacity_revalidate_and_notify() will only notify via udev if the current capacity or the target capacity is not zero and iff the capacity changes.

---
 block/genhd.c         | 24 ++++++++++++++++++++++++
 include/linux/genhd.h |  2 ++
 2 files changed, 26 insertions(+)
block/genhd.c +24 -0
index ff6268970ddc..6a60131baffa 100644
@@ -46,6 +46,30 @@ static void disk_add_events(struct gendisk *disk);
 static void disk_del_events(struct gendisk *disk);
 static void disk_release_events(struct gendisk *disk);
 
+/*
+ * Set disk capacity and notify if the size is not currently
+ * zero and will not be set to zero
+ */
+void set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size,
+					bool revalidate)
+{
+	sector_t capacity = get_capacity(disk);
+
+	set_capacity(disk, size);
+
+	if (revalidate)
+		revalidate_disk(disk);
+
+	if (capacity != size && capacity != 0 && size != 0) {
+		char *envp[] = { "RESIZE=1", NULL };
+
+		kobject_uevent_env(&disk_to_dev(disk)->kobj, KOBJ_CHANGE, envp);
+	}
+}
+
+EXPORT_SYMBOL_GPL(set_capacity_revalidate_and_notify);
+
+
 void part_inc_in_flight(struct request_queue *q, struct hd_struct *part, int rw)
 {
 	if (queue_is_mq(q))
include/linux/genhd.h +2 -0
index 6fbe58538ad6..f77f5095f20b 100644
@@ -461,6 +461,8 @@ static inline int get_disk_ro(struct gendisk *disk)
 extern void disk_block_events(struct gendisk *disk);
 extern void disk_unblock_events(struct gendisk *disk);
 extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
+extern void set_capacity_revalidate_and_notify(struct gendisk *disk,
+			sector_t size, bool revalidate);
 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
 
 /* drivers/char/random.c */
Signature · 1 line
2.16.6
maintainer Reviewed-by on v3 1/5
#2 lore raw

Re: [PATCH v3 1/5] block/genhd: Notify udev about capacity change

Quoted 10 lines · Balbir Singh

Allow block/genhd to notify user space (via udev) about disk size changes using a new helper set_capacity_revalidate_and_notify(), which is a wrapper on top of set_capacity(). set_capacity_revalidate_and_notify() will only notify via udev if the current capacity or the target capacity is not zero and iff the capacity changes.

Looks good,

#3 lore raw

PATCH v3 2/5 virtio_blk.c: Convert to use set_capacity_revalidate_and_notify

In reply to Balbir Singh

block/genhd provides set_capacity_revalidate_and_notify() for sending RESIZE notifications via uevents.

---
 drivers/block/virtio_blk.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/block/virtio_blk.c +1 -4
index 0736248999b0..f9b1e70f1b31 100644
@@ -388,18 +388,15 @@ static void virtblk_update_capacity(struct virtio_blk *vblk, bool resize)
 		   cap_str_10,
 		   cap_str_2);
 
-	set_capacity(vblk->disk, capacity);
+	set_capacity_revalidate_and_notify(vblk->disk, capacity, true);
 }
 
 static void virtblk_config_changed_work(struct work_struct *work)
 {
 	struct virtio_blk *vblk =
 		container_of(work, struct virtio_blk, config_work);
-	char *envp[] = { "RESIZE=1", NULL };
 
 	virtblk_update_capacity(vblk, true);
-	revalidate_disk(vblk->disk);
-	kobject_uevent_env(&disk_to_dev(vblk->disk)->kobj, KOBJ_CHANGE, envp);
 }
 
 static void virtblk_config_changed(struct virtio_device *vdev)
Signature · 1 line
2.16.6
#4 lore raw

Re: [PATCH v3 2/5] virtio_blk.c: Convert to use set_capacity_revalidate_and_notify

Quoted 13 lines · Balbir Singh

block/genhd provides set_capacity_revalidate_and_notify() for sending RESIZE notifications via uevents.

---
 drivers/block/virtio_blk.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/block/virtio_blk.c +0 -0
index 0736248999b0..f9b1e70f1b31 100644

drivers/block/virtio_blk.c static void virtblk_update_capacity(struct virtio_blk *vblk, bool resize) · line 391

Quoted 5 lines
drivers/block/virtio_blk.c +1 -1
@@ -388,18 +388,15 @@ static void virtblk_update_capacity(struct virtio_blk *vblk, bool resize)
 		   cap_str_10,
 		   cap_str_2);
 
-	set_capacity(vblk->disk, capacity);
+	set_capacity_revalidate_and_notify(vblk->disk, capacity, true);

Shouldn't the last argument be set to the resize argument passed to this function?

#5 lore raw

PATCH v3 3/5 xen-blkfront.c: Convert to use set_capacity_revalidate_and_notify

In reply to Balbir Singh

block/genhd provides set_capacity_revalidate_and_notify() for sending RESIZE notifications via uevents.

---
 drivers/block/xen-blkfront.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/block/xen-blkfront.c +1 -5
index 9df516a56bb2..915cf5b6388c 100644
@@ -2338,7 +2338,6 @@ static void blkfront_connect(struct blkfront_info *info)
 	unsigned long sector_size;
 	unsigned int physical_sector_size;
 	unsigned int binfo;
-	char *envp[] = { "RESIZE=1", NULL };
 	int err, i;
 	struct blkfront_ring_info *rinfo;
 
@@ -2354,10 +2353,7 @@ static void blkfront_connect(struct blkfront_info *info)
 			return;
 		printk(KERN_INFO "Setting capacity to %Lu\n",
 		       sectors);
-		set_capacity(info->gd, sectors);
-		revalidate_disk(info->gd);
-		kobject_uevent_env(&disk_to_dev(info->gd)->kobj,
-				   KOBJ_CHANGE, envp);
+		set_capacity_revalidate_and_notify(info->gd, sectors, true);
 
 		return;
 	case BLKIF_STATE_SUSPENDED:
Signature · 1 line
2.16.6
#7 lore raw

PATCH v3 4/5 nvme: Convert to use set_capacity_revalidate_and_notify

In reply to Balbir Singh

block/genhd provides set_capacity_revalidate_and_notify() for sending RESIZE notifications via uevents. This notification is newly added to NVME devices

---
 drivers/nvme/host/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/core.c +1 -1
index a4d8c90ee7cc..41ad07f6a564 100644
@@ -1810,7 +1810,7 @@ static void nvme_update_disk_info(struct gendisk *disk,
 	    ns->lba_shift > PAGE_SHIFT)
 		capacity = 0;
 
-	set_capacity(disk, capacity);
+	set_capacity_revalidate_and_notify(disk, capacity, false);
 
 	nvme_config_discard(disk, ns);
 	nvme_config_write_zeroes(disk, ns);
Signature · 1 line
2.16.6
maintainer Reviewed-by on v3 4/5
#8 lore raw

Re: [PATCH v3 4/5] nvme: Convert to use set_capacity_revalidate_and_notify

Quoted 7 lines · Balbir Singh

block/genhd provides set_capacity_revalidate_and_notify() for sending RESIZE notifications via uevents. This notification is newly added to NVME devices

Looks good,

#9 lore raw

PATCH v3 5/5 scsi: Convert to use set_capacity_revalidate_and_notify

In reply to Balbir Singh

block/genhd provides set_capacity_revalidate_and_notify() for sending RESIZE notifications via uevents. This notification is newly added to scsi sd.

---
 drivers/scsi/sd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/sd.c +2 -1
index 8ca9299ffd36..707f47c0ec98 100644
@@ -3187,7 +3187,8 @@ static int sd_revalidate_disk(struct gendisk *disk)
 
 	sdkp->first_scan = 0;
 
-	set_capacity(disk, logical_to_sectors(sdp, sdkp->capacity));
+	set_capacity_revalidate_and_notify(disk,
+		logical_to_sectors(sdp, sdkp->capacity), false);
 	sd_config_write_same(sdkp);
 	kfree(buffer);
 
Signature · 1 line
2.16.6