[095/212] memcg: enable accounting for pids in nested pid namespaces

Commit Message

Andrew Morton Sept. 2, 2021, 9:54 p.m. UTC

From: Vasily Averin <[e-mail]>
Subject: memcg: enable accounting for pids in nested pid namespaces

Commit 5d097056c9a0 ("kmemcg: account certain kmem allocations to memcg")
enabled memcg accounting for pids allocated from init_pid_ns.pid_cachep,
but forgot to adjust the setting for nested pid namespaces.  As a result,
pid memory is not accounted exactly where it is really needed, inside
memcg-limited containers with their own pid namespaces.

Pid was one the first kernel objects enabled for memcg accounting. 
init_pid_ns.pid_cachep marked by SLAB_ACCOUNT and we can expect that any
new pids in the system are memcg-accounted.

Though recently I've noticed that it is wrong.  nested pid namespaces
creates own slab caches for pid objects, nested pids have increased size
because contain id both for all parent and for own pid namespaces.  The
problem is that these slab caches are _NOT_ marked by SLAB_ACCOUNT, as a
result any pids allocated in nested pid namespaces are not
memcg-accounted.

Pid struct in nested pid namespace consumes up to 500 bytes memory, 100000
such objects gives us up to ~50Mb unaccounted memory, this allow container
to exceed assigned memcg limits.

Link: https://lkml.kernel.org/r/[e-mail]
Fixes: 5d097056c9a0 ("kmemcg: account certain kmem allocations to memcg")
Cc: [e-mail]
Signed-off-by: Vasily Averin <[e-mail]>
Reviewed-by: Michal Koutný <[e-mail]>
Reviewed-by: Shakeel Butt <[e-mail]>
Acked-by: Christian Brauner <[e-mail]>
Acked-by: Roman Gushchin <[e-mail]>
Cc: Michal Hocko <[e-mail]>
Cc: Johannes Weiner <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 kernel/pid_namespace.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch

--- a/kernel/pid_namespace.c~memcg-enable-accounting-for-pids-in-nested-pid-namespaces
+++ a/kernel/pid_namespace.c
@@ -51,7 +51,8 @@  static struct kmem_cache *create_pid_cac
 	mutex_lock(&pid_caches_mutex);
 	/* Name collision forces to do allocation under mutex. */
 	if (!*pkc)
-		*pkc = kmem_cache_create(name, len, 0, SLAB_HWCACHE_ALIGN, 0);
+		*pkc = kmem_cache_create(name, len, 0,
+					 SLAB_HWCACHE_ALIGN | SLAB_ACCOUNT, 0);
 	mutex_unlock(&pid_caches_mutex);
 	/* current can fail, but someone else can succeed. */
 	return READ_ONCE(*pkc);