Commit d39ca259 authored Jan 21, 2020 by Paolo Abeni Committed by David S. Miller Jan 22, 2020

Revert "udp: do rmem bulk free even if the rx sk queue is empty"



This reverts commit 0d4a6608.

Williem reported that after commit 0d4a6608 ("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: 0d4a6608 ("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>

parent bda6a355

net/ipv4/udp.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message