OSDN Git Service

Revert "udp: do rmem bulk free even if the rx sk queue is empty"
authorPaolo Abeni <pabeni@redhat.com>
Tue, 21 Jan 2020 15:50:49 +0000 (16:50 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Jan 2020 20:09:03 +0000 (21:09 +0100)
commitd39ca2590d10712f412add7a88e1dd467a7246f4
tree3d994d0fb3e9b9f3087bbdf3540344adb871012c
parentbda6a35505e28b70d48096c933d5949c9b6caf9a
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>
net/ipv4/udp.c