ixgbe: fix xdp handle calculations

Currently, we don't add headroom to the handle in ixgbe_zca_free,
ixgbe_alloc_buffer_slow_zc and ixgbe_alloc_buffer_zc. The addition of the
headroom to the handle was removed in
commit d8c3061e5edd ("ixgbe: modify driver for handling offsets"), which
will break things when headroom isvnon-zero. This patch fixes this and uses
xsk_umem_adjust_offset to add it appropritely based on the mode being run.

Fixes: d8c3061e5edd ("ixgbe: modify driver for handling offsets")
Reported-by: Bjorn Topel <bjorn.topel@intel.com>
Signed-off-by: Kevin Laatz <kevin.laatz@intel.com>
Acked-by: Björn Töpel <bjorn.topel@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 17061c799f72b168e529cc5352b0222834e89d1a..ad802a8909e0d4423785592ba3e87cc92191b466 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c
@@ -248,7 +248,8 @@ void ixgbe_zca_free(struct zero_copy_allocator *alloc, unsigned long handle)
        bi->addr = xdp_umem_get_data(rx_ring->xsk_umem, handle);
        bi->addr += hr;
 
-       bi->handle = (u64)handle;
+       bi->handle = xsk_umem_adjust_offset(rx_ring->xsk_umem, (u64)handle,
+                                           rx_ring->xsk_umem->headroom);
 }
 
 static bool ixgbe_alloc_buffer_zc(struct ixgbe_ring *rx_ring,
@@ -274,7 +275,7 @@ static bool ixgbe_alloc_buffer_zc(struct ixgbe_ring *rx_ring,
        bi->addr = xdp_umem_get_data(umem, handle);
        bi->addr += hr;
 
-       bi->handle = handle;
+       bi->handle = xsk_umem_adjust_offset(umem, handle, umem->headroom);
 
        xsk_umem_discard_addr(umem);
        return true;
@@ -301,7 +302,7 @@ static bool ixgbe_alloc_buffer_slow_zc(struct ixgbe_ring *rx_ring,
        bi->addr = xdp_umem_get_data(umem, handle);
        bi->addr += hr;
 
-       bi->handle = handle;
+       bi->handle = xsk_umem_adjust_offset(umem, handle, umem->headroom);
 
        xsk_umem_discard_addr_rq(umem);
        return true;