raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

nvme-multipath: fix lockdep WARN due to partition scan work

Browse Source 
[ Upstream commit 6d87cd5335 ]

Blktests test cases nvme/014, 057 and 058 fail occasionally due to a
lockdep WARN. As reported in the Closes tag URL, the WARN indicates that
a deadlock can happen due to the dependency among disk->open_mutex,
kblockd workqueue completion and partition_scan_work completion.

To avoid the lockdep WARN and the potential deadlock, cut the dependency
by running the partition_scan_work not by kblockd workqueue but by
nvme_wq.

Reported-by: Yi Zhang <yi.zhang@redhat.com>
Closes: https://lore.kernel.org/linux-block/CAHj4cs8mJ+R_GmQm9R8ebResKAWUE8kF5+_WVg0v8zndmqd6BQ@mail.gmail.com/
Link: https://lore.kernel.org/linux-block/oeyzci6ffshpukpfqgztsdeke5ost5hzsuz4rrsjfmvpqcevax@5nhnwbkzbrpa/
Fixes: 1f021341ee ("nvme-multipath: defer partition scanning")
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Shin'ichiro Kawasaki
2025-11-17 11:23:39 +09:00
committed by Greg Kroah-Hartman
parent b91ef042e2
commit ef4ab2a8ab
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/nvme/host/multipath.c
View File

@@ -687,7 +687,7 @@ static void nvme_mpath_set_live(struct nvme_ns *ns)
return; return;
} }
nvme_add_ns_head_cdev(head); nvme_add_ns_head_cdev(head);
kblockd_schedule_work(&head->partition_scan_work); queue_work(nvme_wq, &head->partition_scan_work);
} }
mutex_lock(&head->lock); mutex_lock(&head->lock);