IB/rdmavt: Fix loopback send with invalidate ordering (38bbc9f0) · Commits · 戴 / test

The IBTA spec notes: o9-5.2.1: For any HCA which supports SEND with Invalidate, upon receiving an IETH, the Invalidate operation must not take place until after the normal transport header validation checks have been successfully completed. The rdmavt loopback code does the validation after the invalidate. Fix by relocating the operation specific logic for all SEND variants until after the validity checks. Cc: <stable@vger.kernel.org> #v4.20+ Reviewed-by:

Michael J. Ruhl <michael.j.ruhl@intel.com> Signed-off-by:

Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by:

Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by:

Jason Gunthorpe <jgg@mellanox.com>

drivers/infiniband/sw/rdmavt/qp.c

+16 −10

Original line number	Diff line number	Diff line
		@@ -2898,18 +2898,8 @@ again:
		goto send_comp;

		case IB_WR_SEND_WITH_INV:
		if (!rvt_invalidate_rkey(qp, wqe->wr.ex.invalidate_rkey)) {
		wc.wc_flags = IB_WC_WITH_INVALIDATE;
		wc.ex.invalidate_rkey = wqe->wr.ex.invalidate_rkey;
		}
		goto send;

		case IB_WR_SEND_WITH_IMM:
		wc.wc_flags = IB_WC_WITH_IMM;
		wc.ex.imm_data = wqe->wr.ex.imm_data;
		/* FALLTHROUGH */
		case IB_WR_SEND:
		send:
		ret = rvt_get_rwqe(qp, false);
		if (ret < 0)
		goto op_err;
		@@ -2917,6 +2907,22 @@ send:
		goto rnr_nak;
		if (wqe->length > qp->r_len)
		goto inv_err;
		switch (wqe->wr.opcode) {
		case IB_WR_SEND_WITH_INV:
		if (!rvt_invalidate_rkey(qp,
		wqe->wr.ex.invalidate_rkey)) {
		wc.wc_flags = IB_WC_WITH_INVALIDATE;
		wc.ex.invalidate_rkey =
		wqe->wr.ex.invalidate_rkey;
		}
		break;
		case IB_WR_SEND_WITH_IMM:
		wc.wc_flags = IB_WC_WITH_IMM;
		wc.ex.imm_data = wqe->wr.ex.imm_data;
		break;
		default:
		break;
		}
		break;

		case IB_WR_RDMA_WRITE_WITH_IMM:

Admin message