Commit 13920e4b authored by Naman Jain's avatar Naman Jain Committed by Jens Axboe
Browse files

block: add pgmap check to biovec_phys_mergeable 



biovec_phys_mergeable() is used by the request merge, DMA mapping,
and integrity merge paths to decide if two physically contiguous
bvec segments can be coalesced into one. It currently has no check
for whether the segments belong to different dev_pagemaps.

When zone device memory is registered in multiple chunks, each chunk
gets its own dev_pagemap. A single bio can legitimately contain
bvecs from different pgmaps -- iov_iter_extract_bvecs() breaks at
pgmap boundaries but the outer loop in bio_iov_iter_get_pages()
continues filling the same bio. If such bvecs are physically
contiguous, biovec_phys_mergeable() will coalesce them, making it
impossible to recover the correct pgmap for the merged segment
via page_pgmap().

Add a zone_device_pages_have_same_pgmap() check to prevent merging
bvec segments that span different pgmaps.

Fixes: 49580e69 ("block: add check when merging zone device pages")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNaman Jain <namjain@linux.microsoft.com>
Link: https://patch.msgid.link/20260410153414.4159050-2-namjain@linux.microsoft.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e784f2ea

block/blk.h

+2 −0
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ static inline bool biovec_phys_mergeable(struct request_queue *q, 


	if (addr1 + vec1->bv_len != addr2)

		return false;

	if (!zone_device_pages_have_same_pgmap(vec1->bv_page, vec2->bv_page))

		return false;

	if (xen_domain() && !xen_biovec_phys_mergeable(vec1, vec2->bv_page))

		return false;

	if ((addr1 | mask) != ((addr2 + vec2->bv_len - 1) | mask))