Commit 5fe56de7 authored Apr 16, 2020 by John Garry Committed by Jens Axboe Apr 16, 2020

blk-mq: Put driver tag in blk_mq_dispatch_rq_list() when no budget



If in blk_mq_dispatch_rq_list() we find no budget, then we break of the
dispatch loop, but the request may keep the driver tag, evaulated
in 'nxt' in the previous loop iteration.

Fix by putting the driver tag for that request.

Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 8f3d9f35

block/blk-mq.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1222,8 +1222,10 @@ bool blk_mq_dispatch_rq_list(struct request_queue q, struct list_head list,
		rq = list_first_entry(list, struct request, queuelist);

		hctx = rq->mq_hctx;
		if (!got_budget && !blk_mq_get_dispatch_budget(hctx))
		if (!got_budget && !blk_mq_get_dispatch_budget(hctx)) {
		blk_mq_put_driver_tag(rq);
		break;
		}

		if (!blk_mq_get_driver_tag(rq)) {
		/*

Admin message