Commit d14b56f5 authored Jun 28, 2018 by Michal Hocko Committed by David S. Miller Jun 30, 2018

net: cleanup gfp mask in alloc_skb_with_frags



alloc_skb_with_frags uses __GFP_NORETRY for non-sleeping allocations
which is just a noop and a little bit confusing.

__GFP_NORETRY was added by ed98df33 ("net: use __GFP_NORETRY for
high order allocations") to prevent from the OOM killer. Yet this was
not enough because fb05e7a8 ("net: don't wait for order-3 page
allocation") didn't want an excessive reclaim for non-costly orders
so it made it completely NOWAIT while it preserved __GFP_NORETRY in
place which is now redundant.

Drop the pointless __GFP_NORETRY because this function is used as
copy&paste source for other places.

Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 70098289

net/core/skbuff.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -5276,8 +5276,7 @@ struct sk_buff *alloc_skb_with_frags(unsigned long header_len,
		if (npages >= 1 << order) {
		page = alloc_pages((gfp_mask & ~__GFP_DIRECT_RECLAIM) \|
		__GFP_COMP \|
		__GFP_NOWARN \|
		__GFP_NORETRY,
		__GFP_NOWARN,
		order);
		if (page)
		goto fill_page;