Commit 36798d5a authored Jan 28, 2020 by Artemy Kovalyov Committed by Jason Gunthorpe Jan 28, 2020

RDMA/umem: Fix ib_umem_find_best_pgsz()

Except for the last entry, the ending iova alignment sets the maximum
possible page size as the low bits of the iova must be zero when starting
the next chunk.

Fixes: 4a353399 ("RDMA/umem: Add API to find best driver supported page size in an MR")
Link: https://lore.kernel.org/r/20200128135612.174820-1-leon@kernel.org


Signed-off-by: Artemy Kovalyov <artemyko@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Tested-by: Gal Pressman <galpress@amazon.com>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

parent ea660ad7

drivers/infiniband/core/umem.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -166,10 +166,13 @@ unsigned long ib_umem_find_best_pgsz(struct ib_umem *umem,
		* for any address.
		*/
		mask \|= (sg_dma_address(sg) + pgoff) ^ va;
		if (i && i != (umem->nmap - 1))
		/* restrict by length as well for interior SGEs */
		mask \|= sg_dma_len(sg);
		va += sg_dma_len(sg) - pgoff;
		/* Except for the last entry, the ending iova alignment sets
		* the maximum possible page size as the low bits of the iova
		* must be zero when starting the next chunk.
		*/
		if (i != (umem->nmap - 1))
		mask \|= va;
		pgoff = 0;
		}
		best_pg_bit = rdma_find_pg_bit(mask, pgsz_bitmap);

Admin message