OSDN Git Service

blk-mq: quiesce queue during switching io sched and updating nr_requests
authorMing Lei <ming.lei@redhat.com>
Sat, 6 Jan 2018 08:27:38 +0000 (16:27 +0800)
committerJens Axboe <axboe@kernel.dk>
Sat, 6 Jan 2018 16:25:36 +0000 (09:25 -0700)
commit24f5a90f0d13a97b51aa79f468143fafea4246bb
tree4fe0235db1e0e32b1945933df172ca91456ced78
parentc2856ae2f315d754a0b6a268e4c6745b332b42e7
blk-mq: quiesce queue during switching io sched and updating nr_requests

Dispatch may still be in-progress after queue is frozen, so we have to
quiesce queue before switching IO scheduler and updating nr_requests.

Also when switching io schedulers, blk_mq_run_hw_queue() may still be
called somewhere(such as from nvme_reset_work()), and io scheduler's
per-hctx data may not be setup yet, so cause oops even inside
blk_mq_hctx_has_pending(), such as it can be run just between:

        ret = e->ops.mq.init_sched(q, e);
AND
        ret = e->ops.mq.init_hctx(hctx, i)

inside blk_mq_init_sched().

This reverts commit 7a148c2fcff8330(block: don't call blk_mq_quiesce_queue()
after queue is frozen) basically, and makes sure blk_mq_hctx_has_pending
won't be called if queue is quiesced.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Fixes: 7a148c2fcff83309(block: don't call blk_mq_quiesce_queue() after queue is frozen)
Reported-by: Yi Zhang <yi.zhang@redhat.com>
Tested-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-mq.c
block/elevator.c