Commit 1fbdaa13 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Tony Nguyen
Browse files

ixgbe: pass bi->xdp to ixgbe_construct_skb_zc() directly 



To not dereference bi->xdp each time in ixgbe_construct_skb_zc(),
pass bi->xdp as an argument instead of bi. We can also call
xsk_buff_free() outside of the function as well as assign bi->xdp
to NULL, which seems to make it closer to its name.

Suggested-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: default avatarAlexander Lobakin <alexandr.lobakin@intel.com>
Tested-by: default avatarSandeep Penigalapati <sandeep.penigalapati@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent f9e61d36

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

+10 −9
Original line number Diff line number Diff line
@@ -207,26 +207,24 @@ bool ixgbe_alloc_rx_buffers_zc(struct ixgbe_ring *rx_ring, u16 count) 
}



static struct sk_buff *ixgbe_construct_skb_zc(struct ixgbe_ring *rx_ring,

					      struct ixgbe_rx_buffer *bi)

					      const struct xdp_buff *xdp)

{

	unsigned int metasize = bi->xdp->data - bi->xdp->data_meta;

	unsigned int datasize = bi->xdp->data_end - bi->xdp->data;

	unsigned int metasize = xdp->data - xdp->data_meta;

	unsigned int datasize = xdp->data_end - xdp->data;

	struct sk_buff *skb;



	/* allocate a skb to store the frags */

	skb = __napi_alloc_skb(&rx_ring->q_vector->napi,

			       bi->xdp->data_end - bi->xdp->data_hard_start,

			       xdp->data_end - xdp->data_hard_start,

			       GFP_ATOMIC | __GFP_NOWARN);

	if (unlikely(!skb))

		return NULL;



	skb_reserve(skb, bi->xdp->data - bi->xdp->data_hard_start);

	memcpy(__skb_put(skb, datasize), bi->xdp->data, datasize);

	skb_reserve(skb, xdp->data - xdp->data_hard_start);

	memcpy(__skb_put(skb, datasize), xdp->data, datasize);

	if (metasize)

		skb_metadata_set(skb, metasize);



	xsk_buff_free(bi->xdp);

	bi->xdp = NULL;

	return skb;

}
@@ -317,12 +315,15 @@ int ixgbe_clean_rx_irq_zc(struct ixgbe_q_vector *q_vector, 
		}



		/* XDP_PASS path */

		skb = ixgbe_construct_skb_zc(rx_ring, bi);

		skb = ixgbe_construct_skb_zc(rx_ring, bi->xdp);

		if (!skb) {

			rx_ring->rx_stats.alloc_rx_buff_failed++;

			break;

		}



		xsk_buff_free(bi->xdp);

		bi->xdp = NULL;



		cleaned_count++;

		ixgbe_inc_ntc(rx_ring);