Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b7a6f12 authored by Jianchao Wang's avatar Jianchao Wang Committed by Jens Axboe
Browse files

blk-mq: issue directly with bypass 'false' in blk_mq_sched_insert_requests 



It is not necessary to issue request directly with bypass 'true'
in blk_mq_sched_insert_requests and handle the non-issued requests
itself. Just set bypass to 'false' and let blk_mq_try_issue_directly
handle them totally. Remove the blk_rq_can_direct_dispatch check,
because blk_mq_try_issue_directly can handle it well.If request is
direct-issued unsuccessfully, insert the reset.

Signed-off-by: default avatarJianchao Wang <jianchao.w.wang@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7f556a44

block/blk-mq-sched.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -417,11 +417,9 @@ void blk_mq_sched_insert_requests(struct blk_mq_hw_ctx *hctx, 
		 * busy in case of 'none' scheduler, and this way may save

		 * busy in case of 'none' scheduler, and this way may save

		 * us one extra enqueue & dequeue to sw queue.

		 * us one extra enqueue & dequeue to sw queue.

		 */

		 */

		if (!hctx->dispatch_busy && !e && !run_queue_async) {

		if (!hctx->dispatch_busy && !e && !run_queue_async)

			blk_mq_try_issue_list_directly(hctx, list);

			blk_mq_try_issue_list_directly(hctx, list);

			if (list_empty(list))

		else

				return;

		}

			blk_mq_insert_requests(hctx, ctx, list);

			blk_mq_insert_requests(hctx, ctx, list);

	}

	}

block/blk-mq.c

+9 −11
Original line number Original line Diff line number Diff line
@@ -1874,22 +1874,20 @@ blk_status_t blk_mq_request_issue_directly(struct request *rq, bool last) 
void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx,

void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx,

		struct list_head *list)

		struct list_head *list)

{

{

	blk_qc_t unused;

	blk_status_t ret = BLK_STS_OK;



	while (!list_empty(list)) {

	while (!list_empty(list)) {

		blk_status_t ret;

		struct request *rq = list_first_entry(list, struct request,

		struct request *rq = list_first_entry(list, struct request,

				queuelist);

				queuelist);





		list_del_init(&rq->queuelist);

		list_del_init(&rq->queuelist);

		ret = blk_mq_request_issue_directly(rq, list_empty(list));

		if (ret == BLK_STS_OK)

		if (ret != BLK_STS_OK) {

			ret = blk_mq_try_issue_directly(hctx, rq, &unused,

			if (ret == BLK_STS_RESOURCE ||

							false,

					ret == BLK_STS_DEV_RESOURCE) {

				blk_mq_request_bypass_insert(rq,

							list_empty(list));

							list_empty(list));

				break;

		else

			}

			blk_mq_sched_insert_request(rq, false, true, false);

			blk_mq_end_request(rq, ret);

		}

	}

	}





	/*

	/*
@@ -1897,7 +1895,7 @@ void blk_mq_try_issue_list_directly(struct blk_mq_hw_ctx *hctx, 
	 * the driver there was more coming, but that turned out to

	 * the driver there was more coming, but that turned out to

	 * be a lie.

	 * be a lie.

	 */

	 */

	if (!list_empty(list) && hctx->queue->mq_ops->commit_rqs)

	if (ret != BLK_STS_OK && hctx->queue->mq_ops->commit_rqs)

		hctx->queue->mq_ops->commit_rqs(hctx);

		hctx->queue->mq_ops->commit_rqs(hctx);

}

}