block/genhd: Notify udev about capacity change
Subsystems (7)
RFC PATCH 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 disk_set_capacity(), which is a wrapper on top of set_capacity(). disk_set_capacity() will only notify via udev if the current capacity or the target capacity is not zero.
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.
Testing:
1. I did some basic testing with an NVME device, by resizing it in the backend and ensured that udevd received the event.
--- block/genhd.c | 19 +++++++++++++++++++ include/linux/genhd.h | 1 + 2 files changed, 20 insertions(+)
block/genhd.c +19 -0
@@ -46,6 +46,25 @@ 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 disk_set_capacity (struct gendisk *disk,sector_t size) +{ +sector_t capacity =get_capacity (disk); + +set_capacity (disk, size); +if (capacity !=0 && size !=0 ) { +char *envp[] = {"RESIZE=1" ,NULL }; + +kobject_uevent_env (&disk_to_dev (disk)->kobj,KOBJ_CHANGE , envp); + } +} + +EXPORT_SYMBOL_GPL (disk_set_capacity); + +void part_inc_in_flight (struct request_queue *q,struct hd_struct *part,int rw) {if (queue_is_mq (q))
include/linux/genhd.h +1 -0
@@ -449,6 +449,7 @@ 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 disk_set_capacity (struct gendisk *disk,sector_t size);extern unsigned int disk_clear_events (struct gendisk *disk,unsigned int mask);/* drivers/char/random.c */
Signature · 1 line
2.16.5
RFC PATCH 2/5 drivers/block/virtio_blk.c: Convert to use disk_set_capacity
block/genhd provides disk_set_capacity() for sending RESIZE notifications via uevents.
--- drivers/block/virtio_blk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/block/virtio_blk.c +1 -3
@@ -479,18 +479,16 @@ static void virtblk_update_capacity(struct virtio_blk *vblk, bool resize) cap_str_10, cap_str_2); -set_capacity (vblk->disk, capacity); +disk_set_capacity (vblk->disk, capacity); }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.5
RFC PATCH 3/5 drivers/block/xen-blkfront.c: Convert to use disk_set_capacity
In reply to Balbir Singhblock/genhd provides disk_set_capacity() for sending RESIZE notifications via uevents.
--- drivers/block/xen-blkfront.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/block/xen-blkfront.c +1 -4
@@ -2337,7 +2337,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) {
@@ -2352,10 +2351,8 @@ static void blkfront_connect(struct blkfront_info *info)return ;printk (KERN_INFO "Setting capacity to %Lu\n" , sectors); -set_capacity (info->gd, sectors); +disk_set_capacity (info->gd, sectors);revalidate_disk (info->gd); -kobject_uevent_env (&disk_to_dev (info->gd)->kobj, -KOBJ_CHANGE , envp);return ;case BLKIF_STATE_SUSPENDED :
Signature · 1 line
2.16.5
RFC PATCH 4/5 drivers/nvme/host/core.c: Convert to use disk_set_capacity
In reply to Balbir Singhblock/genhd provides disk_set_capacity() 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
@@ -1808,7 +1808,7 @@ static void nvme_update_disk_info(struct gendisk *disk, ns->lba_shift > PAGE_SHIFT) capacity =0 ; -set_capacity (disk, capacity); +disk_set_capacity (disk, capacity);nvme_config_discard (disk, ns);nvme_config_write_zeroes (disk, ns);
Signature · 1 line
2.16.5
RFC PATCH 5/5 drivers/scsi/sd.c: Convert to use disk_set_capacity
In reply to Balbir Singhblock/genhd provides disk_set_capacity() for sending RESIZE notifications via uevents. This notification is newly added to scsi sd.
--- drivers/scsi/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/sd.c +1 -1
@@ -3184,7 +3184,7 @@ static int sd_revalidate_disk(struct gendisk *disk) sdkp->first_scan =0 ; -set_capacity (disk,logical_to_sectors (sdp, sdkp->capacity)); +disk_set_capacity (disk,logical_to_sectors (sdp, sdkp->capacity));sd_config_write_same (sdkp);kfree (buffer);
Signature · 1 line
2.16.5
Quoted 5 lines · Balbir Singh
Allow block/genhd to notify user space (via udev) about disk size changes using a new helper
disk_set_capacity(), which is a wrapper on top ofset_capacity().disk_set_capacity()will only notify via udev if the current capacity or the target capacity is not zero.
Quoted 8 lines
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.
I messed up with linux-block ML address, I can resend with the right address if needed. My apologies
Balbir Singh.
Quoted 4 lines · Balbir
I messed up with linux-block ML address, I can resend with the right address if needed. My apologies
Balbir Singh.
Unless you have sent it already and I totally missed it,
if you are planning to resend can you please also add a cover-letter ?
Quoted 10 lines · Chaitanya Kulkarni
Quoted 5 lines · Balbir
I messed up with linux-block ML address, I can resend with the right address
if needed. My apologiesBalbir Singh.
Unless you have sent it already and I totally missed it,
if you are planning to resend can you please also add a cover-letter ?
I did not resend it, I'll resend and add a cover letter.
Balbir Singh.