Skip to content

Commit 357e1b7

Browse files
Ming Leiaxboe
authored andcommitted
block: don't verify IO lock for freeze/unfreeze in elevator_init_mq()
elevator_init_mq() is only called at the entry of add_disk_fwnode() when disk IO isn't allowed yet. So not verify io lock(q->io_lockdep_map) for freeze & unfreeze in elevator_init_mq(). Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> Reported-by: Lai Yi <yi1.lai@linux.intel.com> Fixes: f1be178 ("block: model freeze & enter queue as lock for supporting lockdep") Signed-off-by: Ming Lei <ming.lei@redhat.com> Link: https://lore.kernel.org/r/20241031133723.303835-5-ming.lei@redhat.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 6a78699 commit 357e1b7

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

block/elevator.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,19 @@ void elevator_init_mq(struct request_queue *q)
598598
* drain any dispatch activities originated from passthrough
599599
* requests, then no need to quiesce queue which may add long boot
600600
* latency, especially when lots of disks are involved.
601+
*
602+
* Disk isn't added yet, so verifying queue lock only manually.
601603
*/
602-
blk_mq_freeze_queue(q);
604+
blk_freeze_queue_start_non_owner(q);
605+
blk_freeze_acquire_lock(q, true, false);
606+
blk_mq_freeze_queue_wait(q);
607+
603608
blk_mq_cancel_work_sync(q);
604609

605610
err = blk_mq_init_sched(q, e);
606611

607-
blk_mq_unfreeze_queue(q);
612+
blk_unfreeze_release_lock(q, true, false);
613+
blk_mq_unfreeze_queue_non_owner(q);
608614

609615
if (err) {
610616
pr_warn("\"%s\" elevator initialization failed, "

0 commit comments

Comments
 (0)