rxe: correctly calculate iCRC for unaligned payloads (2030abdd) · Commits · 戴 / test

If RoCE PDUs being sent or received contain pad bytes, then the iCRC is miscalculated, resulting in PDUs being emitted by RXE with an incorrect iCRC, as well as ingress PDUs being dropped due to erroneously detecting a bad iCRC in the PDU. The fix is to include the pad bytes, if any, in iCRC computations. Note: This bug has caused broken on-the-wire compatibility with actual hardware RoCE devices since the soft-RoCE driver was first put into the mainstream kernel. Fixing it will create an incompatibility with the original soft-RoCE devices, but is necessary to be compatible with real hardware devices. Fixes: ("Soft RoCE driver") Signed-off-by:

Steve Wise <larrystevenwise@gmail.com> Link: https://lore.kernel.org/r/20191203020319.15036-2-larrystevenwise@gmail.com Signed-off-by:

Doug Ledford <dledford@redhat.com>

drivers/infiniband/sw/rxe/rxe_recv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -389,7 +389,7 @@ void rxe_rcv(struct sk_buff *skb)

		calc_icrc = rxe_icrc_hdr(pkt, skb);
		calc_icrc = rxe_crc32(rxe, calc_icrc, (u8 *)payload_addr(pkt),
		payload_size(pkt));
		payload_size(pkt) + bth_pad(pkt));
		calc_icrc = (__force u32)cpu_to_be32(~calc_icrc);
		if (unlikely(calc_icrc != pack_icrc)) {
		if (skb->protocol == htons(ETH_P_IPV6))

drivers/infiniband/sw/rxe/rxe_req.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -500,6 +500,12 @@ static int fill_packet(struct rxe_qp qp, struct rxe_send_wqe wqe,
		if (err)
		return err;
		}
		if (bth_pad(pkt)) {
		u8 *pad = payload_addr(pkt) + paylen;

		memset(pad, 0, bth_pad(pkt));
		crc = rxe_crc32(rxe, crc, pad, bth_pad(pkt));
		}
		}
		p = payload_addr(pkt) + paylen + bth_pad(pkt);

drivers/infiniband/sw/rxe/rxe_resp.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -732,6 +732,13 @@ static enum resp_states read_reply(struct rxe_qp *qp,
		if (err)
		pr_err("Failed copying memory\n");

		if (bth_pad(&ack_pkt)) {
		struct rxe_dev *rxe = to_rdev(qp->ibqp.device);
		u8 *pad = payload_addr(&ack_pkt) + payload;

		memset(pad, 0, bth_pad(&ack_pkt));
		icrc = rxe_crc32(rxe, icrc, pad, bth_pad(&ack_pkt));
		}
		p = payload_addr(&ack_pkt) + payload + bth_pad(&ack_pkt);
		*p = ~icrc;

Admin message