From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Ming Lei <ming.lei@redhat.com>,
linux-block@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/10] block: add a missing BIOVEC_SEG_BOUNDARY check in bio_add_pc_page
Date: Mon, 24 Sep 2018 09:43:51 +0200 [thread overview]
Message-ID: <20180924074355.2802-7-hch@lst.de> (raw)
In-Reply-To: <20180924074355.2802-1-hch@lst.de>
The actual recaculation of segments in __blk_recalc_rq_segments will
do this check, so there is no point in forcing it if we know it won't
succeed.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/bio.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/block/bio.c b/block/bio.c
index 81d90b839e05..c254e5aa331f 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -731,7 +731,9 @@ int bio_add_pc_page(struct request_queue *q, struct bio *bio, struct page
}
/* If we may be able to merge these biovecs, force a recount */
- if (bio->bi_vcnt > 1 && biovec_phys_mergeable(bvec-1, bvec))
+ if (bio->bi_vcnt > 1 &&
+ biovec_phys_mergeable(bvec - 1, bvec) &&
+ BIOVEC_SEG_BOUNDARY(q, bvec - 1, bvec))
bio_clear_flag(bio, BIO_SEG_VALID);
done:
--
2.19.0
WARNING: multiple messages have this Message-ID (diff)
From: hch@lst.de (Christoph Hellwig)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/10] block: add a missing BIOVEC_SEG_BOUNDARY check in bio_add_pc_page
Date: Mon, 24 Sep 2018 09:43:51 +0200 [thread overview]
Message-ID: <20180924074355.2802-7-hch@lst.de> (raw)
In-Reply-To: <20180924074355.2802-1-hch@lst.de>
The actual recaculation of segments in __blk_recalc_rq_segments will
do this check, so there is no point in forcing it if we know it won't
succeed.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/bio.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/block/bio.c b/block/bio.c
index 81d90b839e05..c254e5aa331f 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -731,7 +731,9 @@ int bio_add_pc_page(struct request_queue *q, struct bio *bio, struct page
}
/* If we may be able to merge these biovecs, force a recount */
- if (bio->bi_vcnt > 1 && biovec_phys_mergeable(bvec-1, bvec))
+ if (bio->bi_vcnt > 1 &&
+ biovec_phys_mergeable(bvec - 1, bvec) &&
+ BIOVEC_SEG_BOUNDARY(q, bvec - 1, bvec))
bio_clear_flag(bio, BIO_SEG_VALID);
done:
--
2.19.0
next prev parent reply other threads:[~2018-09-24 7:43 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-24 7:43 clean up physical merging helpers V2 Christoph Hellwig
2018-09-24 7:43 ` Christoph Hellwig
2018-09-24 7:43 ` [PATCH 01/10] arm: remove the unused BIOVEC_MERGEABLE define Christoph Hellwig
2018-09-24 7:43 ` Christoph Hellwig
2018-09-24 7:43 ` [PATCH 02/10] block: move integrity_req_gap_{back,front}_merge to blk.h Christoph Hellwig
2018-09-24 7:43 ` [PATCH 02/10] block: move integrity_req_gap_{back, front}_merge " Christoph Hellwig
2018-09-24 7:43 ` [PATCH 03/10] block: move req_gap_{back,front}_merge to blk-merge.c Christoph Hellwig
2018-09-24 7:43 ` Christoph Hellwig
2018-09-24 7:43 ` [PATCH 04/10] block: move req_gap_back_merge to blk.h Christoph Hellwig
2018-09-24 7:43 ` Christoph Hellwig
2018-09-24 7:43 ` [PATCH 05/10] block: simplify BIOVEC_PHYS_MERGEABLE Christoph Hellwig
2018-09-24 7:43 ` Christoph Hellwig
2018-09-24 7:43 ` Christoph Hellwig [this message]
2018-09-24 7:43 ` [PATCH 06/10] block: add a missing BIOVEC_SEG_BOUNDARY check in bio_add_pc_page Christoph Hellwig
2018-09-24 7:43 ` [PATCH 07/10] block: merge BIOVEC_SEG_BOUNDARY into biovec_phys_mergeable Christoph Hellwig
2018-09-24 7:43 ` Christoph Hellwig
2018-09-24 7:43 ` [PATCH 08/10] block: remove bvec_to_phys Christoph Hellwig
2018-09-24 7:43 ` Christoph Hellwig
2018-09-24 7:43 ` [PATCH 09/10] block: don't include io.h from bio.h Christoph Hellwig
2018-09-24 7:43 ` Christoph Hellwig
2018-09-24 7:43 ` [PATCH 10/10] block: don't include bug.h " Christoph Hellwig
2018-09-24 7:43 ` Christoph Hellwig
2018-09-24 18:35 ` clean up physical merging helpers V2 Jens Axboe
2018-09-24 18:35 ` Jens Axboe
2018-09-25 20:09 ` Christoph Hellwig
2018-09-25 20:09 ` Christoph Hellwig
2018-09-25 20:25 ` Jens Axboe
2018-09-25 20:25 ` Jens Axboe
2018-09-25 0:42 ` Ming Lei
2018-09-25 0:42 ` 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=20180924074355.2802-7-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=ming.lei@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.