From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org
Subject: [PATCH 08/11] block: move the call to blk_queue_enter_live out of blk_mq_get_request
Date: Sat, 25 Apr 2020 19:09:41 +0200 [thread overview]
Message-ID: <20200425170944.968861-9-hch@lst.de> (raw)
In-Reply-To: <20200425170944.968861-1-hch@lst.de>
Move the blk_queue_enter_live calls into the callers, where they can
successively be cleaned up.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-mq.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index bcc3a2397d4ae..0d94437362644 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -340,8 +340,6 @@ static struct request *blk_mq_get_request(struct request_queue *q,
bool clear_ctx_on_error = false;
u64 alloc_time_ns = 0;
- blk_queue_enter_live(q);
-
/* alloc_time includes depth and tag waits */
if (blk_queue_rq_alloc_time(q))
alloc_time_ns = ktime_get_ns();
@@ -377,7 +375,6 @@ static struct request *blk_mq_get_request(struct request_queue *q,
if (tag == BLK_MQ_TAG_FAIL) {
if (clear_ctx_on_error)
data->ctx = NULL;
- blk_queue_exit(q);
return NULL;
}
@@ -407,11 +404,14 @@ struct request *blk_mq_alloc_request(struct request_queue *q, unsigned int op,
if (ret)
return ERR_PTR(ret);
+ blk_queue_enter_live(q);
rq = blk_mq_get_request(q, NULL, &alloc_data);
blk_queue_exit(q);
- if (!rq)
+ if (!rq) {
+ blk_queue_exit(q);
return ERR_PTR(-EWOULDBLOCK);
+ }
rq->__data_len = 0;
rq->__sector = (sector_t) -1;
@@ -456,11 +456,14 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q,
cpu = cpumask_first_and(alloc_data.hctx->cpumask, cpu_online_mask);
alloc_data.ctx = __blk_mq_get_ctx(q, cpu);
+ blk_queue_enter_live(q);
rq = blk_mq_get_request(q, NULL, &alloc_data);
blk_queue_exit(q);
- if (!rq)
+ if (!rq) {
+ blk_queue_exit(q);
return ERR_PTR(-EWOULDBLOCK);
+ }
return rq;
}
@@ -2011,8 +2014,10 @@ blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
rq_qos_throttle(q, bio);
data.cmd_flags = bio->bi_opf;
+ blk_queue_enter_live(q);
rq = blk_mq_get_request(q, bio, &data);
if (unlikely(!rq)) {
+ blk_queue_exit(q);
rq_qos_cleanup(q, bio);
if (bio->bi_opf & REQ_NOWAIT)
bio_wouldblock_error(bio);
--
2.26.1
next prev parent reply other threads:[~2020-04-25 17:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-25 17:09 [RFC] more make_request optimizations Christoph Hellwig
2020-04-25 17:09 ` [PATCH 01/11] block: improve the kerneldoc comments for submit_bio and generic_make_request Christoph Hellwig
2020-04-26 2:59 ` Ming Lei
2020-04-25 17:09 ` [PATCH 02/11] block: cleanup the memory stall accounting in submit_bio Christoph Hellwig
2020-04-25 17:09 ` [PATCH 03/11] block: replace BIO_QUEUE_ENTERED with BIO_CGROUP_ACCT Christoph Hellwig
2020-04-25 17:09 ` [PATCH 04/11] block: add a bio_queue_enter helper Christoph Hellwig
2020-04-25 17:09 ` [PATCH 05/11] block: refactor generic_make_request Christoph Hellwig
2020-04-25 17:09 ` [PATCH 06/11] block: optimize generic_make_request for direct to blk-mq issue Christoph Hellwig
2020-04-26 2:53 ` Ming Lei
2020-04-27 15:10 ` Christoph Hellwig
2020-04-25 17:09 ` [PATCH 07/11] block: optimize do_make_request " Christoph Hellwig
2020-04-25 17:09 ` Christoph Hellwig [this message]
2020-04-25 17:09 ` [PATCH 09/11] block: remove a pointless queue enter pair in blk_mq_alloc_request Christoph Hellwig
2020-04-25 17:09 ` [PATCH 10/11] block: remove a pointless queue enter pair in blk_mq_alloc_request_hctx Christoph Hellwig
2020-04-25 17:09 ` [PATCH 11/11] block: allow blk_mq_make_request to consume the q_usage_counter reference Christoph Hellwig
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=20200425170944.968861-9-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--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;
as well as URLs for NNTP newsgroup(s).