ublk: fix deadlock when reading partition table
Subsystems (2)
PATCH 1/1 ublk: fix deadlock when reading partition table
From: Ming Lei <[email protected]>
[ Upstream commit c258f5c4502c9667bccf5d76fa731ab9c96687c1 ]
When one process(such as udev) opens ublk block device (e.g., to read the partition table via bdev_open()), a deadlock[1] can occur:
1. bdev_open() grabs disk->open_mutex
2. The process issues read I/O to ublk backend to read partition table
3. In __ublk_complete_rq(), blk_update_request() or blk_mq_end_request() runs bio->bi_end_io() callbacks
4. If this triggers fput() on file descriptor of ublk block device, the work may be deferred to current task's task work (see fput() implementation)
5. This eventually calls blkdev_release() from the same context
6. blkdev_release() tries to grab disk->open_mutex again
7. Deadlock: same task waiting for a mutex it already holds
The fix is to run blk_update_request() and blk_mq_end_request() with bottom halves disabled. This forces blkdev_release() to run in kernel work-queue context instead of current task work context, and allows ublk server to make forward progress, and avoids the deadlock.
[ The fix omits the change in __ublk_do_auto_buf_reg() since this function doesn't exist in 6.1. ]
--- drivers/block/ublk_drv.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
drivers/block/ublk_drv.c +26 -2
@@ -603,12 +603,20 @@ static inline bool ubq_daemon_is_dying(struct ublk_queue *ubq)return ubq->ubq_daemon->flags &PF_EXITING ; } +static void ublk_end_request (struct request *req,blk_status_t error) +{ +local_bh_disable (); +blk_mq_end_request (req, error); +local_bh_enable (); +} +/* todo: handle partial completion */ static void ublk_complete_rq (struct request *req) {struct ublk_queue *ubq = req->mq_hctx->driver_data;struct ublk_io *io = &ubq->ios[req->tag];unsigned int unmapped_bytes; +bool requeue;/* failed read IO if nothing is read */ if (!io->res &&req_op (req) ==REQ_OP_READ )
@@ -641,7 +649,23 @@ static void ublk_complete_rq(struct request *req)if (unlikely (unmapped_bytes < io->res)) io->res = unmapped_bytes; -if (blk_update_request (req,BLK_STS_OK , io->res)) +/* +* Run bio->bi_end_io() with softirqs disabled. If the final fput +* happens off this path, then that will prevent ublk's blkdev_release() +* from being called on current's task work, see fput() implementation. +* +* Otherwise, ublk server may not provide forward progress in case of +* reading the partition table from bdev_open() with disk->open_mutex +* held, and causes dead lock as we could already be holding +* disk->open_mutex here. +* +* Preferably we would not be doing IO with a mutex held that is also +* used for release, but this work-around will suffice for now. +*/ +local_bh_disable (); + requeue =blk_update_request (req,BLK_STS_OK , io->res); +local_bh_enable (); +if (requeue)blk_mq_requeue_request (req, true);else __blk_mq_end_request (req,BLK_STS_OK );
@@ -694,7 +718,7 @@ static inline void __ublk_abort_rq(struct ublk_queue *ubq,if (ublk_queue_can_use_recovery (ubq))blk_mq_requeue_request (rq, false);else -blk_mq_end_request (rq,BLK_STS_IOERR ); +ublk_end_request (rq,BLK_STS_IOERR );mod_delayed_work (system_wq, &ubq->dev->monitor_work,0 ); }
Signature · 1 line
2.43.0