On Mon, May 20, 2019 at 09:05:25AM +0300, Leon Romanovsky wrote: > From: Jason Gunthorpe <jgg@xxxxxxxxxxxx> > > This value has always been set to PAGE_SHIFT in the core code, the only > thing that does differently was the ODP path. Move the value into the ODP > struct and still use it for ODP, but change all the non-ODP things to just > use PAGE_SHIFT/PAGE_SIZE/PAGE_MASK directly. > > Reviewed-by: Shiraz Saleem <shiraz.saleem@xxxxxxxxx> > Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxxxx> > Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx> > --- > Changelog v0->v1: > * Fixed wrong page shift in umem ODP. > --- > drivers/infiniband/core/umem.c | 3 +- > drivers/infiniband/core/umem_odp.c | 79 +++++++++++------------- > drivers/infiniband/hw/hns/hns_roce_cq.c | 3 +- > drivers/infiniband/hw/hns/hns_roce_srq.c | 10 ++- > drivers/infiniband/hw/mlx4/mr.c | 8 +-- > drivers/infiniband/hw/mlx4/srq.c | 2 +- > drivers/infiniband/hw/mlx5/mem.c | 20 +++--- > drivers/infiniband/hw/mlx5/mr.c | 5 +- > drivers/infiniband/hw/mlx5/odp.c | 23 +++---- > drivers/infiniband/hw/nes/nes_verbs.c | 9 +-- > include/rdma/ib_umem.h | 19 ++---- > include/rdma/ib_umem_odp.h | 20 ++++++ > 12 files changed, 99 insertions(+), 102 deletions(-) Applied to for-next Jason