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

Commit f9215b5e authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Doug Ledford
Browse files

IB/rdmavt, IB/hfi1, IB/qib: Correct ack count for passive (RTR) QPs 



The send complete for RC QPs mismanages the ack count when the
responder side is only in RTR.

A QP in that state cannot send requests, but it can be the target
for operations that elicit responses.

Adjust the RC completion logic to correct the count maintenance
by reflecting RECV_OK in a new state test.

Reviewed-by: default avatarKaike Wan <kaike.wan@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 3fc4a090

drivers/infiniband/hw/hfi1/rc.c

+1 −1
Original line number Diff line number Diff line
@@ -990,7 +990,7 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct ib_header *hdr) 
	u32 psn;



	lockdep_assert_held(&qp->s_lock);

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_OR_FLUSH_SEND))

	if (!(ib_rvt_state_ops[qp->state] & RVT_SEND_OR_FLUSH_OR_RECV_OK))

		return;



	/* Find out where the BTH is */

drivers/infiniband/hw/qib/qib_rc.c

+1 −1
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ void qib_rc_send_complete(struct rvt_qp *qp, struct ib_header *hdr) 
	u32 opcode;

	u32 psn;



	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_OR_FLUSH_SEND))

	if (!(ib_rvt_state_ops[qp->state] & RVT_SEND_OR_FLUSH_OR_RECV_OK))

		return;



	/* Find out where the BTH is */

include/rdma/rdmavt_qp.h

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ 
#define RVT_FLUSH_RECV			0x40

#define RVT_PROCESS_OR_FLUSH_SEND \

	(RVT_PROCESS_SEND_OK | RVT_FLUSH_SEND)

#define RVT_SEND_OR_FLUSH_OR_RECV_OK \

	(RVT_PROCESS_SEND_OK | RVT_FLUSH_SEND | RVT_PROCESS_RECV_OK)



/*

 * Internal send flags