diff options
| author | Yishai Hadas <yishaih@mellanox.com> | 2019-12-22 13:46:48 +0100 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2020-01-03 22:00:13 +0100 |
| commit | d07de8bd1709a80a282963ad7b2535148678a9e4 (patch) | |
| tree | 55703196cb587b7c95161af3d08e0bf249cc891a | |
| parent | IB/mlx5: Unify ODP MR code paths to allow extra flexibility (diff) | |
| download | linux-d07de8bd1709a80a282963ad7b2535148678a9e4.tar.xz linux-d07de8bd1709a80a282963ad7b2535148678a9e4.zip | |
IB/core: Fix ODP get user pages flow
The nr_pages argument of get_user_pages_remote() should always be in terms
of the system page size, not the MR page size. Use PAGE_SIZE instead of
umem_odp->page_shift.
Fixes: 403cd12e2cf7 ("IB/umem: Add contiguous ODP support")
Link: https://lore.kernel.org/r/20191222124649.52300-3-leon@kernel.org
Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
Reviewed-by: Artemy Kovalyov <artemyko@mellanox.com>
Reviewed-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
| -rw-r--r-- | drivers/infiniband/core/umem_odp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/umem_odp.c b/drivers/infiniband/core/umem_odp.c index e42d44e501fd..2e9ee7adab13 100644 --- a/drivers/infiniband/core/umem_odp.c +++ b/drivers/infiniband/core/umem_odp.c @@ -440,7 +440,7 @@ int ib_umem_odp_map_dma_pages(struct ib_umem_odp *umem_odp, u64 user_virt, while (bcnt > 0) { const size_t gup_num_pages = min_t(size_t, - (bcnt + BIT(page_shift) - 1) >> page_shift, + ALIGN(bcnt, PAGE_SIZE) / PAGE_SIZE, PAGE_SIZE / sizeof(struct page *)); down_read(&owning_mm->mmap_sem); |