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

Commit cbb40fad authored by Steve Wise's avatar Steve Wise Committed by Doug Ledford
Browse files

iw_cxgb4: only call the cq comp_handler when the cq is armed 



The ULPs completion handler should only be called if the CQ is
armed for notification.

Signed-off-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 1c8f1da5

drivers/infiniband/hw/cxgb4/ev.c

+5 −3
Original line number Diff line number Diff line
@@ -109,10 +109,12 @@ static void post_qp_event(struct c4iw_dev *dev, struct c4iw_cq *chp, 
	if (qhp->ibqp.event_handler)

		(*qhp->ibqp.event_handler)(&event, qhp->ibqp.qp_context);



	if (t4_clear_cq_armed(&chp->cq)) {

		spin_lock_irqsave(&chp->comp_handler_lock, flag);

		(*chp->ibcq.comp_handler)(&chp->ibcq, chp->ibcq.cq_context);

		spin_unlock_irqrestore(&chp->comp_handler_lock, flag);

	}

}



void c4iw_ev_dispatch(struct c4iw_dev *dev, struct t4_cqe *err_cqe)

{

drivers/infiniband/hw/cxgb4/qp.c

+12 −8
Original line number Diff line number Diff line
@@ -813,11 +813,13 @@ static void complete_sq_drain_wr(struct c4iw_qp *qhp, struct ib_send_wr *wr) 
	t4_swcq_produce(cq);

	spin_unlock_irqrestore(&schp->lock, flag);



	if (t4_clear_cq_armed(&schp->cq)) {

		spin_lock_irqsave(&schp->comp_handler_lock, flag);

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

					   schp->ibcq.cq_context);

		spin_unlock_irqrestore(&schp->comp_handler_lock, flag);

	}

}



static void complete_rq_drain_wr(struct c4iw_qp *qhp, struct ib_recv_wr *wr)

{
@@ -842,11 +844,13 @@ static void complete_rq_drain_wr(struct c4iw_qp *qhp, struct ib_recv_wr *wr) 
	t4_swcq_produce(cq);

	spin_unlock_irqrestore(&rchp->lock, flag);



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

	}

}



int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,

		   struct ib_send_wr **bad_wr)