ixgbe: fix xdp handle calculations
Subsystems (4)
PATCH 1/1 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.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c +4 -3
@@ -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;
Signature · 1 line
2.17.1
Quoted 11 lines · Kevin Laatz
Currently, we don't add headroom to the handle in
ixgbe_zca_free,ixgbe_alloc_buffer_slow_zcandixgbe_alloc_buffer_zc. The addition of the headroom to the handle was removed in
commitd8c3061e5edd("ixgbe: modify driver for handling offsets"), which will break things when headroom isvnon-zero. This patch fixes this and usesxsk_umem_adjust_offsetto add it appropritely based on the mode being run.Fixes d8c3061e5edd ("ixgbe: modify driver for handling offsets")Reported-by Bjorn Topel <[email protected]>Signed-off-by Kevin Laatz <[email protected]>
Quoted 43 lines
--- drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c +4
-4@@ -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; --2.17.1
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Quoted 10 lines · Kevin Laatz
Currently, we don't add headroom to the handle in
ixgbe_zca_free,ixgbe_alloc_buffer_slow_zcandixgbe_alloc_buffer_zc. The addition of the headroom to the handle was removed in
commitd8c3061e5edd("ixgbe: modify driver for handling offsets"), which will break things when headroom isvnon-zero. This patch fixes this and usesxsk_umem_adjust_offsetto add it appropritely based on the mode being run.Fixes d8c3061e5edd ("ixgbe: modify driver for handling offsets")Reported-by Bjorn Topel <[email protected]>Signed-off-by Kevin Laatz <[email protected]>
Applied, thanks!