block: add check when merging zone device pages

Consecutive zone device pages should not be merged into the same sgl
or bvec segment with other types of pages or if they belong to different
pgmaps. Otherwise getting the pgmap of a given segment is not possible
without scanning the entire segment. This helper returns true either if
both pages are not zone device pages or both pages are zone device
pages with the same pgmap.

Add a helper to determine if zone device pages are mergeable and use
this helper in page_is_mergeable().

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20221021174116.7200-5-logang@deltatee.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bio.c b/block/bio.c
index 57c2f327225bd13da2cc00506aeeb2986d13b637..c7a124294828fa741ed94123740d6716800addee 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -863,6 +863,8 @@ static inline bool page_is_mergeable(const struct bio_vec *bv,
                return false;
        if (xen_domain() && !xen_biovec_phys_mergeable(bv, page))
                return false;
+       if (!zone_device_pages_have_same_pgmap(bv->bv_page, page))
+               return false;
 
        *same_page = ((vec_end_addr & PAGE_MASK) == page_addr);
        if (*same_page)

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 5f74891556f33c3df957d744ee15087a0522dc20..9c49ec5d0e254802018bce581baa5c8f8665a50a 100644 (file)
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -986,6 +986,25 @@ static inline bool is_zone_device_page(const struct page *page)
 {
        return page_zonenum(page) == ZONE_DEVICE;
 }
+
+/*
+ * Consecutive zone device pages should not be merged into the same sgl
+ * or bvec segment with other types of pages or if they belong to different
+ * pgmaps. Otherwise getting the pgmap of a given segment is not possible
+ * without scanning the entire segment. This helper returns true either if
+ * both pages are not zone device pages or both pages are zone device pages
+ * with the same pgmap.
+ */
+static inline bool zone_device_pages_have_same_pgmap(const struct page *a,
+                                                    const struct page *b)
+{
+       if (is_zone_device_page(a) != is_zone_device_page(b))
+               return false;
+       if (!is_zone_device_page(a))
+               return true;
+       return a->pgmap == b->pgmap;
+}
+
 extern void memmap_init_zone_device(struct zone *, unsigned long,
                                    unsigned long, struct dev_pagemap *);
 #else
@@ -993,6 +1012,11 @@ static inline bool is_zone_device_page(const struct page *page)
 {
        return false;
 }
+static inline bool zone_device_pages_have_same_pgmap(const struct page *a,
+                                                    const struct page *b)
+{
+       return true;
+}
 #endif
 
 static inline bool folio_is_zone_device(const struct folio *folio)