ixgbe: simplify Rx buffer recycle (b35a2d3e) · Commits · 戴 / test

Currently, the dma, addr and handle are modified when we reuse Rx buffers in zero-copy mode. However, this is not required as the inputs to the function are copies, not the original values themselves. As we use the copies within the function, we can use the original 'obi' values directly without having to mask and add the headroom. Signed-off-by:

Kevin Laatz <kevin.laatz@intel.com> Acked-by:

Jonathan Lemon <jonathan.lemon@gmail.com> Signed-off-by:

Daniel Borkmann <daniel@iogearbox.net>

drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c

+3 −10

Original line number	Diff line number	Diff line
		@@ -201,8 +201,6 @@ ixgbe_rx_buffer ixgbe_get_rx_buffer_zc(struct ixgbe_ring rx_ring,
		static void ixgbe_reuse_rx_buffer_zc(struct ixgbe_ring *rx_ring,
		struct ixgbe_rx_buffer *obi)
		{
		unsigned long mask = (unsigned long)rx_ring->xsk_umem->chunk_mask;
		u64 hr = rx_ring->xsk_umem->headroom + XDP_PACKET_HEADROOM;
		u16 nta = rx_ring->next_to_alloc;
		struct ixgbe_rx_buffer *nbi;

		@@ -212,14 +210,9 @@ static void ixgbe_reuse_rx_buffer_zc(struct ixgbe_ring *rx_ring,
		rx_ring->next_to_alloc = (nta < rx_ring->count) ? nta : 0;

		/* transfer page from old buffer to new buffer */
		nbi->dma = obi->dma & mask;
		nbi->dma += hr;

		nbi->addr = (void *)((unsigned long)obi->addr & mask);
		nbi->addr += hr;

		nbi->handle = obi->handle & mask;
		nbi->handle += rx_ring->xsk_umem->headroom;
		nbi->dma = obi->dma;
		nbi->addr = obi->addr;
		nbi->handle = obi->handle;

		obi->addr = NULL;
		obi->skb = NULL;

Admin message