Commit c2e82a23 authored Sep 22, 2017 by weiping zhang Committed by Jens Axboe Nov 03, 2017

blk-mq: fix nr_requests wrong value when modify it from sysfs



if blk-mq use "none" io scheduler, nr_request get a wrong value when
input a number > tag_set->queue_depth. blk_mq_tag_update_depth will get
the smaller one min(nr, set->queue_depth), and then q->nr_request get a
wrong value.

Reproduce:

echo none > /sys/block/nvme0n1/queue/scheduler
echo 1000000 > /sys/block/nvme0n1/queue/nr_requests
cat /sys/block/nvme0n1/queue/nr_requests
1000000

Signed-off-by: weiping zhang <zhangweiping@didichuxing.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent a116895f

block/blk-mq.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2743,8 +2743,7 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr)
		* queue depth. This is similar to what the old code would do.
		*/
		if (!hctx->sched_tags) {
		ret = blk_mq_tag_update_depth(hctx, &hctx->tags,
		min(nr, set->queue_depth),
		ret = blk_mq_tag_update_depth(hctx, &hctx->tags, nr,
		false);
		} else {
		ret = blk_mq_tag_update_depth(hctx, &hctx->sched_tags,