From: Jens Axboe <axboe@kernel.dk>
To: Ming Lei <ming.lei@redhat.com>
Cc: "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>
Subject: Re: [PATCH] block: don't dereference request after flush insertion
Date: Sun, 17 Oct 2021 20:44:57 -0600 [thread overview]
Message-ID: <304eb692-db58-1cc5-a466-1ffd57fa0d43@kernel.dk> (raw)
In-Reply-To: <YWzfDJ9sYBbLn741@T590>
On 10/17/21 8:42 PM, Ming Lei wrote:
> On Sat, Oct 16, 2021 at 07:35:39PM -0600, Jens Axboe wrote:
>> 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.
>>
>> Signed-off-by: Jens Axboe <axboe@kernel.dk>
>>
>> ---
>>
>> diff --git a/block/blk-mq.c b/block/blk-mq.c
>> index 2197cfbf081f..22b30a89bf3a 100644
>> --- a/block/blk-mq.c
>> +++ b/block/blk-mq.c
>> @@ -2468,9 +2468,10 @@ void 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))) {
>
> From report in [1], no device close & queue release is involved, and
> request freeing could be much easier to trigger than queue release,
> so looks fine:
>
> Reviewed-by: Ming Lei <ming.lei@redhat.com>
>
> Fixes: f328476e373a ("blk-mq: cleanup blk_mq_submit_bio")
Wasn't in the one I sent out, but I do have the fixes as well. Thanks,
I'll add your reviewed-by.
--
Jens Axboe
prev parent reply other threads:[~2021-10-18 2:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-17 1:35 [PATCH] block: don't dereference request after flush insertion Jens Axboe
2021-10-18 1:49 ` Ming Lei
2021-10-18 1:50 ` Jens Axboe
2021-10-18 2:02 ` Ming Lei
2021-10-18 2:10 ` Jens Axboe
2021-10-18 8:34 ` Christoph Hellwig
2021-10-18 2:11 ` Ming Lei
2021-10-18 2:16 ` Jens Axboe
2021-10-18 2:30 ` Ming Lei
2021-10-18 2:42 ` Ming Lei
2021-10-18 2:44 ` Jens Axboe [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=304eb692-db58-1cc5-a466-1ffd57fa0d43@kernel.dk \
--to=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=ming.lei@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox