diff mbox series

[PATCHv2] blk-mq: blk-mq: check quiesce state before queue_rqs

Message ID 20211220205919.180191-1-kbusch@kernel.org (mailing list archive)
State New, archived
Headers show
Series [PATCHv2] blk-mq: blk-mq: check quiesce state before queue_rqs | expand

Commit Message

Keith Busch Dec. 20, 2021, 8:59 p.m. UTC 
The low level drivers don't expect to see new requests after a
successful quiesce completes. Check the queue quiesce state within the
rcu protected area prior to calling the driver's queue_rqs().

Signed-off-by: Keith Busch <kbusch@kernel.org>
---
v1->v2:

  Set new function scope to static

 block/blk-mq.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Comments

Jens Axboe Dec. 20, 2021, 9:04 p.m. UTC | #1 
On 12/20/21 1:59 PM, Keith Busch wrote:
> The low level drivers don't expect to see new requests after a
> successful quiesce completes. Check the queue quiesce state within the
> rcu protected area prior to calling the driver's queue_rqs().

Thanks, applied - I added a Fixes tag as well.
diff mbox series

Patch

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 51991232824a..998a85b5b46c 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2549,6 +2549,14 @@  static void blk_mq_plug_issue_direct(struct blk_plug *plug, bool from_schedule)
 		blk_mq_commit_rqs(hctx, &queued, from_schedule);
 }
 
+static void __blk_mq_flush_plug_list(struct request_queue *q,
+				     struct blk_plug *plug)
+{
+	if (blk_queue_quiesced(q))
+		return;
+	q->mq_ops->queue_rqs(&plug->mq_list);
+}
+
 void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)
 {
 	struct blk_mq_hw_ctx *this_hctx;
@@ -2580,7 +2588,7 @@  void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)
 		if (q->mq_ops->queue_rqs &&
 		    !(rq->mq_hctx->flags & BLK_MQ_F_TAG_QUEUE_SHARED)) {
 			blk_mq_run_dispatch_ops(q,
-				q->mq_ops->queue_rqs(&plug->mq_list));
+				__blk_mq_flush_plug_list(q, plug));
 			if (rq_list_empty(plug->mq_list))
 				return;
 		}