Commit 05b29021 authored by Anthony Iliopoulos's avatar Anthony Iliopoulos Committed by Christoph Hellwig
Browse files

nvme: explicitly update mpath disk capacity on revalidation 



Commit 3b4b1972 ("nvme: fix possible deadlock when I/O is
blocked") reverted multipath head disk revalidation due to deadlocks
caused by holding the bd_mutex during revalidate.

Updating the multipath disk blockdev size is still required though for
userspace to be able to observe any resizing while the device is
mounted. Directly update the bdev inode size to avoid unnecessarily
holding the bdev->bd_mutex.

Fixes: 3b4b1972 ("nvme: fix possible deadlock when I/O is
blocked")

Signed-off-by: default avatarAnthony Iliopoulos <ailiop@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 579dd91a

drivers/nvme/host/core.c

+1 −0
Original line number Diff line number Diff line
@@ -1980,6 +1980,7 @@ static int __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);

		nvme_mpath_update_disk_size(ns->head->disk);

	}

#endif

	return 0;

drivers/nvme/host/nvme.h

+13 −0
Original line number Diff line number Diff line
@@ -604,6 +604,16 @@ static inline void nvme_trace_bio_complete(struct request *req, 
		trace_block_bio_complete(ns->head->disk->queue, req->bio);

}



static inline void nvme_mpath_update_disk_size(struct gendisk *disk)

{

	struct block_device *bdev = bdget_disk(disk, 0);



	if (bdev) {

		bd_set_size(bdev, get_capacity(disk) << SECTOR_SHIFT);

		bdput(bdev);

	}

}



extern struct device_attribute dev_attr_ana_grpid;

extern struct device_attribute dev_attr_ana_state;

extern struct device_attribute subsys_attr_iopolicy;
@@ -679,6 +689,9 @@ static inline void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys) 
static inline void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)

{

}

static inline void nvme_mpath_update_disk_size(struct gendisk *disk)

{

}

#endif /* CONFIG_NVME_MULTIPATH */



#ifdef CONFIG_NVM

CRA Git | Maintained and supported by SUSTech CRA and CCSE