blk-mq: consider non-idle request as "inflight" in blk_mq_rq_inflight()
Subsystems (3)
PATCH 1/1 blk-mq: consider non-idle request as "inflight" in blk_mq_rq_inflight()
From: Ming Lei <[email protected]>
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().
--- block/blk-mq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block/blk-mq.c +2 -2
@@ -828,10 +828,10 @@ static bool blk_mq_rq_inflight(struct blk_mq_hw_ctx *hctx, struct request *rq, void *priv, bool reserved) {/* -* If we find a request that is inflight and the queue matches, +* If we find a request that isn't idle and the queue matches, * we know the queue is busy. Return false to stop the iteration. */ -if (rq->state ==MQ_RQ_IN_FLIGHT && rq->q == hctx->queue) { +if (blk_mq_request_started (rq) && rq->q == hctx->queue) {bool *busy = priv; *busy = true;
Signature · 1 line
2.15.0
Quoted 15 lines · Mike Snitzer
From: Ming Lei <[email protected]>
dm-multipath is the only user of
blk_mq_queue_inflight(). When dm-multipath callsblk_mq_queue_inflight()to check if it has outstanding IO it can get a false negative. The reason for this isblk_mq_rq_inflight()doesn't consider requests that are no longerMQ_RQ_IN_FLIGHTbut that are nowMQ_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.
Quoted 3 lines
Fix this by considering any request not in the
MQ_RQ_IDLEstate (so eitherMQ_RQ_COMPLETEorMQ_RQ_IN_FLIGHT) as "inflight" inblk_mq_rq_inflight().
Applied, thanks.
Signature · 1 line
Jens Axboe