RDMA/umem: Make ib_umem_is_contiguous() safe on 32 bit

Sashiko points out the roundup_pow_of_two() only uses unsigned long but
dma_addr_t can be u64.

Change this algorithm to be simpler, compute the page size, if any page
size is found and it results in a single block then it is contiguous.

Link: https://patch.msgid.link/r/3-v1-88303e9e509f+f7-ib_umem_types_jgg@nvidia.com
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
This commit is contained in:
Jason Gunthorpe
2026-06-01 13:52:33 -03:00
parent 09ea6837a0
commit 55d984dae6

View File

@@ -145,16 +145,11 @@ static inline unsigned long ib_umem_find_best_pgoff(struct ib_umem *umem,
static inline bool ib_umem_is_contiguous(struct ib_umem *umem)
{
dma_addr_t dma_addr;
unsigned long pgsz;
/*
* Select the smallest aligned page that can contain the whole umem if
* it was contiguous.
*/
dma_addr = ib_umem_start_dma_addr(umem);
pgsz = roundup_pow_of_two((dma_addr ^ (umem->length - 1 + dma_addr)) + 1);
return !!ib_umem_find_best_pgoff(umem, pgsz, U64_MAX);
pgsz = ib_umem_find_best_pgsz(umem, ULONG_MAX,
ib_umem_start_dma_addr(umem));
return pgsz && ib_umem_num_dma_blocks(umem, pgsz) == 1;
}
struct ib_umem_dmabuf *ib_umem_dmabuf_get(struct ib_device *device,