block: pop cached rq before potentially blocking rq_qos_throttle()
authorJens Axboe <axboe@kernel.dk>
Tue, 21 Jun 2022 16:03:57 +0000 (10:03 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 21 Jun 2022 16:59:58 +0000 (10:59 -0600)
commit2645672ffe21f0a1c139bfbc05ad30fd4e4f2583
tree71cff81d1e2aa899d00cf7117f3be44b9f6a944a
parent9243fc4cd28c8bdddd7fe0abd5bbec3c4fdf5052
block: pop cached rq before potentially blocking rq_qos_throttle()

If rq_qos_throttle() ends up blocking, then we will have invalidated and
flushed our current plug. Since blk_mq_get_cached_request() hasn't
popped the cached request off the plug list just yet, we end holding a
pointer to a request that is no longer valid. This insta-crashes with
rq->mq_hctx being NULL in the validity checks just after.

Pop the request off the cached list before doing rq_qos_throttle() to
avoid using a potentially stale request.

Fixes: 0a5aa8d161d1 ("block: fix blk_mq_attempt_bio_merge and rq_qos_throttle protection")
Reported-by: Dylan Yudaken <dylany@fb.com>
Tested-by: Dylan Yudaken <dylany@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-mq.c