Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da6a496a authored by Moni Shoua's avatar Moni Shoua Committed by Jason Gunthorpe
Browse files

IB/mlx5: Ranges in implicit ODP MR inherit its write access 



A sub-range in ODP implicit MR should take its write permission from the
MR and not be set always to allow.

Fixes: d07d1d70 ("IB/umem: Update on demand page (ODP) support")
Signed-off-by: default avatarMoni Shoua <monis@mellanox.com>
Reviewed-by: default avatarArtemy Kovalyov <artemyko@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 8ba0ddd0

drivers/infiniband/core/umem_odp.c

+3 −2
Original line number Diff line number Diff line
@@ -332,9 +332,10 @@ static void put_per_mm(struct ib_umem_odp *umem_odp) 
	mmu_notifier_call_srcu(&per_mm->rcu, free_per_mm);

}



struct ib_umem_odp *ib_alloc_odp_umem(struct ib_ucontext_per_mm *per_mm,

struct ib_umem_odp *ib_alloc_odp_umem(struct ib_umem_odp *root,

				      unsigned long addr, size_t size)

{

	struct ib_ucontext_per_mm *per_mm = root->per_mm;

	struct ib_ucontext *ctx = per_mm->context;

	struct ib_umem_odp *odp_data;

	struct ib_umem *umem;
@@ -349,7 +350,7 @@ struct ib_umem_odp *ib_alloc_odp_umem(struct ib_ucontext_per_mm *per_mm, 
	umem->length     = size;

	umem->address    = addr;

	umem->page_shift = PAGE_SHIFT;

	umem->writable   = 1;

	umem->writable   = root->umem.writable;

	umem->is_odp = 1;

	odp_data->per_mm = per_mm;

drivers/infiniband/hw/mlx5/odp.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static struct ib_umem_odp *implicit_mr_get_data(struct mlx5_ib_mr *mr, 
		if (nentries)

			nentries++;

	} else {

		odp = ib_alloc_odp_umem(odp_mr->per_mm, addr,

		odp = ib_alloc_odp_umem(odp_mr, addr,

					MLX5_IMR_MTT_SIZE);

		if (IS_ERR(odp)) {

			mutex_unlock(&odp_mr->umem_mutex);

include/rdma/ib_umem_odp.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ struct ib_ucontext_per_mm { 
};



int ib_umem_odp_get(struct ib_umem_odp *umem_odp, int access);

struct ib_umem_odp *ib_alloc_odp_umem(struct ib_ucontext_per_mm *per_mm,

struct ib_umem_odp *ib_alloc_odp_umem(struct ib_umem_odp *root_umem,

				      unsigned long addr, size_t size);

void ib_umem_odp_release(struct ib_umem_odp *umem_odp);