From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, Ming Lei <ming.lei@redhat.com>,
Sagi Grimberg <sagi@grimberg.me>,
Baolin Wang <baolin.wang7@gmail.com>,
Christoph Hellwig <hch@infradead.org>
Subject: [PATCH 8/9] blk-mq: pass obtained budget count to blk_mq_dispatch_rq_list
Date: Wed, 13 May 2020 17:54:42 +0800 [thread overview]
Message-ID: <20200513095443.2038859-9-ming.lei@redhat.com> (raw)
In-Reply-To: <20200513095443.2038859-1-ming.lei@redhat.com>
Pass obtained budget count to blk_mq_dispatch_rq_list(), and prepare
for supporting fully batching submission.
With the obtained budget count, it is easier to put extra budgets
in case of .queue_rq failure.
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Baolin Wang <baolin.wang7@gmail.com>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
block/blk-mq-sched.c | 8 ++++----
block/blk-mq.c | 18 ++++++++++++++----
block/blk-mq.h | 3 ++-
3 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 632c6f8b63f7..78fc8d80caaf 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -130,7 +130,7 @@ 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, true));
+ } while (blk_mq_dispatch_rq_list(rq->mq_hctx, &rq_list, true, 1));
return ret;
}
@@ -198,7 +198,7 @@ static int blk_mq_do_dispatch_ctx(struct blk_mq_hw_ctx *hctx)
/* round robin for fair dispatch */
ctx = blk_mq_next_ctx(hctx, rq->mq_ctx);
- } while (blk_mq_dispatch_rq_list(rq->mq_hctx, &rq_list, true));
+ } while (blk_mq_dispatch_rq_list(rq->mq_hctx, &rq_list, true, 1));
WRITE_ONCE(hctx->dispatch_from, ctx);
return ret;
@@ -238,7 +238,7 @@ static int __blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx)
*/
if (!list_empty(&rq_list)) {
blk_mq_sched_mark_restart_hctx(hctx);
- if (blk_mq_dispatch_rq_list(hctx, &rq_list, false)) {
+ if (blk_mq_dispatch_rq_list(hctx, &rq_list, false, 0)) {
if (has_sched_dispatch)
ret = blk_mq_do_dispatch_sched(hctx);
else
@@ -251,7 +251,7 @@ static int __blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx)
ret = blk_mq_do_dispatch_ctx(hctx);
} else {
blk_mq_flush_busy_ctxs(hctx, &rq_list);
- blk_mq_dispatch_rq_list(hctx, &rq_list, false);
+ blk_mq_dispatch_rq_list(hctx, &rq_list, false, 0);
}
return ret;
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 3e3fbb13f3b9..bfdfdd61e663 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1212,7 +1212,8 @@ static enum prep_dispatch blk_mq_prep_dispatch_rq(struct request *rq,
*/
if (!blk_mq_mark_tag_wait(hctx, rq)) {
/* budget is always obtained before getting tag */
- blk_mq_put_dispatch_budget(rq->q);
+ if (ask_budget)
+ blk_mq_put_dispatch_budget(rq->q);
return PREP_DISPATCH_NO_TAG;
}
}
@@ -1233,12 +1234,17 @@ static blk_status_t blk_mq_dispatch_rq(struct request *rq, bool is_last)
static void blk_mq_handle_partial_dispatch(struct blk_mq_hw_ctx *hctx,
struct list_head *list, enum prep_dispatch prep,
- blk_status_t ret, bool queued)
+ blk_status_t ret, bool queued, unsigned budgets)
{
struct request_queue *q = hctx->queue;
bool needs_restart;
bool no_tag = false;
bool no_budget_avail = false;
+ unsigned i = 0;
+
+ /* release got budgets */
+ while (i++ < budgets)
+ blk_mq_put_dispatch_budget(hctx->queue);
/*
* For non-shared tags, the RESTART check
@@ -1298,9 +1304,11 @@ static void blk_mq_handle_partial_dispatch(struct blk_mq_hw_ctx *hctx,
/*
* Returns true if we did some work AND can potentially do more.
+ *
+ * @budgets is only valid iff @got_budget is true.
*/
bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list,
- bool got_budget)
+ bool got_budget, unsigned int budgets)
{
enum prep_dispatch prep;
struct request *rq;
@@ -1360,7 +1368,9 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list,
* that is where we will continue on next queue run.
*/
if (!list_empty(list)) {
- blk_mq_handle_partial_dispatch(hctx, list, prep, ret, !!queued);
+ blk_mq_handle_partial_dispatch(hctx, list, prep, ret,
+ !!queued,
+ got_budget ? budgets - queued : 0);
blk_mq_update_dispatch_busy(hctx, true);
return false;
} else
diff --git a/block/blk-mq.h b/block/blk-mq.h
index 9c0e93d4fe38..a37f8f673a19 100644
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -40,7 +40,8 @@ struct blk_mq_ctx {
void blk_mq_exit_queue(struct request_queue *q);
int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr);
void blk_mq_wake_waiters(struct request_queue *q);
-bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *, bool);
+bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *,
+ bool, unsigned int);
void blk_mq_add_to_requeue_list(struct request *rq, bool at_head,
bool kick_requeue_list);
void blk_mq_flush_busy_ctxs(struct blk_mq_hw_ctx *hctx, struct list_head *list);
--
2.25.2
next prev parent reply other threads:[~2020-05-13 9:55 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-13 9:54 [PATCH 0/9] blk-mq: support batching dispatch from scheduler Ming Lei
2020-05-13 9:54 ` [PATCH 1/9] blk-mq: pass request queue into get/put budget callback Ming Lei
2020-05-13 10:06 ` Johannes Thumshirn
2020-05-13 12:24 ` Christoph Hellwig
2020-05-13 14:36 ` Doug Anderson
2020-05-13 22:48 ` Sagi Grimberg
2020-05-13 9:54 ` [PATCH 2/9] blk-mq: pass hctx to blk_mq_dispatch_rq_list Ming Lei
2020-05-13 12:26 ` Christoph Hellwig
2020-05-13 22:49 ` Sagi Grimberg
2020-05-13 9:54 ` [PATCH 3/9] blk-mq: don't predicate last flag in blk_mq_dispatch_rq_list Ming Lei
2020-05-13 12:27 ` Christoph Hellwig
2020-05-14 0:50 ` Ming Lei
2020-05-14 5:50 ` Christoph Hellwig
2020-05-14 2:09 ` Ming Lei
2020-05-14 2:19 ` Ming Lei
2020-05-14 3:21 ` Keith Busch
2020-05-14 8:28 ` Ming Lei
2020-05-13 9:54 ` [PATCH 4/9] blk-mq: move getting driver tag and bugget into one helper Ming Lei
2020-05-13 12:37 ` Christoph Hellwig
2020-05-13 22:54 ` Sagi Grimberg
2020-05-13 9:54 ` [PATCH 5/9] blk-mq: move .queue_rq code " Ming Lei
2020-05-13 12:38 ` Christoph Hellwig
2020-05-13 9:54 ` [PATCH 6/9] blk-mq: move code for handling partial dispatch " Ming Lei
2020-05-13 12:56 ` Christoph Hellwig
2020-05-13 13:01 ` Christoph Hellwig
2020-05-14 1:25 ` Ming Lei
2020-05-13 9:54 ` [PATCH 7/9] blk-mq: remove dead check from blk_mq_dispatch_rq_list Ming Lei
2020-05-13 12:57 ` Christoph Hellwig
2020-05-13 23:24 ` Sagi Grimberg
2020-05-13 9:54 ` Ming Lei [this message]
2020-05-13 13:26 ` [PATCH 8/9] blk-mq: pass obtained budget count to blk_mq_dispatch_rq_list Christoph Hellwig
2020-05-13 9:54 ` [PATCH 9/9] blk-mq: support batching dispatch in case of io scheduler Ming Lei
2020-05-23 7:45 ` [PATCH 0/9] blk-mq: support batching dispatch from scheduler Baolin Wang
2020-05-25 2:17 ` Ming Lei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200513095443.2038859-9-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=baolin.wang7@gmail.com \
--cc=hch@infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).