github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 13:37:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
[ Upstream commit 241f9a27e0 ]

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 04c0a5fcfc ("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: 04c0a5fcfc ("IB/uverbs: Set IOVA on IB MR in uverbs layer")
Signed-off-by: Daisuke Matsuda <matsuda-daisuke@fujitsu.com>
Link: https://lore.kernel.org/r/20220921080844.1616883-1-matsuda-daisuke@fujitsu.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Daisuke Matsuda 2022-09-21 17:08:43 +09:00 committed by Greg Kroah-Hartman
parent 360386e11c
commit dac769dd7d
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/infiniband/core/uverbs_cmd.c
View File

@ -749,6 +749,7 @@ static int ib_uverbs_reg_mr(struct uverbs_attr_bundle *attrs)
mr->uobject = uobj; mr->uobject = uobj;
atomic_inc(&pd->usecnt); atomic_inc(&pd->usecnt);
mr->iova = cmd.hca_va; mr->iova = cmd.hca_va;
mr->length = cmd.length;
rdma_restrack_new(&mr->res, RDMA_RESTRACK_MR); rdma_restrack_new(&mr->res, RDMA_RESTRACK_MR);
rdma_restrack_set_name(&mr->res, NULL); rdma_restrack_set_name(&mr->res, NULL);
@ -832,8 +833,10 @@ static int ib_uverbs_rereg_mr(struct uverbs_attr_bundle *attrs)
atomic_dec(&old_pd->usecnt); atomic_dec(&old_pd->usecnt);
} }
if (cmd.flags & IB_MR_REREG_TRANS) if (cmd.flags & IB_MR_REREG_TRANS) {
mr->iova = cmd.hca_va; mr->iova = cmd.hca_va;
mr->length = cmd.length;
}
memset(&resp, 0, sizeof(resp)); memset(&resp, 0, sizeof(resp));
resp.lkey = mr->lkey; resp.lkey = mr->lkey;

2
drivers/infiniband/core/verbs.c
View File

@ -2082,6 +2082,8 @@ struct ib_mr *ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
mr->pd = pd; mr->pd = pd;
mr->dm = NULL; mr->dm = NULL;
atomic_inc(&pd->usecnt); atomic_inc(&pd->usecnt);
mr->iova = virt_addr;
mr->length = length;
rdma_restrack_new(&mr->res, RDMA_RESTRACK_MR); rdma_restrack_new(&mr->res, RDMA_RESTRACK_MR);
rdma_restrack_parent_name(&mr->res, &pd->res); rdma_restrack_parent_name(&mr->res, &pd->res);

1
drivers/infiniband/hw/hns/hns_roce_mr.c
View File

@ -286,7 +286,6 @@ struct ib_mr *hns_roce_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
goto err_alloc_pbl; goto err_alloc_pbl;
mr->ibmr.rkey = mr->ibmr.lkey = mr->key; mr->ibmr.rkey = mr->ibmr.lkey = mr->key;
mr->ibmr.length = length;
return &mr->ibmr; return &mr->ibmr;

1
drivers/infiniband/hw/mlx4/mr.c
View File

@ -439,7 +439,6 @@ struct ib_mr *mlx4_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
goto err_mr; goto err_mr;
mr->ibmr.rkey = mr->ibmr.lkey = mr->mmr.key; mr->ibmr.rkey = mr->ibmr.lkey = mr->mmr.key;
mr->ibmr.length = length;
mr->ibmr.page_size = 1U << shift; mr->ibmr.page_size = 1U << shift;
return &mr->ibmr; return &mr->ibmr;