diff options
author | Ming Lei <ming.lei@redhat.com> | 2019-03-17 13:01:04 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-31 16:43:43 +0300 |
commit | 0aa9a8d4983dea88e181c519cd50544f62238ad8 (patch) | |
tree | f0a5b67d0f289f430bfd96bb468760ed1efd5176 | |
parent | 46a9cbe92c46d67c0369312845d17381abf20f0f (diff) | |
download | linux-0aa9a8d4983dea88e181c519cd50544f62238ad8.tar.xz |
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>
-rw-r--r-- | block/bio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/bio.c b/block/bio.c index 716510ecd7ff..a3c80a6c1fe5 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; |