From: David S. Miller Date: Mon, 18 May 2015 02:45:49 +0000 (-0400) Subject: Merge branch 'tcp_mem_pressure' X-Git-Tag: firefly_0821_release~176^2~1587^2~271 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d48ef3e954cae2f237ff8e006322d2f3b672375;p=firefly-linux-kernel-4.4.55.git Merge branch 'tcp_mem_pressure' Eric Dumazet says: ==================== tcp: better handling of memory pressure When testing commit 790ba4566c1a ("tcp: set SOCK_NOSPACE under memory pressure") using edge triggered epoll applications, I found various issues under memory pressure and thousands of active sockets. This patch series is a first round to solve these issues, in send and receive paths. There are probably other fixes needed, but with this series, my tests now all succeed. v2: fix typo in "allow one skb to be received per socket under memory pressure", as spotted by Jason Baron. ==================== Acked-by: Jason Baron Signed-off-by: David S. Miller --- 5d48ef3e954cae2f237ff8e006322d2f3b672375