]> git.baikalelectronics.ru Git - kernel.git/commit
blk-mq: fix is_flush_rq
authorMing Lei <ming.lei@redhat.com>
Wed, 18 Aug 2021 01:09:25 +0000 (09:09 +0800)
committerJens Axboe <axboe@kernel.dk>
Wed, 18 Aug 2021 02:17:34 +0000 (20:17 -0600)
commita9ed27a764156929efe714033edb3e9023c5f321
treeb15ecb242fe0aef9bdf8c7d2d999a49ba0a94f81
parentc2da19ed50554ce52ecbad3655c98371fe58599f
blk-mq: fix is_flush_rq

is_flush_rq() is called from bt_iter()/bt_tags_iter(), and runs the
following check:

hctx->fq->flush_rq == req

but the passed hctx from bt_iter()/bt_tags_iter() may be NULL because:

1) memory re-order in blk_mq_rq_ctx_init():

rq->mq_hctx = data->hctx;
...
refcount_set(&rq->ref, 1);

OR

2) tag re-use and ->rqs[] isn't updated with new request.

Fix the issue by re-writing is_flush_rq() as:

return rq->end_io == flush_end_io;

which turns out simpler to follow and immune to data race since we have
ordered WRITE rq->end_io and refcount_set(&rq->ref, 1).

Fixes: 2e315dc07df0 ("blk-mq: grab rq->refcount before calling ->fn in blk_mq_tagset_busy_iter")
Cc: "Blank-Burian, Markus, Dr." <blankburian@uni-muenster.de>
Cc: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20210818010925.607383-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-flush.c
block/blk-mq.c
block/blk.h