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

[ Upstream commit 241f9a27e0fc0eaf23e3d52c8450f10648cd11f1 ]

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 04c0a5fcfcf65 ("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: 04c0a5fcfcf65 ("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>

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index d1345d76d9b122fe608d1a2ae7fa7722922f0b99..9f0e0402fbc051a599216d444b0b38d5e8ba58fe 100644 (file)
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -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));

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index 59e20936b8007dcac83c1b1c30e81189d7f16939..b721085bb597110993de0a00e5e65e703b541ffd 100644 (file)
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -2157,6 +2157,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);

diff --git a/drivers/infiniband/hw/hns/hns_roce_mr.c b/drivers/infiniband/hw/hns/hns_roce_mr.c
index 7089ac780291340e6ef51eb41174a5119a2d2464..20360df25771c2a5aba067fe785a479d6a756b96 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_mr.c
+++ b/drivers/infiniband/hw/hns/hns_roce_mr.c
@@ -272,7 +272,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;
 

diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index 04a67b48160863e4b4dd83c032ebf2cc1d2f1dcc..a40bf58bcdd3ae0797199f2f5d51d311b0e4931a 100644 (file)
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -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;