Commit 8c8d4d45 authored Oct 27, 2016 by Aristeu Rozanski Committed by Linus Torvalds Oct 27, 2016

ipc: account for kmem usage on mqueue and msg

When kmem accounting switched from account by default to only account if
flagged by __GFP_ACCOUNT, IPC mqueue and messages was left out.

The production use case at hand is that mqueues should be customizable
via sysctls in Docker containers in a Kubernetes cluster.  This can only
be safely allowed to the users of the cluster (without the risk that
they can cause resource shortage on a node, influencing other users'
containers) if all resources they control are bounded, i.e.  accounted
for.

Link: http://lkml.kernel.org/r/1476806075-1210-1-git-send-email-arozansk@redhat.com


Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
Reported-by: Stefan Schimanski <sttts@redhat.com>
Acked-by: Davidlohr Bueso <dave@stgolabs.net>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Stefan Schimanski <sttts@redhat.com>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 07a63c41

ipc/msgutil.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ static struct msg_msg *alloc_msg(size_t len)
		size_t alen;

		alen = min(len, DATALEN_MSG);
		msg = kmalloc(sizeof(*msg) + alen, GFP_KERNEL);
		msg = kmalloc(sizeof(*msg) + alen, GFP_KERNEL_ACCOUNT);
		if (msg == NULL)
		return NULL;

		@@ -65,7 +65,7 @@ static struct msg_msg *alloc_msg(size_t len)
		while (len > 0) {
		struct msg_msgseg *seg;
		alen = min(len, DATALEN_SEG);
		seg = kmalloc(sizeof(*seg) + alen, GFP_KERNEL);
		seg = kmalloc(sizeof(*seg) + alen, GFP_KERNEL_ACCOUNT);
		if (seg == NULL)
		goto out_err;
		*pseg = seg;

Admin message