Commit d302c6e3 authored by Yangyang Li's avatar Yangyang Li Committed by Doug Ledford
Browse files

RDMA/hns: Release qp resources when failed to destroy qp 



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

Fixes: 926a01dc ("RDMA/hns: Add QP operations support for hip08 SoC")
Signed-off-by: default avatarYangyang Li <liyangyang20@huawei.com>
Signed-off-by: default avatarWeihang Li <liweihang@hisilicon.com>
Link: https://lore.kernel.org/r/1570584110-3659-1-git-send-email-liweihang@hisilicon.com


Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 3dcad1f8

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+4 −8
Original line number Diff line number Diff line
@@ -4650,16 +4650,14 @@ static int hns_roce_v2_destroy_qp_common(struct hns_roce_dev *hr_dev, 
{

	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(struct hns_roce_dev *hr_dev, 
		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 ib_qp *ibqp, struct ib_udata *udata) 
	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));