diff options
| author |   Michal Hocko <mhocko@suse.com> | 2018-06-28 17:53:06 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-06-30 20:18:49 +0900 |
| commit | d14b56f508ad70eca3e659545aab3c45200f258c (patch) | |
| tree | 710920f42f63c6149ffa9a0bf28627d3f9babd0d /net/core/skbuff.c | |
| parent | Merge branch 'DPAA-fixes' (diff) | |
| download | linux-dev-d14b56f508ad70eca3e659545aab3c45200f258c.tar.xz linux-dev-d14b56f508ad70eca3e659545aab3c45200f258c.zip | |
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 ed98df3361f0 ("net: use __GFP_NORETRY for
high order allocations") to prevent from the OOM killer. Yet this was
not enough because fb05e7a89f50 ("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>
Diffstat (limited to '')
| -rw-r--r-- | net/core/skbuff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index c642304f178c..eba8dae22c25 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -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; |