The patch titled
Subject: mm, memcg: handle cgroup_disable=memory when getting memcg protection
has been removed from the -mm tree. Its filename was
mm-proportional-memorylowmin-reclaim-fix.patch
This patch was dropped because it was folded into mm-proportional-memorylowmin-reclaim.patch
------------------------------------------------------
From: Chris Down <chris@xxxxxxxxxxxxxx>
Subject: mm, memcg: Handle cgroup_disable=memory when getting memcg protection
memcg is NULL if we have CONFIG_MEMCG set, but cgroup_disable=memory on
the kernel command line.
Link: http://lkml.kernel.org/r/20190201045711.GA18302@xxxxxxxxxxxxxx
Fixes: 8a907cdf0177ab40 ("mm, memcg: proportional memory.{low,min} reclaim")
Reported-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Chris Down <chris@xxxxxxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memcontrol.h | 3 +++
1 file changed, 3 insertions(+)
--- a/include/linux/memcontrol.h~mm-proportional-memorylowmin-reclaim-fix
+++ a/include/linux/memcontrol.h
@@ -335,6 +335,9 @@ static inline bool mem_cgroup_disabled(v
static inline unsigned long mem_cgroup_protection(struct mem_cgroup *memcg)
{
+ if (mem_cgroup_disabled())
+ return 0;
+
return max(READ_ONCE(memcg->memory.emin), READ_ONCE(memcg->memory.elow));
}
_
Patches currently in -mm which might be from chris@xxxxxxxxxxxxxx are
mm-create-mem_cgroup_from_seq.patch
mm-extract-memcg-maxable-seq_file-logic-to-seq_show_memcg_tunable.patch
mm-proportional-memorylowmin-reclaim.patch
mm-memcontrol-expose-thp-events-on-a-per-memcg-basis.patch
mm-memcontrol-expose-thp-events-on-a-per-memcg-basis-fix-2.patch
mm-make-memoryemin-the-baseline-for-utilisation-determination.patch
mm-rename-ambiguously-named-memorystat-counters-and-functions.patch
mm-consider-subtrees-in-memoryevents.patch
