diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2020-01-21 16:50:49 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-22 21:09:03 +0100 |
| commit | d39ca2590d10712f412add7a88e1dd467a7246f4 (patch) | |
| tree | 3d994d0fb3e9b9f3087bbdf3540344adb871012c /net/ipv4/udp.c | |
| parent | net: Add Jakub to MAINTAINERS for networking general. (diff) | |
| download | linux-dev-d39ca2590d10712f412add7a88e1dd467a7246f4.tar.xz linux-dev-d39ca2590d10712f412add7a88e1dd467a7246f4.zip | |
Revert "udp: do rmem bulk free even if the rx sk queue is empty"
This reverts commit 0d4a6608f68c7532dcbfec2ea1150c9761767d03.
Williem reported that after commit 0d4a6608f68c ("udp: do rmem bulk
free even if the rx sk queue is empty") the memory allocated by
an almost idle system with many UDP sockets can grow a lot.
For stable kernel keep the solution as simple as possible and revert
the offending commit.
Reported-by: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Diagnosed-by: Eric Dumazet <eric.dumazet@gmail.com>
Fixes: 0d4a6608f68c ("udp: do rmem bulk free even if the rx sk queue is empty")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 93a355b6b092..030d43c7c957 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1368,7 +1368,8 @@ static void udp_rmem_release(struct sock *sk, int size, int partial, if (likely(partial)) { up->forward_deficit += size; size = up->forward_deficit; - if (size < (sk->sk_rcvbuf >> 2)) + if (size < (sk->sk_rcvbuf >> 2) && + !skb_queue_empty(&up->reader_queue)) return; } else { size += up->forward_deficit; |