samples/bpf: fix xdpsock l2fwd tx for unaligned mode
authorCiara Loftus <ciara.loftus@intel.com>
Fri, 13 Sep 2019 10:39:48 +0000 (10:39 +0000)
committerDaniel Borkmann <daniel@iogearbox.net>
Mon, 16 Sep 2019 07:35:10 +0000 (09:35 +0200)
Preserve the offset of the address of the received descriptor, and include
it in the address set for the tx descriptor, so the kernel can correctly
locate the start of the packet data.

Fixes: 03895e63ff97 ("samples/bpf: add buffer recycling for unaligned chunks to xdpsock")
Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
samples/bpf/xdpsock_user.c

index 102eace..df011ac 100644 (file)
@@ -685,7 +685,7 @@ static void l2fwd(struct xsk_socket_info *xsk, struct pollfd *fds)
        for (i = 0; i < rcvd; i++) {
                u64 addr = xsk_ring_cons__rx_desc(&xsk->rx, idx_rx)->addr;
                u32 len = xsk_ring_cons__rx_desc(&xsk->rx, idx_rx++)->len;
-               u64 orig = xsk_umem__extract_addr(addr);
+               u64 orig = addr;
 
                addr = xsk_umem__add_offset_to_addr(addr);
                char *pkt = xsk_umem__get_data(xsk->umem->buffer, addr);