block: relax pgmap check in bio_add_page for compatible zone device pages

bio_add_page() and bio_integrity_add_page() reject pages from different
dev_pagemaps entirely, returning 0 even when those pages have compatible
DMA mapping requirements. This forces callers to start a new bio when
buffers span pgmap boundaries, even though the pages could safely coexist
as separate bvec entries.

This matters for guests where memory is registered through
devm_memremap_pages() with MEMORY_DEVICE_GENERIC in multiple calls,
creating separate dev_pagemaps for each chunk. When a direct I/O buffer
spans two such chunks, bio_add_page() rejects the second page, forcing an
unnecessary bio split or I/O failure.

Introduce zone_device_pages_compatible() in blk.h to check whether two
pages can coexist in the same bio as separate bvec entries. The block DMA
iterator (blk_dma_map_iter_start) caches the P2PDMA mapping state from the
first segment and applies it to all others, so P2PDMA pages from different
pgmaps must not be mixed, and neither must P2PDMA and non-P2PDMA pages.
All other combinations (MEMORY_DEVICE_GENERIC pages from different pgmaps,
or MEMORY_DEVICE_GENERIC with normal RAM) use the same dma_map_phys path
and are safe.

Replace the blanket zone_device_pages_have_same_pgmap() rejection with
zone_device_pages_compatible(), while keeping
zone_device_pages_have_same_pgmap() as a merge guard.
Pages from different pgmaps can be added as separate bvec entries but
must not be coalesced into the same segment, as that would make
it impossible to recover the correct pgmap via page_pgmap().

Fixes: 49580e690755 ("block: add check when merging zone device pages")
Cc: stable@vger.kernel.org
Signed-off-by: Naman Jain <namjain@linux.microsoft.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://patch.msgid.link/20260410153414.4159050-3-namjain@linux.microsoft.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index e79eaf04779430465b033981c2451a1da6efc84b..e54c6e06e1cbba6fa64b70c62deb3ad9710b8e03 100644 (file)
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -231,10 +231,10 @@ int bio_integrity_add_page(struct bio *bio, struct page *page,
        if (bip->bip_vcnt > 0) {
                struct bio_vec *bv = &bip->bip_vec[bip->bip_vcnt - 1];
 
-               if (!zone_device_pages_have_same_pgmap(bv->bv_page, page))
+               if (!zone_device_pages_compatible(bv->bv_page, page))
                        return 0;
-
-               if (bvec_try_merge_hw_page(q, bv, page, len, offset)) {
+               if (zone_device_pages_have_same_pgmap(bv->bv_page, page) &&
+                   bvec_try_merge_hw_page(q, bv, page, len, offset)) {
                        bip->bip_iter.bi_size += len;
                        return len;
                }

diff --git a/block/bio.c b/block/bio.c
index 641ef0928d73585c965ec75f2bbe8b6519df393c..c52a0bd1e8993dcc5941e42d7481b66214754bd3 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -1048,10 +1048,10 @@ int bio_add_page(struct bio *bio, struct page *page,
        if (bio->bi_vcnt > 0) {
                struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1];
 
-               if (!zone_device_pages_have_same_pgmap(bv->bv_page, page))
+               if (!zone_device_pages_compatible(bv->bv_page, page))
                        return 0;
-
-               if (bvec_try_merge_page(bv, page, len, offset)) {
+               if (zone_device_pages_have_same_pgmap(bv->bv_page, page) &&
+                   bvec_try_merge_page(bv, page, len, offset)) {
                        bio->bi_iter.bi_size += len;
                        return len;
                }

diff --git a/block/blk.h b/block/blk.h
index 50a41db0391331f9d0abe4fcf81e60cb6fd31fdf..b998a7761faf36c0f89998ca417d172412dceb16 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -136,6 +136,25 @@ static inline bool biovec_phys_mergeable(struct request_queue *q,
        return true;
 }
 
+/*
+ * Check if two pages from potentially different zone device pgmaps can
+ * coexist as separate bvec entries in the same bio.
+ *
+ * The block DMA iterator (blk_dma_map_iter_start) caches the P2PDMA mapping
+ * state from the first segment and applies it to all subsequent segments, so
+ * P2PDMA pages from different pgmaps must not be mixed in the same bio.
+ *
+ * Other zone device types (FS_DAX, GENERIC) use the same dma_map_phys() path
+ * as normal RAM.  PRIVATE and COHERENT pages never appear in bios.
+ */
+static inline bool zone_device_pages_compatible(const struct page *a,
+                                               const struct page *b)
+{
+       if (is_pci_p2pdma_page(a) || is_pci_p2pdma_page(b))
+               return zone_device_pages_have_same_pgmap(a, b);
+       return true;
+}
+
 static inline bool __bvec_gap_to_prev(const struct queue_limits *lim,
                struct bio_vec *bprv, unsigned int offset)
 {