提交 66fba4e4 编写于 作者: M Michal Kalderon 提交者: Yang Yingliang

qed: iWARP - Use READ_ONCE and smp_store_release to access ep->state

[ Upstream commit 6117561e1bb30b2fe7f51e1961f34dbedd0bec8a ]

Destroy QP waits for it's ep object state to be set to CLOSED
before proceeding. ep->state can be updated from a different
context. Add smp_store_release/READ_ONCE to synchronize.

Fixes: fc4c6065 ("qed: iWARP implement disconnect flows")
Signed-off-by: NAriel Elior <ariel.elior@marvell.com>
Signed-off-by: NMichal Kalderon <michal.kalderon@marvell.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 a09ef5a3
...@@ -532,7 +532,8 @@ int qed_iwarp_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp) ...@@ -532,7 +532,8 @@ int qed_iwarp_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp)
/* Make sure ep is closed before returning and freeing memory. */ /* Make sure ep is closed before returning and freeing memory. */
if (ep) { if (ep) {
while (ep->state != QED_IWARP_EP_CLOSED && wait_count++ < 200) while (READ_ONCE(ep->state) != QED_IWARP_EP_CLOSED &&
wait_count++ < 200)
msleep(100); msleep(100);
if (ep->state != QED_IWARP_EP_CLOSED) if (ep->state != QED_IWARP_EP_CLOSED)
...@@ -1023,8 +1024,6 @@ qed_iwarp_mpa_complete(struct qed_hwfn *p_hwfn, ...@@ -1023,8 +1024,6 @@ qed_iwarp_mpa_complete(struct qed_hwfn *p_hwfn,
params.ep_context = ep; params.ep_context = ep;
ep->state = QED_IWARP_EP_CLOSED;
switch (fw_return_code) { switch (fw_return_code) {
case RDMA_RETURN_OK: case RDMA_RETURN_OK:
ep->qp->max_rd_atomic_req = ep->cm_info.ord; ep->qp->max_rd_atomic_req = ep->cm_info.ord;
...@@ -1084,6 +1083,10 @@ qed_iwarp_mpa_complete(struct qed_hwfn *p_hwfn, ...@@ -1084,6 +1083,10 @@ qed_iwarp_mpa_complete(struct qed_hwfn *p_hwfn,
break; break;
} }
if (fw_return_code != RDMA_RETURN_OK)
/* paired with READ_ONCE in destroy_qp */
smp_store_release(&ep->state, QED_IWARP_EP_CLOSED);
ep->event_cb(ep->cb_context, &params); ep->event_cb(ep->cb_context, &params);
/* on passive side, if there is no associated QP (REJECT) we need to /* on passive side, if there is no associated QP (REJECT) we need to
...@@ -2828,7 +2831,9 @@ static void qed_iwarp_qp_in_error(struct qed_hwfn *p_hwfn, ...@@ -2828,7 +2831,9 @@ static void qed_iwarp_qp_in_error(struct qed_hwfn *p_hwfn,
params.status = (fw_return_code == IWARP_QP_IN_ERROR_GOOD_CLOSE) ? params.status = (fw_return_code == IWARP_QP_IN_ERROR_GOOD_CLOSE) ?
0 : -ECONNRESET; 0 : -ECONNRESET;
ep->state = QED_IWARP_EP_CLOSED; /* paired with READ_ONCE in destroy_qp */
smp_store_release(&ep->state, QED_IWARP_EP_CLOSED);
spin_lock_bh(&p_hwfn->p_rdma_info->iwarp.iw_lock); spin_lock_bh(&p_hwfn->p_rdma_info->iwarp.iw_lock);
list_del(&ep->list_entry); list_del(&ep->list_entry);
spin_unlock_bh(&p_hwfn->p_rdma_info->iwarp.iw_lock); spin_unlock_bh(&p_hwfn->p_rdma_info->iwarp.iw_lock);
...@@ -2917,7 +2922,8 @@ qed_iwarp_tcp_connect_unsuccessful(struct qed_hwfn *p_hwfn, ...@@ -2917,7 +2922,8 @@ qed_iwarp_tcp_connect_unsuccessful(struct qed_hwfn *p_hwfn,
params.event = QED_IWARP_EVENT_ACTIVE_COMPLETE; params.event = QED_IWARP_EVENT_ACTIVE_COMPLETE;
params.ep_context = ep; params.ep_context = ep;
params.cm_info = &ep->cm_info; params.cm_info = &ep->cm_info;
ep->state = QED_IWARP_EP_CLOSED; /* paired with READ_ONCE in destroy_qp */
smp_store_release(&ep->state, QED_IWARP_EP_CLOSED);
switch (fw_return_code) { switch (fw_return_code) {
case IWARP_CONN_ERROR_TCP_CONNECT_INVALID_PACKET: case IWARP_CONN_ERROR_TCP_CONNECT_INVALID_PACKET:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册