Hi! > From: Sagi Grimberg <[email protected]> > > [ Upstream commit 3b4b19721ec652ad2c4fe51dfbe5124212b5f581 ] > > Revert fab7772bfbcf ("nvme-multipath: revalidate nvme_ns_head gendisk > in nvme_validate_ns") > > When adding a new namespace to the head disk (via nvme_mpath_set_live) > we will see partition scan which triggers I/O on the mpath device node. > This process will usually be triggered from the scan_work which holds > the scan_lock. If I/O blocks (if we got ana change currently have only > available paths but none are accessible) this can deadlock on the head > disk bd_mutex as both partition scan I/O takes it, and head disk revalidation > takes it to check for resize (also triggered from scan_work on a different > path). See trace [1]. > > The mpath disk revalidation was originally added to detect online disk > size change, but this is no longer needed since commit cb224c3af4df > ("nvme: Convert to use set_capacity_revalidate_and_notify") which > already
AFAICT cb224c3af4df is not applied to 4.19-stable series, so this is
not safe according to the changelog.
cb224c3af4df is simple enough, but AFAICT
set_capacity_revalidate_and_notify() is missing in 4.19.132-rc1.
Best regards,
Pavel
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 0d60f2f8f3eec..5c9326777334f 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -1602,7 +1602,6 @@ 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
> }
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures)
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
signature.asc
Description: Digital signature
