commit 9a3d8b6046c5361e726e64148986fbb84ebc7540
author Eric Dumazet <edumazet@google.com> Wed Aug 15 18:00:33 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 15 18:00:33 2018 -0700
tree 48769f8c41b7df6839656fc5a99671d34eec4918
parent 5e7ef055bf957d20d218a610602a3dffdeef2861
parent d18ec55af9d18203b3648b51a244293f3843117c

tcp: avoid collapses in tcp_prune_queue() if possible
am: d18ec55af9

Change-Id: I1f2f48c79d95567cd79ff6b79395beacf2466f87

net/ipv4/tcp_input.c

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index be22b7d..62df632 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4878,6 +4878,9 @@
 	else if (tcp_under_memory_pressure(sk))
 		tp->rcv_ssthresh = min(tp->rcv_ssthresh, 4U * tp->advmss);
 
+	if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf)
+		return 0;
+
 	tcp_collapse_ofo_queue(sk);
 	if (!skb_queue_empty(&sk->sk_receive_queue))
 		tcp_collapse(sk, &sk->sk_receive_queue,