Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 686739f6 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

memcg: avoid vmpressure oops when memcg disabled 



A CONFIG_MEMCG=y kernel booted with "cgroup_disable=memory" crashes on a
NULL memcg (but non-NULL root_mem_cgroup) when vmpressure kicks in.
Here's the patch I use to avoid that, but you might prefer a test on
mem_cgroup_disabled() somewhere.

Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Vladimir Davydov <vdavydov@virtuozzo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ef12947c

mm/vmpressure.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, bool tree, 
		enum vmpressure_levels level;



		/* For now, no users for root-level efficiency */

		if (memcg == root_mem_cgroup)

		if (!memcg || memcg == root_mem_cgroup)

			return;



		spin_lock(&vmpr->sr_lock);