ixgbe: fix xdp handle calculations

Commit 7cbbf9f1fa23 ("ixgbe: fix xdp handle calculations") reintroduced
the addition of the umem headroom to the xdp handle in the ixgbe_zca_free,
ixgbe_alloc_buffer_slow_zc and ixgbe_alloc_buffer_zc functions. However,
the headroom is already added to the handle in the function
ixgbe_run_xdp_zc. This commit removes the latter addition and fixes the
case where the headroom is non-zero.

Fixes: 7cbbf9f1fa23 ("ixgbe: fix xdp handle calculations")
Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
index ad802a8909e0d4423785592ba3e87cc92191b466..fd45d12b5a984d0de4b73cbea83fd63538f8942e 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
@@ -145,15 +145,15 @@ static int ixgbe_run_xdp_zc(struct ixgbe_adapter *adapter,
 {
        struct xdp_umem *umem = rx_ring->xsk_umem;
        int err, result = IXGBE_XDP_PASS;
-       u64 offset = umem->headroom;
        struct bpf_prog *xdp_prog;
        struct xdp_frame *xdpf;
+       u64 offset;
        u32 act;
 
        rcu_read_lock();
        xdp_prog = READ_ONCE(rx_ring->xdp_prog);
        act = bpf_prog_run_xdp(xdp_prog, xdp);
-       offset += xdp->data - xdp->data_hard_start;
+       offset = xdp->data - xdp->data_hard_start;
 
        xdp->handle = xsk_umem_adjust_offset(umem, xdp->handle, offset);