From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Bart Van Assche <bvanassche@acm.org>,
Damien Le Moal <dlemoal@kernel.org>,
linux-block@vger.kernel.org
Subject: [PATCH 12/20] blk-mq: factor out a blk_mq_get_budget_and_tag helper
Date: Thu, 13 Apr 2023 08:40:49 +0200 [thread overview]
Message-ID: <20230413064057.707578-13-hch@lst.de> (raw)
In-Reply-To: <20230413064057.707578-1-hch@lst.de>
Factor out a helper from __blk_mq_try_issue_directly in preparation
of folding that function into its two callers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
---
block/blk-mq.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index d17871c237f7df..5cb7ebefc88c14 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2624,13 +2624,27 @@ static blk_status_t __blk_mq_issue_directly(struct blk_mq_hw_ctx *hctx,
return ret;
}
+static bool blk_mq_get_budget_and_tag(struct request *rq)
+{
+ int budget_token;
+
+ budget_token = blk_mq_get_dispatch_budget(rq->q);
+ if (budget_token < 0)
+ return false;
+ blk_mq_set_rq_budget_token(rq, budget_token);
+ if (!blk_mq_get_driver_tag(rq)) {
+ blk_mq_put_dispatch_budget(rq->q, budget_token);
+ return false;
+ }
+ return true;
+}
+
static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,
struct request *rq,
bool bypass_insert, bool last)
{
struct request_queue *q = rq->q;
bool run_queue = true;
- int budget_token;
/*
* RCU or SRCU read lock is needed before checking quiesced flag.
@@ -2648,16 +2662,8 @@ static blk_status_t __blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx,
if ((rq->rq_flags & RQF_ELV) && !bypass_insert)
goto insert;
- budget_token = blk_mq_get_dispatch_budget(q);
- if (budget_token < 0)
- goto insert;
-
- blk_mq_set_rq_budget_token(rq, budget_token);
-
- if (!blk_mq_get_driver_tag(rq)) {
- blk_mq_put_dispatch_budget(q, budget_token);
+ if (!blk_mq_get_budget_and_tag(rq))
goto insert;
- }
return __blk_mq_issue_directly(hctx, rq, last);
insert:
--
2.39.2
next prev parent reply other threads:[~2023-04-13 6:41 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-13 6:40 cleanup request insertation parameters v3 Christoph Hellwig
2023-04-13 6:40 ` [PATCH 01/20] blk-mq: don't plug for head insertions in blk_execute_rq_nowait Christoph Hellwig
2023-04-13 6:40 ` [PATCH 02/20] blk-mq: remove blk-mq-tag.h Christoph Hellwig
2023-04-13 6:40 ` [PATCH 03/20] blk-mq: include <linux/blk-mq.h> in block/blk-mq.h Christoph Hellwig
2023-04-13 6:40 ` [PATCH 04/20] blk-mq: move more logic into blk_mq_insert_requests Christoph Hellwig
2023-04-13 6:40 ` [PATCH 05/20] blk-mq: fold blk_mq_sched_insert_requests into blk_mq_dispatch_plug_list Christoph Hellwig
2023-04-13 6:40 ` [PATCH 06/20] blk-mq: move blk_mq_sched_insert_request to blk-mq.c Christoph Hellwig
2023-04-13 6:40 ` [PATCH 07/20] blk-mq: fold __blk_mq_insert_request into blk_mq_insert_request Christoph Hellwig
2023-04-13 6:40 ` [PATCH 08/20] blk-mq: fold __blk_mq_insert_req_list " Christoph Hellwig
2023-04-13 6:40 ` [PATCH 09/20] blk-mq: remove blk_flush_queue_rq Christoph Hellwig
2023-04-13 6:40 ` [PATCH 10/20] blk-mq: refactor passthrough vs flush handling in blk_mq_insert_request Christoph Hellwig
2023-04-13 6:40 ` [PATCH 11/20] blk-mq: refactor the DONTPREP/SOFTBARRIER andling in blk_mq_requeue_work Christoph Hellwig
2023-04-13 6:40 ` Christoph Hellwig [this message]
2023-04-13 6:40 ` [PATCH 13/20] blk-mq: fold __blk_mq_try_issue_directly into its two callers Christoph Hellwig
2023-04-13 6:40 ` [PATCH 14/20] blk-mq: don't run the hw_queue from blk_mq_insert_request Christoph Hellwig
2023-04-13 6:40 ` [PATCH 15/20] blk-mq: don't run the hw_queue from blk_mq_request_bypass_insert Christoph Hellwig
2023-04-13 6:40 ` [PATCH 16/20] blk-mq: don't kick the requeue_list in blk_mq_add_to_requeue_list Christoph Hellwig
2023-04-13 6:54 ` Damien Le Moal
2023-04-13 6:59 ` Christoph Hellwig
2023-04-13 7:47 ` Damien Le Moal
2023-04-13 6:40 ` [PATCH 17/20] blk-mq: pass a flags argument to blk_mq_insert_request Christoph Hellwig
2023-04-13 6:40 ` [PATCH 18/20] blk-mq: pass a flags argument to blk_mq_request_bypass_insert Christoph Hellwig
2023-04-13 6:40 ` [PATCH 19/20] blk-mq: pass a flags argument to elevator_type->insert_requests Christoph Hellwig
2023-04-13 6:40 ` [PATCH 20/20] blk-mq: pass a flags argument to blk_mq_add_to_requeue_list Christoph Hellwig
2023-04-13 6:55 ` Damien Le Moal
2023-04-13 13:11 ` cleanup request insertation parameters v3 Jens Axboe
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=20230413064057.707578-13-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=dlemoal@kernel.org \
--cc=linux-block@vger.kernel.org \
/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