Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 906c9129 authored by Anthony Iliopoulos's avatar Anthony Iliopoulos Committed by Greg Kroah-Hartman
Browse files

nvme: explicitly update mpath disk capacity on revalidation 



[ Upstream commit 05b29021fba5e725dd385151ef00b6340229b500 ]

Commit 3b4b19721ec652 ("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: 3b4b19721ec652 ("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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1e6a4232

drivers/nvme/host/core.c

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

		nvme_mpath_update_disk_size(ns->head->disk);

	}

#endif

}

drivers/nvme/host/nvme.h

+13 −0
Original line number Diff line number Diff line
@@ -504,6 +504,16 @@ static inline void nvme_mpath_check_last_path(struct nvme_ns *ns) 
		kblockd_schedule_work(&head->requeue_work);

}



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;
@@ -570,6 +580,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