2019-07-29 13:51:22

by Anthony Iliopoulos

Subject: [PATCH] nvme/multipath: revalidate nvme_ns_head gendisk in nvme_validate_ns

When CONFIG_NVME_MULTIPATH is set, only the hidden gendisk associated
with the per-controller ns is run through revalidate_disk when a
rescan is triggered, while the visible blockdev never gets its size
(bdev->bd_inode->i_size) updated to reflect any capacity changes that
may have occurred.

This prevents online resizing of nvme block devices and in extension of
any filesystems atop that will are unable to expand while mounted, as
userspace relies on the blockdev size for obtaining the disk capacity
(via BLKGETSIZE/64 ioctls).

Fix this by explicitly revalidating the actual namespace gendisk in
addition to the per-controller gendisk, when multipath is enabled.

Signed-off-by: Anthony Iliopoulos <[email protected]>
---
drivers/nvme/host/core.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 8f3fbe5ca937..80c7a7ee240b 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1715,6 +1715,7 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
if (ns->head->disk) {
nvme_update_disk_info(ns->head->disk, ns, id);
blk_queue_stack_limits(ns->head->disk->queue, ns->queue);
+ revalidate_disk(ns->head->disk);
}
#endif
}
--
2.16.4

2019-07-29 19:25:01

by Sagi Grimberg

Subject: Re: [PATCH] nvme/multipath: revalidate nvme_ns_head gendisk in nvme_validate_ns

Reviewed-by: Sagi Grimberg <[email protected]>

2019-07-30 11:57:19

by Christoph Hellwig

Subject: Re: [PATCH] nvme/multipath: revalidate nvme_ns_head gendisk in nvme_validate_ns

Thanks,

applied to nvme-5.3.

2019-07-30 14:32:51

by Johannes Thumshirn

Subject: Re: [PATCH] nvme/multipath: revalidate nvme_ns_head gendisk in nvme_validate_ns

Thanks Anthony,
Reviewed-by: Johannes Thumshirn <[email protected]>
--
Johannes Thumshirn SUSE Labs Filesystems
[email protected] +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850

2019-07-31 12:41:01

by Hannes Reinecke

Subject: Re: [PATCH] nvme/multipath: revalidate nvme_ns_head gendisk in nvme_validate_ns

On 7/29/19 2:40 PM, Anthony Iliopoulos wrote:
> When CONFIG_NVME_MULTIPATH is set, only the hidden gendisk associated
> with the per-controller ns is run through revalidate_disk when a
> rescan is triggered, while the visible blockdev never gets its size
> (bdev->bd_inode->i_size) updated to reflect any capacity changes that
> may have occurred.
>
> This prevents online resizing of nvme block devices and in extension of
> any filesystems atop that will are unable to expand while mounted, as
> userspace relies on the blockdev size for obtaining the disk capacity
> (via BLKGETSIZE/64 ioctls).
>
> Fix this by explicitly revalidating the actual namespace gendisk in
> addition to the per-controller gendisk, when multipath is enabled.
>
> Signed-off-by: Anthony Iliopoulos <[email protected]>
> ---
> drivers/nvme/host/core.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 8f3fbe5ca937..80c7a7ee240b 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -1715,6 +1715,7 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
> if (ns->head->disk) {
> nvme_update_disk_info(ns->head->disk, ns, id);
> blk_queue_stack_limits(ns->head->disk->queue, ns->queue);
> + revalidate_disk(ns->head->disk);
> }
> #endif
> }
>
Reviewed-by: Hannes Reinecke <[email protected]>

Cheers,

Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
[email protected] +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG Nürnberg)