hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qed: Don't free a QP more than once 

If QP is in reset state then there are no resources to free so avoid
freeing any.

Signed-off-by: Ram Amrani <Ram.Amrani@cavium.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ram Amrani 2017-02-20 22:43:32 +02:00 committed by David S. Miller
parent c5212b943d
commit 300c0d7c23
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/net/ethernet/qlogic/qed/qed_roce.c
View File

@ -1849,6 +1849,7 @@ err_resp:
static int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp) static int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp)
{ {
struct qed_rdma_info *p_rdma_info = p_hwfn->p_rdma_info;
u32 num_invalidated_mw = 0; u32 num_invalidated_mw = 0;
u32 num_bound_mw = 0; u32 num_bound_mw = 0;
u32 start_cid; u32 start_cid;
@ -1863,36 +1864,40 @@ static int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp)
return -EINVAL; return -EINVAL;
} }
rc = qed_roce_sp_destroy_qp_responder(p_hwfn, qp, &num_invalidated_mw); if (qp->cur_state != QED_ROCE_QP_STATE_RESET) {
if (rc) rc = qed_roce_sp_destroy_qp_responder(p_hwfn, qp,
return rc; &num_invalidated_mw);
if (rc)
return rc;
/* Send destroy requester ramrod */ /* Send destroy requester ramrod */
rc = qed_roce_sp_destroy_qp_requester(p_hwfn, qp, &num_bound_mw); rc = qed_roce_sp_destroy_qp_requester(p_hwfn, qp,
if (rc) &num_bound_mw);
return rc; if (rc)
return rc;
if (num_invalidated_mw != num_bound_mw) { if (num_invalidated_mw != num_bound_mw) {
DP_NOTICE(p_hwfn, DP_NOTICE(p_hwfn,
"number of invalidate memory windows is different from bounded ones\n"); "number of invalidate memory windows is different from bounded ones\n");
return -EINVAL; return -EINVAL;
}
spin_lock_bh(&p_rdma_info->lock);
start_cid = qed_cxt_get_proto_cid_start(p_hwfn,
p_rdma_info->proto);
/* Release responder's icid */
qed_bmap_release_id(p_hwfn, &p_rdma_info->cid_map,
qp->icid - start_cid);
/* Release requester's icid */
qed_bmap_release_id(p_hwfn, &p_rdma_info->cid_map,
qp->icid + 1 - start_cid);
spin_unlock_bh(&p_rdma_info->lock);
} }
spin_lock_bh(&p_hwfn->p_rdma_info->lock);
start_cid = qed_cxt_get_proto_cid_start(p_hwfn,
p_hwfn->p_rdma_info->proto);
/* Release responder's icid */
qed_bmap_release_id(p_hwfn, &p_hwfn->p_rdma_info->cid_map,
qp->icid - start_cid);
/* Release requester's icid */
qed_bmap_release_id(p_hwfn, &p_hwfn->p_rdma_info->cid_map,
qp->icid + 1 - start_cid);
spin_unlock_bh(&p_hwfn->p_rdma_info->lock);
return 0; return 0;
} }