sock: Fix misuse of sk_under_memory_pressure()
authorAbel Wu <wuyun.abel@bytedance.com>
Wed, 16 Aug 2023 09:12:22 +0000 (17:12 +0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 17 Aug 2023 18:34:36 +0000 (11:34 -0700)
commit2d0c88e84e483982067a82073f6125490ddf3614
tree67c0cf39835c1aa1593cd7f1febbe744d6752f09
parent54c9016eb8eda55952a195b071359cd13f50ed9b
sock: Fix misuse of sk_under_memory_pressure()

The status of global socket memory pressure is updated when:

  a) __sk_mem_raise_allocated():

enter: sk_memory_allocated(sk) >  sysctl_mem[1]
leave: sk_memory_allocated(sk) <= sysctl_mem[0]

  b) __sk_mem_reduce_allocated():

leave: sk_under_memory_pressure(sk) &&
sk_memory_allocated(sk) < sysctl_mem[0]

So the conditions of leaving global pressure are inconstant, which
may lead to the situation that one pressured net-memcg prevents the
global pressure from being cleared when there is indeed no global
pressure, thus the global constrains are still in effect unexpectedly
on the other sockets.

This patch fixes this by ignoring the net-memcg's pressure when
deciding whether should leave global memory pressure.

Fixes: e1aab161e013 ("socket: initial cgroup code.")
Signed-off-by: Abel Wu <wuyun.abel@bytedance.com>
Acked-by: Shakeel Butt <shakeelb@google.com>
Link: https://lore.kernel.org/r/20230816091226.1542-1-wuyun.abel@bytedance.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
include/net/sock.h
net/core/sock.c