lkml.org 
[lkml]   [2022]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 141/192] RDMA/irdma: Return error on MR deregister CQP failure
    Date
    From: Sindhu-Devale <sindhu.devale@intel.com>

    [ Upstream commit 6b227bd32db778eddc6f3b22cc72a28dda0f2272 ]

    The MR deregister CQP can fail if an MW is bound to it.
    Return an appropriate error for this case.

    Fixes: b48c24c2d710 ("RDMA/irdma: Implement device supported verb APIs")
    Signed-off-by: Sindhu-Devale <sindhu.devale@intel.com>
    Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
    Link: https://lore.kernel.org/r/20220906223244.1119-3-shiraz.saleem@intel.com
    Signed-off-by: Leon Romanovsky <leon@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/infiniband/hw/irdma/utils.c | 13 ++++++++-----
    drivers/infiniband/hw/irdma/verbs.c | 6 +++++-
    2 files changed, 13 insertions(+), 6 deletions(-)

    diff --git a/drivers/infiniband/hw/irdma/utils.c b/drivers/infiniband/hw/irdma/utils.c
    index 7b15faadfef5c..f4d774451160d 100644
    --- a/drivers/infiniband/hw/irdma/utils.c
    +++ b/drivers/infiniband/hw/irdma/utils.c
    @@ -590,11 +590,14 @@ static int irdma_wait_event(struct irdma_pci_f *rf,
    cqp_error = cqp_request->compl_info.error;
    if (cqp_error) {
    err_code = -EIO;
    - if (cqp_request->compl_info.maj_err_code == 0xFFFF &&
    - cqp_request->compl_info.min_err_code == 0x8029) {
    - if (!rf->reset) {
    - rf->reset = true;
    - rf->gen_ops.request_reset(rf);
    + if (cqp_request->compl_info.maj_err_code == 0xFFFF) {
    + if (cqp_request->compl_info.min_err_code == 0x8002)
    + err_code = -EBUSY;
    + else if (cqp_request->compl_info.min_err_code == 0x8029) {
    + if (!rf->reset) {
    + rf->reset = true;
    + rf->gen_ops.request_reset(rf);
    + }
    }
    }
    }
    diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c
    index 4835702871677..e7120d7a5b4c6 100644
    --- a/drivers/infiniband/hw/irdma/verbs.c
    +++ b/drivers/infiniband/hw/irdma/verbs.c
    @@ -3001,6 +3001,7 @@ static int irdma_dereg_mr(struct ib_mr *ib_mr, struct ib_udata *udata)
    struct irdma_pble_alloc *palloc = &iwpbl->pble_alloc;
    struct irdma_cqp_request *cqp_request;
    struct cqp_cmds_info *cqp_info;
    + int status;

    if (iwmr->type != IRDMA_MEMREG_TYPE_MEM) {
    if (iwmr->region) {
    @@ -3031,8 +3032,11 @@ static int irdma_dereg_mr(struct ib_mr *ib_mr, struct ib_udata *udata)
    cqp_info->post_sq = 1;
    cqp_info->in.u.dealloc_stag.dev = &iwdev->rf->sc_dev;
    cqp_info->in.u.dealloc_stag.scratch = (uintptr_t)cqp_request;
    - irdma_handle_cqp_op(iwdev->rf, cqp_request);
    + status = irdma_handle_cqp_op(iwdev->rf, cqp_request);
    irdma_put_cqp_request(&iwdev->rf->cqp, cqp_request);
    + if (status)
    + return status;
    +
    irdma_free_stag(iwdev, iwmr->stag);
    done:
    if (iwpbl->pbl_allocated)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-13 16:22    [W:4.866 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site