Commit 904bba21 authored Jan 17, 2019 by Brian Welty Committed by Jason Gunthorpe Jan 21, 2019

IB/{hfi1, qib}: Fix WC.byte_len calculation for UD_SEND_WITH_IMM



The work completion length for a receiving a UD send with immediate is
short by 4 bytes causing application using this opcode to fail.

The UD receive logic incorrectly subtracts 4 bytes for immediate
value. These bytes are already included in header length and are used to
calculate header/payload split, so the result is these 4 bytes are
subtracted twice, once when the header length subtracted from the overall
length and once again in the UD opcode specific path.

Remove the extra subtraction when handling the opcode.

Fixes: 77241056 ("IB/hfi1: add driver files")
Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Brian Welty <brian.welty@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>

parent f45f8edb

drivers/infiniband/hw/hfi1/ud.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -987,7 +987,6 @@ void hfi1_ud_rcv(struct hfi1_packet *packet)
		opcode == IB_OPCODE_UD_SEND_ONLY_WITH_IMMEDIATE) {
		wc.ex.imm_data = packet->ohdr->u.ud.imm_data;
		wc.wc_flags = IB_WC_WITH_IMM;
		tlen -= sizeof(u32);
		} else if (opcode == IB_OPCODE_UD_SEND_ONLY) {
		wc.ex.imm_data = 0;
		wc.wc_flags = 0;

drivers/infiniband/hw/qib/qib_ud.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -512,7 +512,6 @@ void qib_ud_rcv(struct qib_ibport ibp, struct ib_header hdr,
		opcode == IB_OPCODE_UD_SEND_ONLY_WITH_IMMEDIATE) {
		wc.ex.imm_data = ohdr->u.ud.imm_data;
		wc.wc_flags = IB_WC_WITH_IMM;
		tlen -= sizeof(u32);
		} else if (opcode == IB_OPCODE_UD_SEND_ONLY) {
		wc.ex.imm_data = 0;
		wc.wc_flags = 0;

Admin message