More and more drivers want to get batching requests queued from block layer, such as mmc, and tcp based storage drivers. Also current in-tree users have virtio-scsi, virtio-blk and nvme. For none, we already support batching dispatch. But for io scheduler, every time we just take one request from scheduler and pass the single request to blk_mq_dispatch_rq_list(). This way makes batching dispatch not possible when io scheduler is applied. One reason is that we don't want to hurt sequential IO performance, becasue IO merge chance is reduced if more requests are dequeued from scheduler queue. Try to support batching dispatch for io scheduler by starting with the following simple approach: 1) still make sure we can get budget before dequeueing request 2) use hctx->dispatch_busy to evaluate if queue is busy, if it is busy we fackback to non-batching dispatch, otherwise dequeue as many as possible requests from scheduler, and pass them to blk_mq_dispatch_rq_list(). Wrt. 2), we use similar policy for none, and turns out that SCSI SSD performance got improved much. In future, maybe we can develop more intelligent algorithem for batching dispatch. Baolin has tested this patch and found that MMC performance is improved[3]. [1] https://lore.kernel.org/linux-block/20200512075501.GF1531898@T590/#r [2] https://lore.kernel.org/linux-block/fe6bd8b9-6ed9-b225-f80c-314746133722@xxxxxxxxxxx/ [3] https://lore.kernel.org/linux-block/CADBw62o9eTQDJ9RvNgEqSpXmg6Xcq=2TxH0Hfxhp29uF2W=TXA@xxxxxxxxxxxxxx/ Cc: Sagi Grimberg <sagi@xxxxxxxxxxx> Cc: Baolin Wang <baolin.wang7@xxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx> Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxx> --- block/blk-mq-sched.c | 75 +++++++++++++++++++++++++++++++++++++++++++- block/blk-mq.c | 2 -- 2 files changed, 74 insertions(+), 3 deletions(-) diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 4c72073830f3..75cf9528ac01 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -7,6 +7,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/blk-mq.h> +#include <linux/list_sort.h> #include <trace/events/block.h> @@ -80,6 +81,68 @@ void blk_mq_sched_restart(struct blk_mq_hw_ctx *hctx) blk_mq_run_hw_queue(hctx, true); } +/* + * We know bfq and deadline apply single scheduler queue instead of multi + * queue. However, the two are often used on single queue devices, also + * the current @hctx should affect the real device status most of times + * because of locality principle. + * + * So use current hctx->dispatch_busy directly for figuring out batching + * dispatch count. + */ +static unsigned int blk_mq_sched_get_batching_nr(struct blk_mq_hw_ctx *hctx) +{ + if (hctx->dispatch_busy) + return 1; + return hctx->queue->nr_requests; +} + +static int sched_rq_cmp(void *priv, struct list_head *a, struct list_head *b) +{ + struct request *rqa = container_of(a, struct request, queuelist); + struct request *rqb = container_of(b, struct request, queuelist); + + return rqa->mq_hctx > rqb->mq_hctx; +} + +static inline void blk_mq_do_dispatch_rq_lists(struct blk_mq_hw_ctx *hctx, + struct list_head *lists, bool multi_hctxs, unsigned count) +{ + if (likely(!multi_hctxs)) { + blk_mq_dispatch_rq_list(hctx, lists, count); + return; + } + + /* + * Requests from different hctx may be dequeued from some scheduler, + * such as bfq and deadline. + * + * Sort the requests in the list according to their hctx, dispatch + * batching requests from same hctx + */ + list_sort(NULL, lists, sched_rq_cmp); + + while (!list_empty(lists)) { + LIST_HEAD(list); + struct request *new, *rq = list_first_entry(lists, + struct request, queuelist); + unsigned cnt = 0; + + list_for_each_entry(new, lists, queuelist) { + if (new->mq_hctx != rq->mq_hctx) + break; + cnt++; + } + + if (new->mq_hctx == rq->mq_hctx) + list_splice_tail_init(lists, &list); + else + list_cut_before(&list, lists, &new->queuelist); + + blk_mq_dispatch_rq_list(rq->mq_hctx, &list, cnt); + } +} + #define BLK_MQ_BUDGET_DELAY 3 /* ms units */ /* @@ -97,6 +160,9 @@ static int blk_mq_do_dispatch_sched(struct blk_mq_hw_ctx *hctx) LIST_HEAD(rq_list); int ret = 0; struct request *rq; + int cnt = 0; + unsigned int max_dispatch = blk_mq_sched_get_batching_nr(hctx); + bool multi_hctxs = false; do { if (e->type->ops.has_work && !e->type->ops.has_work(hctx)) @@ -130,7 +196,14 @@ static int blk_mq_do_dispatch_sched(struct blk_mq_hw_ctx *hctx) * in blk_mq_dispatch_rq_list(). */ list_add(&rq->queuelist, &rq_list); - } while (blk_mq_dispatch_rq_list(rq->mq_hctx, &rq_list, 1)); + cnt++; + + if (rq->mq_hctx != hctx && !multi_hctxs) + multi_hctxs = true; + } while (cnt < max_dispatch); + + if (cnt) + blk_mq_do_dispatch_rq_lists(hctx, &rq_list, multi_hctxs, cnt); return ret; } diff --git a/block/blk-mq.c b/block/blk-mq.c index 626757414a6a..a5ff8140e52c 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1257,8 +1257,6 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list, if (list_empty(list)) return false; - WARN_ON(!list_is_singular(list) && nr_budgets); - /* * Now process all the entries, sending them to the driver. */ -- 2.25.2
