From: Ming Lei <ming.lei@redhat.com>
Date: Mon, 6 Dec 2021 11:33:50 +0800
Subject: [PATCH] blk-mq: don't use plug->mq_list->q directly in
blk_mq_run_dispatch_ops()
Git-commit: 73f3760eddc9bc32c207fff06537f98f94bef451
Patch-mainline: v5.17-rc1
References: jsc#PED-1183
blk_mq_run_dispatch_ops() is defined as one macro, and plug->mq_list
will be changed when running 'dispatch_ops', so add one local variable
for holding request queue.
Reported-and-tested-by: Yi Zhang <yi.zhang@redhat.com>
Fixes: 4cafe86c9267 ("blk-mq: run dispatch lock once in case of issuing from list")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Acked-by: Hannes Reinecke <hare@suse.com>
---
block/blk-mq.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 706e9a836fe6..0bf3523dd1f5 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2521,7 +2521,9 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)
plug->rq_count = 0;
if (!plug->multiple_queues && !plug->has_elevator && !from_schedule) {
- blk_mq_run_dispatch_ops(plug->mq_list->q,
+ struct request_queue *q = rq_list_peek(&plug->mq_list)->q;
+
+ blk_mq_run_dispatch_ops(q,
blk_mq_plug_issue_direct(plug, false));
if (rq_list_empty(plug->mq_list))
return;
--
2.35.3