[PATCH 1/5] blk-mq: improve scheduler queue sync/async running

From: Jens Axboe <axboe@fb.com>
To: <linux-block@vger.kernel.org>
Cc: <bart.vanassche@sandisk.com>, <hch@lst.de>, <osandov@fb.com>,
	<paolo.valente@linaro.org>, <hare@suse.com>,
	Jens Axboe <axboe@fb.com>
Subject: [PATCH 1/5] blk-mq: improve scheduler queue sync/async running
Date: Thu, 26 Jan 2017 12:48:14 -0700	[thread overview]
Message-ID: <1485460098-16608-2-git-send-email-axboe@fb.com> (raw)
In-Reply-To: <1485460098-16608-1-git-send-email-axboe@fb.com>

We'll use the same criteria for whether we need to run the queue sync
or async when we have a scheduler, as we do without one.

Signed-off-by: Jens Axboe <axboe@fb.com>
---
 block/blk-mq.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 84d13b5cafd0..223b9b080820 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1476,7 +1476,8 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
 	if (q->elevator) {
 		blk_mq_put_ctx(data.ctx);
 		blk_mq_bio_to_request(rq, bio);
-		blk_mq_sched_insert_request(rq, false, true, true);
+		blk_mq_sched_insert_request(rq, false, true,
+						!is_sync || is_flush_fua);
 		goto done;
 	}
 	if (!blk_mq_merge_queue_io(data.hctx, data.ctx, rq, bio)) {
@@ -1585,7 +1586,8 @@ static blk_qc_t blk_sq_make_request(struct request_queue *q, struct bio *bio)
 	if (q->elevator) {
 		blk_mq_put_ctx(data.ctx);
 		blk_mq_bio_to_request(rq, bio);
-		blk_mq_sched_insert_request(rq, false, true, true);
+		blk_mq_sched_insert_request(rq, false, true,
+						!is_sync || is_flush_fua);
 		goto done;
 	}
 	if (!blk_mq_merge_queue_io(data.hctx, data.ctx, rq, bio)) {
-- 
2.7.4

