From: Balbir Singh <sblbir@amazon.com> To: <linux-block@vger.kernel.org> Cc: <linux-kernel@vger.kernel.org>, <axboe@kernel.dk>, <mst@redhat.com>, <jejb@linux.ibm.com>, <hch@lst.de>, <linux-nvme@lists.infradead.org>, "Balbir Singh" <sblbir@amazon.com>, Someswarudu Sangaraju <ssomesh@amazon.com> Subject: [RFC PATCH] block/genhd: Notify udev about capacity change Date: Tue, 10 Dec 2019 03:01:31 +0000 [thread overview] Message-ID: <20191210030131.4198-1-sblbir@amazon.com> (raw) 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. disk_set_capacity() is not enabled for all devices, just virtio block, xen-blockfront, nvme and sd. Owners of other block disk devices can easily move over by changing set_capacity() to disk_set_capacity() Background: As a part of a patch to allow sending the RESIZE event on disk capacity change, Christoph (hch@lst.de) 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. Suggested-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Balbir Singh <sblbir@amazon.com> Signed-off-by: Someswarudu Sangaraju <ssomesh@amazon.com> --- block/genhd.c | 19 +++++++++++++++++++ drivers/block/virtio_blk.c | 4 +--- drivers/block/xen-blkfront.c | 5 +---- drivers/nvme/host/core.c | 2 +- drivers/scsi/sd.c | 2 +- include/linux/genhd.h | 1 + 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/block/genhd.c b/block/genhd.c index ff6268970ddc..94faec98607b 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -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)) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 7ffd719d89de..869cd3c31529 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -476,18 +476,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) diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index a74d03913822..8077c070fe18 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -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: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index dfe37a525f3a..f1ad70aab721 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1806,7 +1806,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); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index cea625906440..afeae847dca6 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3196,7 +3196,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); diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 8bb63027e4d6..d5e87d7cc357 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -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 */ -- 2.16.5
WARNING: multiple messages have this Message-ID (diff)
From: Balbir Singh <sblbir@amazon.com> To: <linux-block@vger.kernel.org> Cc: axboe@kernel.dk, mst@redhat.com, jejb@linux.ibm.com, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, Someswarudu Sangaraju <ssomesh@amazon.com>, Balbir Singh <sblbir@amazon.com>, hch@lst.de Subject: [RFC PATCH] block/genhd: Notify udev about capacity change Date: Tue, 10 Dec 2019 03:01:31 +0000 [thread overview] Message-ID: <20191210030131.4198-1-sblbir@amazon.com> (raw) 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. disk_set_capacity() is not enabled for all devices, just virtio block, xen-blockfront, nvme and sd. Owners of other block disk devices can easily move over by changing set_capacity() to disk_set_capacity() Background: As a part of a patch to allow sending the RESIZE event on disk capacity change, Christoph (hch@lst.de) 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. Suggested-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Balbir Singh <sblbir@amazon.com> Signed-off-by: Someswarudu Sangaraju <ssomesh@amazon.com> --- block/genhd.c | 19 +++++++++++++++++++ drivers/block/virtio_blk.c | 4 +--- drivers/block/xen-blkfront.c | 5 +---- drivers/nvme/host/core.c | 2 +- drivers/scsi/sd.c | 2 +- include/linux/genhd.h | 1 + 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/block/genhd.c b/block/genhd.c index ff6268970ddc..94faec98607b 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -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)) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 7ffd719d89de..869cd3c31529 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -476,18 +476,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) diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index a74d03913822..8077c070fe18 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -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: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index dfe37a525f3a..f1ad70aab721 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1806,7 +1806,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); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index cea625906440..afeae847dca6 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3196,7 +3196,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); diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 8bb63027e4d6..d5e87d7cc357 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -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 */ -- 2.16.5 _______________________________________________ linux-nvme mailing list linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme
next reply other threads:[~2019-12-10 3:01 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-10 3:01 Balbir Singh [this message] 2019-12-10 3:01 ` [RFC PATCH] block/genhd: Notify udev about capacity change Balbir Singh 2019-12-11 19:36 ` Singh, Balbir 2019-12-11 19:36 ` Singh, Balbir 2019-12-12 9:54 ` Christoph Hellwig 2019-12-12 9:54 ` Christoph Hellwig 2019-12-13 9:13 ` Singh, Balbir 2019-12-13 9:13 ` Singh, Balbir
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=20191210030131.4198-1-sblbir@amazon.com \ --to=sblbir@amazon.com \ --cc=axboe@kernel.dk \ --cc=hch@lst.de \ --cc=jejb@linux.ibm.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=mst@redhat.com \ --cc=ssomesh@amazon.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.