[V3,02/10] block: avoid to break XEN by multi-page bvec
diff mbox series

Message ID 20190329070803.10958-3-ming.lei@redhat.com
State New, archived
Headers show
  • [V3,01/10] block: pass page to xen_biovec_phys_mergeable
Related show

Commit Message

Ming Lei March 29, 2019, 7:07 a.m. UTC
XEN has special page merge requirement, see xen_biovec_phys_mergeable().
We can't merge pages into one bvec simply for XEN.

So move XEN's specific check on page merge into __bio_try_merge_page(),
then abvoid to break XEN by multi-page bvec.

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 ++
 1 file changed, 2 insertions(+)

diff mbox series

diff --git a/block/bio.c b/block/bio.c
index b64cedc7f87c..b2423e7aae08 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;