linux-block.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pavel Begunkov <asml.silence@gmail.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: linux-block@vger.kernel.org, Jens Axboe <axboe@kernel.dk>
Subject: Re: [PATCH 06/16] block: clean up blk_mq_submit_bio() merging
Date: Wed, 20 Oct 2021 13:20:59 +0100	[thread overview]
Message-ID: <a00b2f44-e3e3-bf42-98a3-044423f17176@gmail.com> (raw)
In-Reply-To: <YW+0Pf9jBG5JtjQY@infradead.org>

On 10/20/21 07:16, Christoph Hellwig wrote:
> On Tue, Oct 19, 2021 at 10:24:15PM +0100, Pavel Begunkov wrote:
>> Combine blk_mq_sched_bio_merge() and blk_attempt_plug_merge() under a
>> common if, so we don't check it twice. Also honor bio_mergeable() for
>> blk_mq_sched_bio_merge().
>>
>> Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
>> ---
>>   block/blk-mq-sched.c |  2 +-
>>   block/blk-mq-sched.h | 12 +-----------
>>   block/blk-mq.c       | 13 +++++++------
>>   3 files changed, 9 insertions(+), 18 deletions(-)
>>
[...]
>> diff --git a/block/blk-mq.c b/block/blk-mq.c
>> index bab1fccda6ca..218bfaa98591 100644
>> --- a/block/blk-mq.c
>> +++ b/block/blk-mq.c
>> @@ -2482,12 +2482,13 @@ void blk_mq_submit_bio(struct bio *bio)
>>   	if (!bio_integrity_prep(bio))
>>   		goto queue_exit;
>>   
>> -	if (!is_flush_fua && !blk_queue_nomerges(q) &&
>> -	    blk_attempt_plug_merge(q, bio, nr_segs, &same_queue_rq))
>> -		goto queue_exit;
>> -
>> -	if (blk_mq_sched_bio_merge(q, bio, nr_segs))
>> -		goto queue_exit;
>> +	if (!blk_queue_nomerges(q) && bio_mergeable(bio)) {
> 
> bio_mergeable just checks REQ_NOMERGE_FLAGS, which includes
> REQ_PREFLUSH and REQ_FUA...
> 
>> +		if (!is_flush_fua &&
> 
> ... so this is not needed.

Missed it, thanks. I also need to update the message then

-- 
Pavel Begunkov

  reply	other threads:[~2021-10-20 12:21 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-19 21:24 [PATCH 00/16] block optimisation round Pavel Begunkov
2021-10-19 21:24 ` [PATCH 01/16] block: turn macro helpers into inline functions Pavel Begunkov
2021-10-20  6:09   ` Christoph Hellwig
2021-10-19 21:24 ` [PATCH 02/16] block: convert leftovers to bdev_get_queue Pavel Begunkov
2021-10-19 22:34   ` Chaitanya Kulkarni
2021-10-19 21:24 ` [PATCH 03/16] block: optimise req_bio_endio() Pavel Begunkov
2021-10-20  6:11   ` Christoph Hellwig
2021-10-22  9:58   ` Shinichiro Kawasaki
2021-10-22 10:58     ` Pavel Begunkov
2021-10-19 21:24 ` [PATCH 04/16] block: don't bloat enter_queue with percpu_ref Pavel Begunkov
2021-10-19 22:32   ` Chaitanya Kulkarni
2021-10-20  6:12   ` Christoph Hellwig
2021-10-20 12:08     ` Pavel Begunkov
2021-10-19 21:24 ` [PATCH 05/16] block: inline a part of bio_release_pages() Pavel Begunkov
2021-10-20  6:13   ` Christoph Hellwig
2021-10-20 12:19     ` Pavel Begunkov
2021-10-20 14:15     ` Jens Axboe
2021-10-20 17:29       ` Christoph Hellwig
2021-10-19 21:24 ` [PATCH 06/16] block: clean up blk_mq_submit_bio() merging Pavel Begunkov
2021-10-20  6:16   ` Christoph Hellwig
2021-10-20 12:20     ` Pavel Begunkov [this message]
2021-10-19 21:24 ` [PATCH 07/16] blocK: move plug flush functions to blk-mq.c Pavel Begunkov
2021-10-19 22:34   ` Chaitanya Kulkarni
2021-10-20  6:17   ` Christoph Hellwig
2021-10-20 12:23     ` Pavel Begunkov
2021-10-20 12:37       ` Christoph Hellwig
2021-10-20 13:18         ` Pavel Begunkov
2021-10-19 21:24 ` [PATCH 08/16] block: optimise blk_flush_plug_list Pavel Begunkov
2021-10-20  6:29   ` Christoph Hellwig
2021-10-20 12:26     ` Pavel Begunkov
2021-10-19 21:24 ` [PATCH 09/16] block: optimise boundary blkdev_read_iter's checks Pavel Begunkov
2021-10-20  6:29   ` Christoph Hellwig
2021-10-19 21:24 ` [PATCH 10/16] block: optimise blkdev_bio_end_io() Pavel Begunkov
2021-10-20  6:30   ` Christoph Hellwig
2021-10-20 12:29     ` Pavel Begunkov
2021-10-19 21:24 ` [PATCH 11/16] block: add optimised version bio_set_dev() Pavel Begunkov
2021-10-19 22:36   ` Chaitanya Kulkarni
2021-10-20  6:20   ` Christoph Hellwig
2021-10-20 12:29     ` Pavel Begunkov
2021-10-19 21:24 ` [PATCH 12/16] block: add single bio async direct IO helper Pavel Begunkov
2021-10-20  6:36   ` Christoph Hellwig
2021-10-20 12:35     ` Pavel Begunkov
2021-10-19 21:24 ` [PATCH 13/16] block: add async version of bio_set_polled Pavel Begunkov
2021-10-20  6:37   ` Christoph Hellwig
2021-10-20 12:58     ` Pavel Begunkov
2021-10-19 21:24 ` [PATCH 14/16] block: skip advance when async and not needed Pavel Begunkov
2021-10-20  6:41   ` Christoph Hellwig
2021-10-19 21:24 ` [PATCH 15/16] block: optimise blk_may_split for normal rw Pavel Begunkov
2021-10-20  6:25   ` Christoph Hellwig
2021-10-20 13:38     ` Pavel Begunkov
2021-10-19 21:24 ` [PATCH 16/16] block: optimise submit_bio_checks " Pavel Begunkov
2021-10-20  6:26   ` Christoph Hellwig
2021-10-19 23:31 ` [PATCH 00/16] block optimisation round Jens Axboe
2021-10-20  0:21 ` Jens Axboe
2021-10-20  0:22   ` Jens Axboe
2021-10-20 14:12 ` (subset) " Jens Axboe
2021-10-20 14:54 ` Pavel Begunkov

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=a00b2f44-e3e3-bf42-98a3-044423f17176@gmail.com \
    --to=asml.silence@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=hch@infradead.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;
as well as URLs for NNTP newsgroup(s).