nvme/host/pci: Fix a race in controller removal
PATCH v4 1/1 nvme/host/pci: Fix a race in controller removal
User space programs like udevd may try to read to partitions at the same time the driver detects a namespace is unusable, and may deadlock if revalidate_disk() is called while such a process is waiting to enter the frozen queue. On detecting a dead namespace, move the disk revalidate after unblocking dispatchers that may be holding bd_butex.
changelog Suggested-by: Keith Busch <[email protected]>
---
Changelov v4
- Simplify the changelog
Changelog v3
- Simplify the comment about moving revalidate_disk
Changelog v2
- Rely on blk_set_queue_dying to do the wake_all()
drivers/nvme/host/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/nvme/host/core.c +4 -1
@@ -103,10 +103,13 @@ static void nvme_set_queue_dying(struct nvme_ns *ns)*/ if (!ns->disk ||test_and_set_bit (NVME_NS_DEAD , &ns->flags))return ; -revalidate_disk (ns->disk);blk_set_queue_dying (ns->queue);/* Forcibly unquiesce queues to avoid blocking dispatch */ blk_mq_unquiesce_queue (ns->queue); +/* +* Revalidate after unblocking dispatchers that may be holding bd_butex +*/ +revalidate_disk (ns->disk); }static void nvme_queue_scan (struct nvme_ctrl *ctrl)
Signature · 7 lines
2.16.5 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 5 lines · Balbir Singh
User space programs like udevd may try to read to partitions at the same time the driver detects a namespace is unusable, and may deadlock if
revalidate_disk()is called while such a process is waiting to enter the frozen queue. On detecting a dead namespace, move the disk revalidate after unblocking dispatchers that may be holdingbd_butex.
Patch looks fine.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme