From: Ming Lei <ming.lei@redhat.com> To: Jens Axboe <axboe@kernel.dk> Cc: linux-block@vger.kernel.org, Ming Lei <ming.lei@redhat.com>, ris Ostrovsky <boris.ostrovsky@oracle.com>, Juergen Gross <jgross@suse.com>, xen-devel@lists.xenproject.org, Omar Sandoval <osandov@fb.com>, Christoph Hellwig <hch@lst.de> Subject: [PATCH 2/6] block: don't merge adjacent bvecs to one segment in bio blk_queue_split Date: Sat, 9 Mar 2019 09:37:33 +0800 [thread overview] Message-ID: <20190309013737.27741-3-ming.lei@redhat.com> (raw) In-Reply-To: <20190309013737.27741-1-ming.lei@redhat.com> For normal filesystem IO, each page is added via blk_add_page(), in which bvec(page) merge has been handled already, and basically not possible to merge two adjacent bvecs in one bio. So not try to merge two adjacent bvecs in blk_queue_split(), also add check if one page is mergeable to current bvec in bio_add_page() for avoiding to break XEN. Cc: ris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Juergen Gross <jgross@suse.com> Cc: xen-devel@lists.xenproject.org Cc: Omar Sandoval <osandov@fb.com> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Ming Lei <ming.lei@redhat.com> --- block/bio.c | 2 ++ block/blk-merge.c | 17 ----------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/block/bio.c b/block/bio.c index 71a78d9fb8b7..d8f48188937c 100644 --- a/block/bio.c +++ b/block/bio.c @@ -776,6 +776,8 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page, if (vec_end_addr + 1 != page_addr + off) return false; + if (xen_domain() && !xen_biovec_phys_mergeable(bv, page)) + return false; if (same_page && (vec_end_addr & PAGE_MASK) != page_addr) return false; diff --git a/block/blk-merge.c b/block/blk-merge.c index 1c9d4f0f96ea..aa9164eb7187 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -267,23 +267,6 @@ static struct bio *blk_bio_segment_split(struct request_queue *q, goto split; } - if (bvprvp) { - if (seg_size + bv.bv_len > queue_max_segment_size(q)) - goto new_segment; - if (!biovec_phys_mergeable(q, bvprvp, &bv)) - goto new_segment; - - seg_size += bv.bv_len; - bvprv = bv; - bvprvp = &bvprv; - sectors += bv.bv_len >> 9; - - if (nsegs == 1 && seg_size > front_seg_size) - front_seg_size = seg_size; - - continue; - } -new_segment: if (nsegs == max_segs) goto split; -- 2.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Ming Lei <ming.lei@redhat.com> To: Jens Axboe <axboe@kernel.dk> Cc: Juergen Gross <jgross@suse.com>, Ming Lei <ming.lei@redhat.com>, linux-block@vger.kernel.org, xen-devel@lists.xenproject.org, ris Ostrovsky <boris.ostrovsky@oracle.com>, Christoph Hellwig <hch@lst.de>, Omar Sandoval <osandov@fb.com> Subject: [PATCH 2/6] block: don't merge adjacent bvecs to one segment in bio blk_queue_split Date: Sat, 9 Mar 2019 09:37:33 +0800 [thread overview] Message-ID: <20190309013737.27741-3-ming.lei@redhat.com> (raw) In-Reply-To: <20190309013737.27741-1-ming.lei@redhat.com> For normal filesystem IO, each page is added via blk_add_page(), in which bvec(page) merge has been handled already, and basically not possible to merge two adjacent bvecs in one bio. So not try to merge two adjacent bvecs in blk_queue_split(), also add check if one page is mergeable to current bvec in bio_add_page() for avoiding to break XEN. Cc: ris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Juergen Gross <jgross@suse.com> Cc: xen-devel@lists.xenproject.org Cc: Omar Sandoval <osandov@fb.com> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Ming Lei <ming.lei@redhat.com> --- block/bio.c | 2 ++ block/blk-merge.c | 17 ----------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/block/bio.c b/block/bio.c index 71a78d9fb8b7..d8f48188937c 100644 --- a/block/bio.c +++ b/block/bio.c @@ -776,6 +776,8 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page, if (vec_end_addr + 1 != page_addr + off) return false; + if (xen_domain() && !xen_biovec_phys_mergeable(bv, page)) + return false; if (same_page && (vec_end_addr & PAGE_MASK) != page_addr) return false; diff --git a/block/blk-merge.c b/block/blk-merge.c index 1c9d4f0f96ea..aa9164eb7187 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -267,23 +267,6 @@ static struct bio *blk_bio_segment_split(struct request_queue *q, goto split; } - if (bvprvp) { - if (seg_size + bv.bv_len > queue_max_segment_size(q)) - goto new_segment; - if (!biovec_phys_mergeable(q, bvprvp, &bv)) - goto new_segment; - - seg_size += bv.bv_len; - bvprv = bv; - bvprvp = &bvprv; - sectors += bv.bv_len >> 9; - - if (nsegs == 1 && seg_size > front_seg_size) - front_seg_size = seg_size; - - continue; - } -new_segment: if (nsegs == max_segs) goto split; -- 2.9.5 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-03-09 1:38 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-09 1:37 [PATCH 0/6] block: enable multi-page bvec for passthrough IO Ming Lei 2019-03-09 1:37 ` Ming Lei 2019-03-09 1:37 ` [PATCH 1/6] block: pass page to xen_biovec_phys_mergeable Ming Lei 2019-03-09 1:37 ` Ming Lei 2019-03-11 14:16 ` Christoph Hellwig 2019-03-11 14:16 ` Christoph Hellwig 2019-03-11 19:57 ` Boris Ostrovsky 2019-03-11 19:57 ` Boris Ostrovsky 2019-03-09 1:37 ` Ming Lei [this message] 2019-03-09 1:37 ` [PATCH 2/6] block: don't merge adjacent bvecs to one segment in bio blk_queue_split Ming Lei 2019-03-11 14:21 ` Christoph Hellwig 2019-03-11 14:21 ` Christoph Hellwig 2019-03-12 1:22 ` Ming Lei 2019-03-12 1:22 ` Ming Lei 2019-03-11 19:58 ` Boris Ostrovsky 2019-03-11 19:58 ` Boris Ostrovsky 2019-03-09 1:37 ` [PATCH 3/6] block: check if page is mergeable in one helper Ming Lei 2019-03-11 14:23 ` Christoph Hellwig 2019-03-17 8:05 ` Ming Lei 2019-03-09 1:37 ` [PATCH 4/6] block: put the same page when adding it to bio Ming Lei 2019-03-11 14:28 ` Christoph Hellwig 2019-03-09 1:37 ` [PATCH 5/6] block: enable multi-page bvec for passthrough IO Ming Lei 2019-03-11 14:35 ` Christoph Hellwig 2019-03-12 1:06 ` Ming Lei 2019-03-09 1:37 ` [PATCH 6/6] block: don't check if adjacent bvecs in one bio can be mergeable Ming Lei 2019-03-11 14:40 ` Christoph Hellwig 2019-03-12 1:19 ` 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=20190309013737.27741-3-ming.lei@redhat.com \ --to=ming.lei@redhat.com \ --cc=axboe@kernel.dk \ --cc=boris.ostrovsky@oracle.com \ --cc=hch@lst.de \ --cc=jgross@suse.com \ --cc=linux-block@vger.kernel.org \ --cc=osandov@fb.com \ --cc=xen-devel@lists.xenproject.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: linkBe 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.