Skip to contentSkip to conversation

Add support for block disk resize notification

PATCH Superseded Balbir Singh 4 participants 12 messages Feb 25, 2020 – Mar 12, 2020

Subsystems (7)
SCSI Block layer virtio core NVMe +3 more subsystems

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 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 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 drivers/block/virtio_blk.c: Convert to use
set_capacity_revalidate_and_notify
drivers/block/xen-blkfront.c: Convert to use
set_capacity_revalidate_and_notify
drivers/nvme/host/core.c: Convert to use
set_capacity_revalidate_and_notify
drivers/scsi/sd.c: 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 v2 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
#2 lore raw

PATCH v2 2/5 drivers/block/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 54158766334b..c913ebb25a52 100644
@@ -381,18 +381,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
#3 lore raw

PATCH v2 3/5 drivers/block/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 e2ad6bba2281..2f7cd842d6ce 100644
@@ -2335,7 +2335,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;
 
 	switch (info->connected) {
@@ -2350,10 +2349,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
#4 lore raw

PATCH v2 4/5 drivers/nvme/host/core.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. 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 ada59df642d2..4699388c5260 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 Acked-by on v2 4/5
#6 lore raw

Re: [PATCH v2 4/5] drivers/nvme/host/core.c: Convert to use set_capacity_revalidate_and_notify

In reply to Balbir Singh
Quoted 5 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

Patch looks fine. Please change the commit subject prefix to just "nvme:" to match the local style and for length constraints (the committer may do this if they want).

#7 lore raw

Re: [PATCH v2 4/5] drivers/nvme/host/core.c: Convert to use set_capacity_revalidate_and_notify

Quoted 5 lines · Keith Busch
Quoted 4 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

Quoted 7 lines
Quoted 1 line

Patch looks fine. Please change the commit subject prefix to just "nvme:" to match the local style and for length constraints (the committer may do this if they want).

Sure thanks! Yes, that makes sense.

Balbir Singh.

#8 lore raw

PATCH v2 5/5 drivers/scsi/sd.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. 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
#9 lore raw
In reply to Balbir Singh
Quoted 26 lines · Balbir Singh

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.

Quoted 5 lines

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)

Ping? It's not an urgent patchset, I am happy to wait if nothing else is needed.

Balbir Singh

maintainer
#10 lore raw
Quoted 27 lines · Balbir
Quoted 26 lines · Balbir Singh

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.

Quoted 8 lines
Quoted 5 lines

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)

Ping? It's not an urgent patchset, I am happy to wait if nothing else is needed.

It doesn't apply to the 5.7 branches, can you resend against for-5.7/block?

Signature · 1 line
Jens Axboe
#11 lore raw
Quoted 35 lines · Jens Axboe
Quoted 33 lines · Balbir
Quoted 31 lines · Balbir Singh

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 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)

Quoted 5 lines
Quoted 2 lines

Ping? It's not an urgent patchset, I am happy to wait if nothing else is needed.

It doesn't apply to the 5.7 branches, can you resend against for-5.7/block?

Thanks, I'll take a look. I used the latest next (next-20200312) and rebased on it. I got a three way merge success on xen-blkfront

Using index info to reconstruct a base tree...
M drivers/block/xen-blkfront.c
Falling back to patching base and 3-way merge...

I presume you are running into the same thing.

I will resend the patches on top of next shortly

Balbir