block: don't dereference request after flush insertion

We could have a race here, where the request gets freed before we call
into blk_mq_run_hw_queue(). If this happens, we cannot rely on the state
of the request.

Grab the hardware context before inserting the flush.

Fixes: 0f38d7664615 ("blk-mq: cleanup blk_mq_submit_bio")
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 87dc2debedfbf168d520f0e473ed0d0293ffae25..b7b8437f0a046ac09058b9f022b8a098d6e2e3c8 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2284,9 +2284,10 @@ blk_qc_t blk_mq_submit_bio(struct bio *bio)
        }
 
        if (unlikely(is_flush_fua)) {
+               struct blk_mq_hw_ctx *hctx = rq->mq_hctx;
                /* Bypass scheduler for flush requests */
                blk_insert_flush(rq);
-               blk_mq_run_hw_queue(rq->mq_hctx, true);
+               blk_mq_run_hw_queue(hctx, true);
        } else if (plug && (q->nr_hw_queues == 1 ||
                   blk_mq_is_shared_tags(rq->mq_hctx->flags) ||
                   q->mq_ops->commit_rqs || !blk_queue_nonrot(q))) {