diff options
| author | Michael Dalton <mwdalton@google.com> | 2014-01-16 22:23:25 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-16 23:46:06 -0800 |
| commit | 097b4f19e508015ca65a28ea4876740d35a19eea (patch) | |
| tree | 4508da9976ccd11c0ed9f7805c7a86eea624a680 /net/core/sock.c | |
| parent | 722e47d7929b40f58c2ad609429c7293e41ca5a8 (diff) | |
| download | linux-stable-097b4f19e508015ca65a28ea4876740d35a19eea.tar.gz linux-stable-097b4f19e508015ca65a28ea4876740d35a19eea.tar.bz2 linux-stable-097b4f19e508015ca65a28ea4876740d35a19eea.zip | |
net: allow > 0 order atomic page alloc in skb_page_frag_refill
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 <mst@redhat.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Michael Dalton <mwdalton@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 85ad6f0d3898..b3f7ee3008a0 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -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; |