Commit cfb8ec65 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by David S. Miller
Browse files

skbuff: allow to use NAPI cache from __napi_alloc_skb() 



{,__}napi_alloc_skb() is mostly used either for optional non-linear
receive methods (usually controlled via Ethtool private flags and off
by default) and/or for Rx copybreaks.
Use __napi_build_skb() here for obtaining skbuff_heads from NAPI cache
instead of inplace allocations. This includes both kmalloc and page
frag paths.

Signed-off-by: default avatarAlexander Lobakin <alobakin@pm.me>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d13612b5

net/core/skbuff.c

+3 −2
Original line number Diff line number Diff line
@@ -562,7 +562,8 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len, 
	if (len <= SKB_WITH_OVERHEAD(1024) ||

	    len > SKB_WITH_OVERHEAD(PAGE_SIZE) ||

	    (gfp_mask & (__GFP_DIRECT_RECLAIM | GFP_DMA))) {

		skb = __alloc_skb(len, gfp_mask, SKB_ALLOC_RX, NUMA_NO_NODE);

		skb = __alloc_skb(len, gfp_mask, SKB_ALLOC_RX | SKB_ALLOC_NAPI,

				  NUMA_NO_NODE);

		if (!skb)

			goto skb_fail;

		goto skb_success;
@@ -579,7 +580,7 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len, 
	if (unlikely(!data))

		return NULL;



	skb = __build_skb(data, len);

	skb = __napi_build_skb(data, len);

	if (unlikely(!skb)) {

		skb_free_frag(data);

		return NULL;