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

Commit 5715f5d4 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Roland Dreier
Browse files

IB/qib: Process RDMA WRITE ONLY with IMMEDIATE properly 



See table 35 in IBA - the header order for RDMA_WRITE_ONLY_WITH_IMMEDIATE
and SEND_LAST_WITH_IMMEDIATE is different: the RDMA_WRITE_ONLY has
a RETH header before the immediate data, so we need a different code path
to extract the immediate data.

I tested this with a userspace app that does RDMA_WRITE with immediate
on a QLE7140.

Signed-off-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarRalph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 0f2f930a

drivers/infiniband/hw/qib/qib_rc.c

+4 −1
Original line number Diff line number Diff line
@@ -2068,7 +2068,10 @@ void qib_rc_rcv(struct qib_ctxtdata *rcd, struct qib_ib_header *hdr, 
			goto nack_op_err;

		if (!ret)

			goto rnr_nak;

		goto send_last_imm;

		wc.ex.imm_data = ohdr->u.rc.imm_data;

		hdrsize += 4;

		wc.wc_flags = IB_WC_WITH_IMM;

		goto send_last;



	case OP(RDMA_READ_REQUEST): {

		struct qib_ack_entry *e;

drivers/infiniband/hw/qib/qib_uc.c

+4 −2
Original line number Diff line number Diff line
@@ -457,8 +457,10 @@ void qib_uc_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr, 
		}

		if (opcode == OP(RDMA_WRITE_ONLY))

			goto rdma_last;

		else if (opcode == OP(RDMA_WRITE_ONLY_WITH_IMMEDIATE))

		else if (opcode == OP(RDMA_WRITE_ONLY_WITH_IMMEDIATE)) {

			wc.ex.imm_data = ohdr->u.rc.imm_data;

			goto rdma_last_imm;

		}

		/* FALLTHROUGH */

	case OP(RDMA_WRITE_MIDDLE):

		/* Check for invalid length PMTU or posted rwqe len. */
@@ -471,8 +473,8 @@ void qib_uc_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr, 
		break;



	case OP(RDMA_WRITE_LAST_WITH_IMMEDIATE):

rdma_last_imm:

		wc.ex.imm_data = ohdr->u.imm_data;

rdma_last_imm:

		hdrsize += 4;

		wc.wc_flags = IB_WC_WITH_IMM;