Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/infiniband/hw/cxgb4/qp.c

+4 −4
Original line number Diff line number Diff line
@@ -1285,21 +1285,21 @@ static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp, 
	spin_unlock_irqrestore(&rchp->lock, flag);



	if (schp == rchp) {

		if (t4_clear_cq_armed(&rchp->cq) &&

		    (rq_flushed || sq_flushed)) {

		if ((rq_flushed || sq_flushed) &&

		    t4_clear_cq_armed(&rchp->cq)) {

			spin_lock_irqsave(&rchp->comp_handler_lock, flag);

			(*rchp->ibcq.comp_handler)(&rchp->ibcq,

						   rchp->ibcq.cq_context);

			spin_unlock_irqrestore(&rchp->comp_handler_lock, flag);

		}

	} 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);

			(*rchp->ibcq.comp_handler)(&rchp->ibcq,

						   rchp->ibcq.cq_context);

			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);

			(*schp->ibcq.comp_handler)(&schp->ibcq,

						   schp->ibcq.cq_context);