lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 527/779] RDMA/rxe: For invalidate compare according to set keys in mr
    Date
    From: Md Haris Iqbal <haris.phnx@gmail.com>

    [ Upstream commit 174e7b137042f19b5ce88beb4fc0ff4ec6b0c72a ]

    The 'rkey' input can be an lkey or rkey, and in rxe the lkey or rkey have
    the same value, including the variant bits.

    So, if mr->rkey is set, compare the invalidate key with it, otherwise
    compare with the mr->lkey.

    Since we already did a lookup on the non-varient bits to get this far, the
    check's only purpose is to confirm that the wqe has the correct variant
    bits.

    Fixes: 001345339f4c ("RDMA/rxe: Separate HW and SW l/rkeys")
    Link: https://lore.kernel.org/r/20220707073006.328737-1-haris.phnx@gmail.com
    Signed-off-by: Md Haris Iqbal <haris.phnx@gmail.com>
    Reviewed-by: Bob Pearson <rpearsonhpe@gmail.com>
    Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/sw/rxe/rxe_loc.h | 2 +-
    drivers/infiniband/sw/rxe/rxe_mr.c | 12 ++++++------
    2 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
    index 4fd73b51fabf..21bd969718bd 100644
    --- a/drivers/infiniband/sw/rxe/rxe_loc.h
    +++ b/drivers/infiniband/sw/rxe/rxe_loc.h
    @@ -85,7 +85,7 @@ struct rxe_mr *lookup_mr(struct rxe_pd *pd, int access, u32 key,
    enum rxe_mr_lookup_type type);
    int mr_check_range(struct rxe_mr *mr, u64 iova, size_t length);
    int advance_dma_data(struct rxe_dma_info *dma, unsigned int length);
    -int rxe_invalidate_mr(struct rxe_qp *qp, u32 rkey);
    +int rxe_invalidate_mr(struct rxe_qp *qp, u32 key);
    int rxe_reg_fast_mr(struct rxe_qp *qp, struct rxe_send_wqe *wqe);
    int rxe_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata);
    void rxe_mr_cleanup(struct rxe_pool_entry *arg);
    diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
    index bedcf15aaea7..7c2e7b291b65 100644
    --- a/drivers/infiniband/sw/rxe/rxe_mr.c
    +++ b/drivers/infiniband/sw/rxe/rxe_mr.c
    @@ -522,22 +522,22 @@ struct rxe_mr *lookup_mr(struct rxe_pd *pd, int access, u32 key,
    return mr;
    }

    -int rxe_invalidate_mr(struct rxe_qp *qp, u32 rkey)
    +int rxe_invalidate_mr(struct rxe_qp *qp, u32 key)
    {
    struct rxe_dev *rxe = to_rdev(qp->ibqp.device);
    struct rxe_mr *mr;
    int ret;

    - mr = rxe_pool_get_index(&rxe->mr_pool, rkey >> 8);
    + mr = rxe_pool_get_index(&rxe->mr_pool, key >> 8);
    if (!mr) {
    - pr_err("%s: No MR for rkey %#x\n", __func__, rkey);
    + pr_err("%s: No MR for key %#x\n", __func__, key);
    ret = -EINVAL;
    goto err;
    }

    - if (rkey != mr->rkey) {
    - pr_err("%s: rkey (%#x) doesn't match mr->rkey (%#x)\n",
    - __func__, rkey, mr->rkey);
    + if (mr->rkey ? (key != mr->rkey) : (key != mr->lkey)) {
    + pr_err("%s: wr key (%#x) doesn't match mr key (%#x)\n",
    + __func__, key, (mr->rkey ? mr->rkey : mr->lkey));
    ret = -EINVAL;
    goto err_drop_ref;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 21:33    [W:2.164 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site