Skip to content

Commit 05a4fed

Browse files
Ming Leiaxboe
authored andcommitted
blk-mq: consider non-idle request as "inflight" in blk_mq_rq_inflight()
dm-multipath is the only user of blk_mq_queue_inflight(). When dm-multipath calls blk_mq_queue_inflight() to check if it has outstanding IO it can get a false negative. The reason for this is blk_mq_rq_inflight() doesn't consider requests that are no longer MQ_RQ_IN_FLIGHT but that are now MQ_RQ_COMPLETE (->complete isn't called or finished yet) as "inflight". This causes request-based dm-multipath's dm_wait_for_completion() to return before all outstanding dm-multipath requests have actually completed. This breaks DM multipath's suspend functionality because blk-mq requests complete after DM's suspend has finished -- which shouldn't happen. Fix this by considering any request not in the MQ_RQ_IDLE state (so either MQ_RQ_COMPLETE or MQ_RQ_IN_FLIGHT) as "inflight" in blk_mq_rq_inflight(). Fixes: 3c94d83 ("blk-mq: change blk_mq_queue_busy() to blk_mq_queue_inflight()") Signed-off-by: Ming Lei <[email protected]> Signed-off-by: Mike Snitzer <[email protected]> Cc: [email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 65752ae commit 05a4fed

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

block/blk-mq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -828,10 +828,10 @@ static bool blk_mq_rq_inflight(struct blk_mq_hw_ctx *hctx, struct request *rq,
828828
void *priv, bool reserved)
829829
{
830830
/*
831-
* If we find a request that is inflight and the queue matches,
831+
* If we find a request that isn't idle and the queue matches,
832832
* we know the queue is busy. Return false to stop the iteration.
833833
*/
834-
if (rq->state == MQ_RQ_IN_FLIGHT && rq->q == hctx->queue) {
834+
if (blk_mq_request_started(rq) && rq->q == hctx->queue) {
835835
bool *busy = priv;
836836

837837
*busy = true;

0 commit comments

Comments
 (0)