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

Commit a29aeb83 authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Greg Kroah-Hartman
Browse files

IB/{qib, hfi1}: Avoid flow control testing for RDMA write operation 



commit 5b0ef650bd0f820e922fcc42f1985d4621ae19cf upstream.

Section 9.7.7.2.5 of the 1.3 IBTA spec clearly says that receive
credits should never apply to RDMA write.

qib and hfi1 were doing that.  The following situation will result
in a QP hang:
- A prior SEND or RDMA_WRITE with immmediate consumed the last
  credit for a QP using RC receive buffer credits
- The prior op is acked so there are no more acks
- The peer ULP fails to post receive for some reason
- An RDMA write sees that the credits are exhausted and waits
- The peer ULP posts receive buffers
- The ULP posts a send or RDMA write that will be hung

The fix is to avoid the credit test for the RDMA write operation.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e1487023

drivers/infiniband/hw/hfi1/rc.c

+2 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
		case IB_WR_RDMA_WRITE:

			if (newreq && !(qp->s_flags & RVT_S_UNLIMITED_CREDIT))

				qp->s_lsn++;

			/* FALLTHROUGH */

			goto no_flow_control;

		case IB_WR_RDMA_WRITE_WITH_IMM:

			/* If no credit, return. */

			if (!(qp->s_flags & RVT_S_UNLIMITED_CREDIT) &&
@@ -559,6 +559,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
				qp->s_flags |= RVT_S_WAIT_SSN_CREDIT;

				goto bail;

			}

no_flow_control:

			put_ib_reth_vaddr(

				wqe->rdma_wr.remote_addr,

				&ohdr->u.rc.reth);

drivers/infiniband/hw/qib/qib_rc.c

+2 −2
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ int qib_make_rc_req(struct rvt_qp *qp, unsigned long *flags) 
		case IB_WR_RDMA_WRITE:

			if (newreq && !(qp->s_flags & RVT_S_UNLIMITED_CREDIT))

				qp->s_lsn++;

			/* FALLTHROUGH */

			goto no_flow_control;

		case IB_WR_RDMA_WRITE_WITH_IMM:

			/* If no credit, return. */

			if (!(qp->s_flags & RVT_S_UNLIMITED_CREDIT) &&
@@ -365,7 +365,7 @@ int qib_make_rc_req(struct rvt_qp *qp, unsigned long *flags) 
				qp->s_flags |= RVT_S_WAIT_SSN_CREDIT;

				goto bail;

			}



no_flow_control:

			ohdr->u.rc.reth.vaddr =

				cpu_to_be64(wqe->rdma_wr.remote_addr);

			ohdr->u.rc.reth.rkey =