Commit 241f9a27 authored by Daisuke Matsuda's avatar Daisuke Matsuda Committed by Leon Romanovsky
Browse files

IB: Set IOVA/LENGTH on IB_MR in core/uverbs layers 



Set 'iova' and 'length' on ib_mr in ib_uverbs and ib_core layers to let all
drivers have the members filled. Also, this commit removes redundancy in
the respective drivers.

Previously, commit 04c0a5fc ("IB/uverbs: Set IOVA on IB MR in uverbs
layer") changed to set 'iova', but seems to have missed 'length' and the
ib_core layer at that time.

Fixes: 04c0a5fc ("IB/uverbs: Set IOVA on IB MR in uverbs layer")
Signed-off-by: default avatarDaisuke Matsuda <matsuda-daisuke@fujitsu.com>
Link: https://lore.kernel.org/r/20220921080844.1616883-1-matsuda-daisuke@fujitsu.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent eb8336db

drivers/infiniband/core/uverbs_cmd.c

+4 −1
Original line number Diff line number Diff line
@@ -739,6 +739,7 @@ static int ib_uverbs_reg_mr(struct uverbs_attr_bundle *attrs) 
	mr->uobject = uobj;

	atomic_inc(&pd->usecnt);

	mr->iova = cmd.hca_va;

	mr->length = cmd.length;



	rdma_restrack_new(&mr->res, RDMA_RESTRACK_MR);

	rdma_restrack_set_name(&mr->res, NULL);
@@ -861,8 +862,10 @@ static int ib_uverbs_rereg_mr(struct uverbs_attr_bundle *attrs) 
			mr->pd = new_pd;

			atomic_inc(&new_pd->usecnt);

		}

		if (cmd.flags & IB_MR_REREG_TRANS)

		if (cmd.flags & IB_MR_REREG_TRANS) {

			mr->iova = cmd.hca_va;

			mr->length = cmd.length;

		}

	}



	memset(&resp, 0, sizeof(resp));

drivers/infiniband/core/verbs.c

+2 −0
Original line number Diff line number Diff line
@@ -2149,6 +2149,8 @@ struct ib_mr *ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
	mr->pd = pd;

	mr->dm = NULL;

	atomic_inc(&pd->usecnt);

	mr->iova =  virt_addr;

	mr->length = length;



	rdma_restrack_new(&mr->res, RDMA_RESTRACK_MR);

	rdma_restrack_parent_name(&mr->res, &pd->res);

drivers/infiniband/hw/hns/hns_roce_mr.c

+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ struct ib_mr *hns_roce_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
		goto err_alloc_pbl;



	mr->ibmr.rkey = mr->ibmr.lkey = mr->key;

	mr->ibmr.length = length;



	return &mr->ibmr;

drivers/infiniband/hw/mlx4/mr.c

+0 −1
Original line number Diff line number Diff line
@@ -439,7 +439,6 @@ struct ib_mr *mlx4_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
		goto err_mr;



	mr->ibmr.rkey = mr->ibmr.lkey = mr->mmr.key;

	mr->ibmr.length = length;

	mr->ibmr.page_size = 1U << shift;



	return &mr->ibmr;