Commit a8d47b4b authored by Ross Lagerwall's avatar Ross Lagerwall Committed by Greg Kroah-Hartman

netlink: Allow direct reclaim for fallback allocation

The backport of d35c99ff ("netlink: do not enter direct reclaim from
netlink_dump()") to the 4.4 branch (first in 4.4.32) mistakenly removed
direct claim from the initial large allocation _and_ the fallback
allocation which means that allocations can spuriously fail.
Fix the issue by adding back the direct reclaim flag to the fallback
allocation.

Fixes: 6d123f1d ("netlink: do not enter direct reclaim from netlink_dump()")
Signed-off-by: default avatarRoss Lagerwall <ross.lagerwall@citrix.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 35c9bfa5
...@@ -2107,7 +2107,7 @@ static int netlink_dump(struct sock *sk) ...@@ -2107,7 +2107,7 @@ static int netlink_dump(struct sock *sk)
if (!skb) { if (!skb) {
alloc_size = alloc_min_size; alloc_size = alloc_min_size;
skb = netlink_alloc_skb(sk, alloc_size, nlk->portid, skb = netlink_alloc_skb(sk, alloc_size, nlk->portid,
(GFP_KERNEL & ~__GFP_DIRECT_RECLAIM)); GFP_KERNEL);
} }
if (!skb) if (!skb)
goto errout_skb; goto errout_skb;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment