lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 321/530] IB: Set IOVA/LENGTH on IB_MR in core/uverbs layers
    Date
    From: Daisuke Matsuda <matsuda-daisuke@fujitsu.com>

    [ 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>
    ---
    drivers/infiniband/core/uverbs_cmd.c | 5 ++++-
    drivers/infiniband/core/verbs.c | 2 ++
    drivers/infiniband/hw/hns/hns_roce_mr.c | 1 -
    drivers/infiniband/hw/mlx4/mr.c | 1 -
    4 files changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
    index d1345d76d9b1..9f0e0402fbc0 100644
    --- 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 59e20936b800..b721085bb597 100644
    --- 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 7089ac780291..20360df25771 100644
    --- 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 04a67b481608..a40bf58bcdd3 100644
    --- 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;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 23:43    [W:2.080 / U:1.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site