Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a0e270c authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Greg Kroah-Hartman
Browse files

i40e: don't reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb 



[ Upstream commit bc97f9c6f988b31b728eb47a94ca825401dbeffe ]

{__,}napi_alloc_skb() allocates and reserves additional NET_SKB_PAD
+ NET_IP_ALIGN for any skb.
OTOH, i40e_construct_skb_zc() currently allocates and reserves
additional `xdp->data - xdp->data_hard_start`, which is
XDP_PACKET_HEADROOM for XSK frames.
There's no need for that at all as the frame is post-XDP and will
go only to the networking stack core.
Pass the size of the actual data only to __napi_alloc_skb() and
don't reserve anything. This will give enough headroom for stack
processing.

Fixes: 0a714186 ("i40e: add AF_XDP zero-copy Rx support")
Signed-off-by: default avatarAlexander Lobakin <alexandr.lobakin@intel.com>
Reviewed-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Tested-by: default avatarKiran Bhandare <kiranx.bhandare@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5607badb

drivers/net/ethernet/intel/i40e/i40e_xsk.c

+1 −3
Original line number Diff line number Diff line
@@ -505,13 +505,11 @@ static struct sk_buff *i40e_construct_skb_zc(struct i40e_ring *rx_ring, 
	struct sk_buff *skb;



	/* allocate a skb to store the frags */

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

			       xdp->data_end - xdp->data_hard_start,

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

			       GFP_ATOMIC | __GFP_NOWARN);

	if (unlikely(!skb))

		return NULL;



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

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

	if (metasize)

		skb_metadata_set(skb, metasize);