You need to sign in or sign up before continuing.
提交 ebf96e2e 编写于 作者: Y Yangyang Li 提交者: Xie XiuQi

RDMA/hns: Completely release qp resources when hw err

driver inclusion
category: bugfix
bugzilla: NA
CVE: NA

Even if no response from hardware, make sure that qp related
resources are completely released.

Feature or Bugfix:Bugfix
Signed-off-by: NYangyang Li <liyangyang20@huawei.com>
Signed-off-by: Nliyangyang (M) <liyangyang20@huawei.com>
Reviewed-by: Nliuyixian <liuyixian@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 d494cb2d
...@@ -5143,18 +5143,16 @@ static int hns_roce_v2_destroy_qp_common(struct hns_roce_dev *hr_dev, ...@@ -5143,18 +5143,16 @@ static int hns_roce_v2_destroy_qp_common(struct hns_roce_dev *hr_dev,
{ {
struct hns_roce_cq *send_cq, *recv_cq; struct hns_roce_cq *send_cq, *recv_cq;
struct device *dev = hr_dev->dev; struct device *dev = hr_dev->dev;
int ret; int ret = 0;
if (hr_qp->ibqp.qp_type == IB_QPT_RC && hr_qp->state != IB_QPS_RESET) { if (hr_qp->ibqp.qp_type == IB_QPT_RC && hr_qp->state != IB_QPS_RESET) {
/* Modify qp to reset before destroying qp */ /* Modify qp to reset before destroying qp */
ret = hns_roce_v2_modify_qp(&hr_qp->ibqp, NULL, 0, ret = hns_roce_v2_modify_qp(&hr_qp->ibqp, NULL, 0,
hr_qp->state, IB_QPS_RESET); hr_qp->state, IB_QPS_RESET);
if (ret) { if (ret)
dev_err(dev, dev_err(dev,
"modify QP %06lx to Reset failed, ret = %d.\n", "modify QP %06lx to Reset failed, ret = %d.\n",
hr_qp->qpn, ret); hr_qp->qpn, ret);
return ret;
}
} }
hns_roce_get_cqs(&hr_qp->ibqp, &send_cq, &recv_cq); hns_roce_get_cqs(&hr_qp->ibqp, &send_cq, &recv_cq);
...@@ -5209,7 +5207,7 @@ static int hns_roce_v2_destroy_qp_common(struct hns_roce_dev *hr_dev, ...@@ -5209,7 +5207,7 @@ static int hns_roce_v2_destroy_qp_common(struct hns_roce_dev *hr_dev,
kfree(hr_qp->rq_inl_buf.wqe_list); kfree(hr_qp->rq_inl_buf.wqe_list);
} }
return 0; return ret;
} }
static int hns_roce_v2_destroy_qp(struct ib_qp *ibqp) static int hns_roce_v2_destroy_qp(struct ib_qp *ibqp)
...@@ -5224,18 +5222,16 @@ static int hns_roce_v2_destroy_qp(struct ib_qp *ibqp) ...@@ -5224,18 +5222,16 @@ static int hns_roce_v2_destroy_qp(struct ib_qp *ibqp)
hns_roce_inc_rdma_hw_stats(ibqp->device, HW_STATS_QP_DEALLOC); hns_roce_inc_rdma_hw_stats(ibqp->device, HW_STATS_QP_DEALLOC);
ret = hns_roce_v2_destroy_qp_common(hr_dev, hr_qp, !!ibqp->pd->uobject); ret = hns_roce_v2_destroy_qp_common(hr_dev, hr_qp, !!ibqp->pd->uobject);
if (ret) { if (ret)
dev_err(hr_dev->dev, "Destroy qp 0x%06lx failed(%d)\n", dev_err(hr_dev->dev, "Destroy qp 0x%06lx failed(%d)\n",
hr_qp->qpn, ret); hr_qp->qpn, ret);
return ret;
}
if (hr_qp->ibqp.qp_type == IB_QPT_GSI) if (hr_qp->ibqp.qp_type == IB_QPT_GSI)
kfree(hr_to_hr_sqp(hr_qp)); kfree(hr_to_hr_sqp(hr_qp));
else else
kfree(hr_qp); kfree(hr_qp);
return 0; return ret;
} }
static int hns_roce_v2_qp_flow_control_init(struct hns_roce_dev *hr_dev, static int hns_roce_v2_qp_flow_control_init(struct hns_roce_dev *hr_dev,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册