Commit 8824f622 authored Jul 22, 2018 by Ming Lei Committed by Jens Axboe Jul 22, 2018

blk-mq: fail the request in case issue failure

Inside blk_mq_try_issue_list_directly(), if the request is issued as
failed, we shouldn't try to do it again, otherwise the warning in
blk_mq_start_request() will be triggered. This change is aligned to
behaviour of other ways of request issue & dispatch.

Fixes: 6ce3dd6e ("blk-mq: issue directly if hw queue isn't busy in case of 'none'")
Cc: Kashyap Desai <kashyap.desai@broadcom.com>
Cc: Laurence Oberman <loberman@redhat.com>
Cc: Omar Sandoval <osandov@fb.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Kashyap Desai <kashyap.desai@broadcom.com>
Cc: kernel test robot <rong.a.chen@intel.com>
Cc: LKP <lkp@01.org>
Reported-by: kernel test robot <rong.a.chen@intel.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 22f17952

block/blk-mq.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -1794,9 +1794,13 @@ void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx,
		list_del_init(&rq->queuelist);
		ret = blk_mq_request_issue_directly(rq);
		if (ret != BLK_STS_OK) {
		if (ret == BLK_STS_RESOURCE \|\|
		ret == BLK_STS_DEV_RESOURCE) {
		list_add(&rq->queuelist, list);
		break;
		}
		blk_mq_end_request(rq, ret);
		}
		}
		}

Admin message