diff options
author | Ming Lei <ming.lei@redhat.com> | 2019-03-29 15:07:54 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-31 06:45:13 -0700 |
commit | 3e8d1b5d588bf66a7ceb0d289c10d60fdc315471 (patch) | |
tree | b109c0e7d5d66a807215f7d5fb81523d9e0ba0c3 | |
parent | 75a20a8c0fc93f2e4e683413c356a5a830e0dda8 (diff) | |
download | linux-stable-3e8d1b5d588bf66a7ceb0d289c10d60fdc315471.tar.gz linux-stable-3e8d1b5d588bf66a7ceb0d289c10d60fdc315471.tar.bz2 linux-stable-3e8d1b5d588bf66a7ceb0d289c10d60fdc315471.zip |
block: pass page to xen_biovec_phys_mergeable
[ Upstream commit 0383ad4374f7ad7edd925a2ee4753035c3f5508a ]
xen_biovec_phys_mergeable() only needs .bv_page of the 2nd bio bvec
for checking if the two bvecs can be merged, so pass page to
xen_biovec_phys_mergeable() directly.
No function change.
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>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.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/blk.h | 2 | ||||
-rw-r--r-- | drivers/xen/biomerge.c | 5 | ||||
-rw-r--r-- | include/xen/xen.h | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/block/blk.h b/block/blk.h index 848278c52030..a57bc90e44bb 100644 --- a/block/blk.h +++ b/block/blk.h @@ -75,7 +75,7 @@ static inline bool biovec_phys_mergeable(struct request_queue *q, if (addr1 + vec1->bv_len != addr2) return false; - if (xen_domain() && !xen_biovec_phys_mergeable(vec1, vec2)) + if (xen_domain() && !xen_biovec_phys_mergeable(vec1, vec2->bv_page)) return false; if ((addr1 | mask) != ((addr2 + vec2->bv_len - 1) | mask)) return false; diff --git a/drivers/xen/biomerge.c b/drivers/xen/biomerge.c index f3fbb700f569..05a286d24f14 100644 --- a/drivers/xen/biomerge.c +++ b/drivers/xen/biomerge.c @@ -4,12 +4,13 @@ #include <xen/xen.h> #include <xen/page.h> +/* check if @page can be merged with 'vec1' */ bool xen_biovec_phys_mergeable(const struct bio_vec *vec1, - const struct bio_vec *vec2) + const struct page *page) { #if XEN_PAGE_SIZE == PAGE_SIZE unsigned long bfn1 = pfn_to_bfn(page_to_pfn(vec1->bv_page)); - unsigned long bfn2 = pfn_to_bfn(page_to_pfn(vec2->bv_page)); + unsigned long bfn2 = pfn_to_bfn(page_to_pfn(page)); return bfn1 + PFN_DOWN(vec1->bv_offset + vec1->bv_len) == bfn2; #else diff --git a/include/xen/xen.h b/include/xen/xen.h index 0e2156786ad2..e1ba6921bc8e 100644 --- a/include/xen/xen.h +++ b/include/xen/xen.h @@ -43,7 +43,9 @@ extern struct hvm_start_info pvh_start_info; #endif /* CONFIG_XEN_DOM0 */ struct bio_vec; +struct page; + bool xen_biovec_phys_mergeable(const struct bio_vec *vec1, - const struct bio_vec *vec2); + const struct page *page); #endif /* _XEN_XEN_H */ |