lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 067/203] RDMA/hns: Release qp resources when failed to destroy qp
    Date
    From: Yangyang Li <liyangyang20@huawei.com>

    commit d302c6e3a6895608a5856bc708c47bda1770b24d upstream.

    Even if no response from hardware, we should make sure that qp related
    resources are released to avoid memory leaks.

    Fixes: 926a01dc000d ("RDMA/hns: Add QP operations support for hip08 SoC")
    Signed-off-by: Yangyang Li <liyangyang20@huawei.com>
    Signed-off-by: Weihang Li <liweihang@hisilicon.com>
    Link: https://lore.kernel.org/r/1570584110-3659-1-git-send-email-liweihang@hisilicon.com
    Signed-off-by: Doug Ledford <dledford@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 12 ++++--------
    1 file changed, 4 insertions(+), 8 deletions(-)

    --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
    +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
    @@ -4650,16 +4650,14 @@ static int hns_roce_v2_destroy_qp_common
    {
    struct hns_roce_cq *send_cq, *recv_cq;
    struct ib_device *ibdev = &hr_dev->ib_dev;
    - int ret;
    + int ret = 0;

    if (hr_qp->ibqp.qp_type == IB_QPT_RC && hr_qp->state != IB_QPS_RESET) {
    /* Modify qp to reset before destroying qp */
    ret = hns_roce_v2_modify_qp(&hr_qp->ibqp, NULL, 0,
    hr_qp->state, IB_QPS_RESET);
    - if (ret) {
    + if (ret)
    ibdev_err(ibdev, "modify QP to Reset failed.\n");
    - return ret;
    - }
    }

    send_cq = to_hr_cq(hr_qp->ibqp.send_cq);
    @@ -4715,7 +4713,7 @@ static int hns_roce_v2_destroy_qp_common
    kfree(hr_qp->rq_inl_buf.wqe_list);
    }

    - return 0;
    + return ret;
    }

    static int hns_roce_v2_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata)
    @@ -4725,11 +4723,9 @@ static int hns_roce_v2_destroy_qp(struct
    int ret;

    ret = hns_roce_v2_destroy_qp_common(hr_dev, hr_qp, udata);
    - if (ret) {
    + if (ret)
    ibdev_err(&hr_dev->ib_dev, "Destroy qp 0x%06lx failed(%d)\n",
    hr_qp->qpn, ret);
    - return ret;
    - }

    if (hr_qp->ibqp.qp_type == IB_QPT_GSI)
    kfree(hr_to_hr_sqp(hr_qp));

    \
     
     \ /
      Last update: 2020-01-17 00:23    [W:3.077 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site