Skip to content

Commit

Permalink
net: allow > 0 order atomic page alloc in skb_page_frag_refill
Browse files Browse the repository at this point in the history
skb_page_frag_refill currently permits only order-0 page allocs
unless GFP_WAIT is used. Change skb_page_frag_refill to attempt
higher-order page allocations whether or not GFP_WAIT is used. If
memory cannot be allocated, the allocator will fall back to
successively smaller page allocs (down to order-0 page allocs).

This change brings skb_page_frag_refill in line with the existing
page allocation strategy employed by netdev_alloc_frag, which attempts
higher-order page allocations whether or not GFP_WAIT is set, falling
back to successively lower-order page allocations on failure. Part
of migration of virtio-net to per-receive queue page frag allocators.

Acked-by: Michael S. Tsirkin <[email protected]>
Acked-by: Eric Dumazet <[email protected]>
Signed-off-by: Michael Dalton <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Michael Dalton authored and davem330 committed Jan 17, 2014
1 parent 722e47d commit 097b4f1
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions net/core/sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -1836,9 +1836,7 @@ bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t prio)
put_page(pfrag->page);
}

/* We restrict high order allocations to users that can afford to wait */
order = (prio & __GFP_WAIT) ? SKB_FRAG_PAGE_ORDER : 0;

order = SKB_FRAG_PAGE_ORDER;
do {
gfp_t gfp = prio;

Expand Down

0 comments on commit 097b4f1

Please sign in to comment.