Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: decrement memcg jump label when limit, not usage, is changed

The logic of the current code is that whenever we destroy
a cgroup that had its limit set (set meaning different than
maximum), we should decrement the jump_label counter.
Otherwise we assume it was never incremented.

But what the code actually does is test for RES_USAGE
instead of RES_LIMIT. Usage being different than maximum
is likely to be true most of the time.

The effect of this is that the key must become negative,
and since the jump_label test says:

!!atomic_read(&key->enabled);

we'll have jump_labels still on when no one else is
using this functionality.

Signed-off-by: Glauber Costa <glommer@parallels.com>
CC: David S. Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Glauber Costa and committed by
David S. Miller
1398eee0 cf778b00

+1 -1
+1 -1
net/ipv4/tcp_memcontrol.c
··· 108 108 tcp = tcp_from_cgproto(cg_proto); 109 109 percpu_counter_destroy(&tcp->tcp_sockets_allocated); 110 110 111 - val = res_counter_read_u64(&tcp->tcp_memory_allocated, RES_USAGE); 111 + val = res_counter_read_u64(&tcp->tcp_memory_allocated, RES_LIMIT); 112 112 113 113 if (val != RESOURCE_MAX) 114 114 jump_label_dec(&memcg_socket_limit_enabled);