| From d24a6e0ab5f763ac9f19669d47bf2f2cac6c4b10 Mon Sep 17 00:00:00 2001 |
| From: Ming Lei <ming.lei@redhat.com> |
| Date: Sun, 17 Mar 2019 18:01:04 +0800 |
| Subject: block: avoid to break XEN by multi-page bvec |
| |
| [ Upstream commit db5ebd6edd2627d7e81a031643cf43587f63e66c ] |
| |
| 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: xen-devel@lists.xenproject.org |
| Cc: Omar Sandoval <osandov@fb.com> |
| Cc: Christoph Hellwig <hch@lst.de> |
| Reviewed-by: Juergen Gross <jgross@suse.com> |
| Signed-off-by: Ming Lei <ming.lei@redhat.com> |
| Signed-off-by: Jens Axboe <axboe@kernel.dk> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| block/bio.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/block/bio.c b/block/bio.c |
| index 716510ecd7ffa..a3c80a6c1fe51 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; |
| |
| -- |
| 2.20.1 |
| |
