Merge branch 'tcp_mem_pressure'
authorDavid S. Miller <davem@davemloft.net>
Mon, 18 May 2015 02:45:49 +0000 (22:45 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 18 May 2015 02:46:26 +0000 (22:46 -0400)
commit5d48ef3e954cae2f237ff8e006322d2f3b672375
tree13db6cdf2a7ff4f841f3ec44b5700a8e9af1b361
parent4633c9e07b3b7d7fc262a5f59ff635c1f702af6f
parentb66e91ccbc34ebd5a2f90f9e1bc1597e2924a500
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 <jbaron@akamai.com>
Signed-off-by: David S. Miller <davem@davemloft.net>