Commit b2590bdd authored Jul 15, 2019 by Kaike Wan Committed by Jason Gunthorpe Jul 22, 2019

IB/hfi1: Do not update hcrc for a KDETH packet during fault injection

When a KDETH packet is subject to fault injection during transmission,
HCRC is supposed to be omitted from the packet so that the hardware on the
receiver side would drop the packet. When creating pbc, the PbcInsertHcrc
field is set to be PBC_IHCRC_NONE if the KDETH packet is subject to fault
injection, but overwritten with PBC_IHCRC_LKDETH when update_hcrc() is
called later.

This problem is fixed by not calling update_hcrc() when the packet is
subject to fault injection.

Fixes: 6b6cf935 ("IB/hfi1: Set PbcInsertHcrc for TID RDMA packets")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20190715164546.74174.99296.stgit@awfm-01.aw.intel.com


Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Kaike Wan <kaike.wan@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

parent 5f9e832c

drivers/infiniband/hw/hfi1/verbs.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -873,14 +873,15 @@ int hfi1_verbs_send_dma(struct rvt_qp qp, struct hfi1_pkt_state ps,
		else
		pbc \|= (ib_is_sc5(sc5) << PBC_DC_INFO_SHIFT);

		if (unlikely(hfi1_dbg_should_fault_tx(qp, ps->opcode)))
		pbc = hfi1_fault_tx(qp, ps->opcode, pbc);
		pbc = create_pbc(ppd,
		pbc,
		qp->srate_mbps,
		vl,
		plen);

		if (unlikely(hfi1_dbg_should_fault_tx(qp, ps->opcode)))
		pbc = hfi1_fault_tx(qp, ps->opcode, pbc);
		else
		/* Update HCRC based on packet opcode */
		pbc = update_hcrc(ps->opcode, pbc);
		}
		@@ -1029,10 +1030,10 @@ int hfi1_verbs_send_pio(struct rvt_qp qp, struct hfi1_pkt_state ps,
		else
		pbc \|= (ib_is_sc5(sc5) << PBC_DC_INFO_SHIFT);

		pbc = create_pbc(ppd, pbc, qp->srate_mbps, vl, plen);
		if (unlikely(hfi1_dbg_should_fault_tx(qp, ps->opcode)))
		pbc = hfi1_fault_tx(qp, ps->opcode, pbc);
		pbc = create_pbc(ppd, pbc, qp->srate_mbps, vl, plen);

		else
		/* Update HCRC based on packet opcode */
		pbc = update_hcrc(ps->opcode, pbc);
		}

Admin message