IB/rxe: Avoid ICRC errors by copying into the skb first

The current process is to first calculate the CRC and then copy the client
data into the packet. This leaves a window in which the packet contents and
CRC can get out of sync, if the client changes the data after the CRC is
calculated but before the data is copied.

By copying the data into the packet and then calculating the CRC directly
from the packet contents we eliminate the window.

This can be seen with qperf's ud_bi_bw test. This seems like very
strange/reckless client behavior, but whether the client has mangled its
data or not RXE should be able to transfer it reliably.

Fixes: 8700e3e7c485 ("Soft RoCE driver")
Signed-off-by: Andrew Boyer <andrew.boyer@dell.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
index e37cc89987e12c1d99ed60fe1a8464e92f70b3cd..5c2684bf430f85088fdae94918586dfa608d2e40 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@ -367,11 +367,11 @@ int rxe_mem_copy(struct rxe_mem *mem, u64 iova, void *addr, int length,
                dest = (dir == to_mem_obj) ?
                        ((void *)(uintptr_t)iova) : addr;
 
+               memcpy(dest, src, length);
+
                if (crcp)
                        *crcp = rxe_crc32(to_rdev(mem->pd->ibpd.device),
-                                       *crcp, src, length);
-
-               memcpy(dest, src, length);
+                                       *crcp, dest, length);
 
                return 0;
        }
@@ -401,11 +401,11 @@ int rxe_mem_copy(struct rxe_mem *mem, u64 iova, void *addr, int length,
                if (bytes > length)
                        bytes = length;
 
+               memcpy(dest, src, bytes);
+
                if (crcp)
                        crc = rxe_crc32(to_rdev(mem->pd->ibpd.device),
-                                       crc, src, bytes);
-
-               memcpy(dest, src, bytes);
+                                       crc, dest, bytes);
 
                length  -= bytes;
                addr    += bytes;