From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org
Subject: [PATCH 07/11] block: optimize do_make_request for direct to blk-mq issue
Date: Sat, 25 Apr 2020 19:09:40 +0200 [thread overview]
Message-ID: <20200425170944.968861-8-hch@lst.de> (raw)
In-Reply-To: <20200425170944.968861-1-hch@lst.de>
Don't bother with reshuffling the on-stack bio list if we know that we
directly issue to a request based driver that can't re-inject bios.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-core.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index e8c48203b2c55..d196799e68881 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1035,10 +1035,7 @@ static blk_qc_t do_make_request(struct bio *bio,
if (unlikely(bio_queue_enter(bio) != 0))
return BLK_QC_T_NONE;
- if (q->make_request_fn)
- ret = q->make_request_fn(q, bio);
- else
- ret = blk_mq_make_request(q, bio);
+ ret = q->make_request_fn(q, bio);
blk_queue_exit(q);
/*
@@ -1092,7 +1089,10 @@ static blk_qc_t __generic_make_request(struct bio *bio)
current->bio_list = bio_list_on_stack;
do {
- ret = do_make_request(bio, bio_list_on_stack);
+ if (bio->bi_disk->queue->make_request_fn)
+ ret = do_make_request(bio, bio_list_on_stack);
+ else
+ ret = __direct_make_request(bio);
} while ((bio = bio_list_pop(&bio_list_on_stack[0])));
current->bio_list = NULL; /* deactivate */
--
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 ` Christoph Hellwig [this message]
2020-04-25 17:09 ` [PATCH 08/11] block: move the call to blk_queue_enter_live out of blk_mq_get_request Christoph Hellwig
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-8-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).