]> git.baikalelectronics.ru Git - kernel.git/commit
net: tcp_memcontrol: properly detect ancestor socket pressure
authorJohannes Weiner <hannes@cmpxchg.org>
Thu, 14 Jan 2016 23:20:59 +0000 (15:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jan 2016 00:00:49 +0000 (16:00 -0800)
commitdcd89944106cf9c5f0abf1580ad26b2417247686
treebdaa3a9f9d0535c07d1dfd8f055cca8d63d61b2d
parentc096fc2699fb5c8cb59cd07e3743169a0e994161
net: tcp_memcontrol: properly detect ancestor socket pressure

When charging socket memory, the code currently checks only the local
page counter for excess to determine whether the memcg is under socket
pressure.  But even if the local counter is fine, one of the ancestors
could have breached its limit, which should also force this child to
enter socket pressure.  This currently doesn't happen.

Fix this by using page_counter_try_charge() first.  If that fails, it
means that either the local counter or one of the ancestors are in
excess of their limit, and the child should enter socket pressure.

Fixes: 7812d2571b5f ("mm: memcontrol: lockless page counters")
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: David S. Miller <davem@davemloft.net>
Reviewed-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/net/sock.h