Commit 335ebf6f authored by Steve Wise's avatar Steve Wise Committed by Jason Gunthorpe

iw_cxgb4: only clear the ARMED bit if a notification is needed

In __flush_qp(), the CQ ARMED bit was being cleared regardless of
whether any notification is actually needed.  This resulted in the iser
termination logic getting stuck in ib_drain_sq() because the CQ was not
marked ARMED and thus the drain CQE notification wasn't triggered.

This new bug was exposed when this commit was merged:

commit cbb40fad ("iw_cxgb4: only call the cq comp_handler when the
cq is armed")
Signed-off-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent d0e312fe
...@@ -1285,21 +1285,21 @@ static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp, ...@@ -1285,21 +1285,21 @@ static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp,
spin_unlock_irqrestore(&rchp->lock, flag); spin_unlock_irqrestore(&rchp->lock, flag);
if (schp == rchp) { if (schp == rchp) {
if (t4_clear_cq_armed(&rchp->cq) && if ((rq_flushed || sq_flushed) &&
(rq_flushed || sq_flushed)) { t4_clear_cq_armed(&rchp->cq)) {
spin_lock_irqsave(&rchp->comp_handler_lock, flag); spin_lock_irqsave(&rchp->comp_handler_lock, flag);
(*rchp->ibcq.comp_handler)(&rchp->ibcq, (*rchp->ibcq.comp_handler)(&rchp->ibcq,
rchp->ibcq.cq_context); rchp->ibcq.cq_context);
spin_unlock_irqrestore(&rchp->comp_handler_lock, flag); spin_unlock_irqrestore(&rchp->comp_handler_lock, flag);
} }
} else { } else {
if (t4_clear_cq_armed(&rchp->cq) && rq_flushed) { if (rq_flushed && t4_clear_cq_armed(&rchp->cq)) {
spin_lock_irqsave(&rchp->comp_handler_lock, flag); spin_lock_irqsave(&rchp->comp_handler_lock, flag);
(*rchp->ibcq.comp_handler)(&rchp->ibcq, (*rchp->ibcq.comp_handler)(&rchp->ibcq,
rchp->ibcq.cq_context); rchp->ibcq.cq_context);
spin_unlock_irqrestore(&rchp->comp_handler_lock, flag); spin_unlock_irqrestore(&rchp->comp_handler_lock, flag);
} }
if (t4_clear_cq_armed(&schp->cq) && sq_flushed) { if (sq_flushed && t4_clear_cq_armed(&schp->cq)) {
spin_lock_irqsave(&schp->comp_handler_lock, flag); spin_lock_irqsave(&schp->comp_handler_lock, flag);
(*schp->ibcq.comp_handler)(&schp->ibcq, (*schp->ibcq.comp_handler)(&schp->ibcq,
schp->ibcq.cq_context); schp->ibcq.cq_context);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment