Skip to content

Commit 2003ee8

Browse files
Muchun Songaxboe
authored andcommitted
block: fix missing dispatching request when queue is started or unquiesced
Supposing the following scenario with a virtio_blk driver. CPU0 CPU1 CPU2 blk_mq_try_issue_directly() __blk_mq_issue_directly() q->mq_ops->queue_rq() virtio_queue_rq() blk_mq_stop_hw_queue() virtblk_done() blk_mq_try_issue_directly() if (blk_mq_hctx_stopped()) blk_mq_request_bypass_insert() blk_mq_run_hw_queue() blk_mq_run_hw_queue() blk_mq_run_hw_queue() blk_mq_insert_request() return After CPU0 has marked the queue as stopped, CPU1 will see the queue is stopped. But before CPU1 puts the request on the dispatch list, CPU2 receives the interrupt of completion of request, so it will run the hardware queue and marks the queue as non-stopped. Meanwhile, CPU1 also runs the same hardware queue. After both CPU1 and CPU2 complete blk_mq_run_hw_queue(), CPU1 just puts the request to the same hardware queue and returns. It misses dispatching a request. Fix it by running the hardware queue explicitly. And blk_mq_request_issue_directly() should handle a similar situation. Fix it as well. Fixes: d964f04 ("blk-mq: fix direct issue") Cc: [email protected] Cc: Muchun Song <[email protected]> Signed-off-by: Muchun Song <[email protected]> Reviewed-by: Ming Lei <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 732312e commit 2003ee8

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

block/blk-mq.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2647,6 +2647,7 @@ static void blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,
26472647

26482648
if (blk_mq_hctx_stopped(hctx) || blk_queue_quiesced(rq->q)) {
26492649
blk_mq_insert_request(rq, 0);
2650+
blk_mq_run_hw_queue(hctx, false);
26502651
return;
26512652
}
26522653

@@ -2677,6 +2678,7 @@ static blk_status_t blk_mq_request_issue_directly(struct request *rq, bool last)
26772678

26782679
if (blk_mq_hctx_stopped(hctx) || blk_queue_quiesced(rq->q)) {
26792680
blk_mq_insert_request(rq, 0);
2681+
blk_mq_run_hw_queue(hctx, false);
26802682
return BLK_STS_OK;
26812683
}
26822684

0 commit comments

Comments
 (0)