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 5/9] blk-mq: move .queue_rq code into one helper
Date: Wed, 13 May 2020 17:54:39 +0800 [thread overview]
Message-ID: <20200513095443.2038859-6-ming.lei@redhat.com> (raw)
In-Reply-To: <20200513095443.2038859-1-ming.lei@redhat.com>
Move code for queueing rq into one helper, so that blk_mq_dispatch_rq_list
gets a bit simpified, and easier to read.
No functional change.
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.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index c06421faa555..34fd09adb7fc 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1220,6 +1220,17 @@ static enum prep_dispatch blk_mq_prep_dispatch_rq(struct request *rq,
return PREP_DISPATCH_OK;
}
+static blk_status_t blk_mq_dispatch_rq(struct request *rq, bool is_last)
+{
+ struct blk_mq_queue_data bd;
+
+ list_del_init(&rq->queuelist);
+ bd.rq = rq;
+ bd.last = is_last;
+
+ return rq->q->mq_ops->queue_rq(rq->mq_hctx, &bd);
+}
+
/*
* Returns true if we did some work AND can potentially do more.
*/
@@ -1243,8 +1254,6 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list,
*/
errors = queued = 0;
do {
- struct blk_mq_queue_data bd;
-
rq = list_first_entry(list, struct request, queuelist);
WARN_ON_ONCE(hctx != rq->mq_hctx);
@@ -1252,12 +1261,7 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list,
if (prep != PREP_DISPATCH_OK)
break;
- list_del_init(&rq->queuelist);
-
- bd.rq = rq;
- bd.last = !!list_empty(list);
-
- ret = q->mq_ops->queue_rq(hctx, &bd);
+ ret = blk_mq_dispatch_rq(rq, list_is_singular(list));
if (ret == BLK_STS_RESOURCE || ret == BLK_STS_DEV_RESOURCE) {
blk_mq_handle_dev_resource(rq, list);
break;
--
2.25.2
next prev parent reply other threads:[~2020-05-13 9:57 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 ` Ming Lei [this message]
2020-05-13 12:38 ` [PATCH 5/9] blk-mq: move .queue_rq code " 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 ` [PATCH 8/9] blk-mq: pass obtained budget count to blk_mq_dispatch_rq_list Ming Lei
2020-05-13 13:26 ` 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-6-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).