The patch titled
Subject: mm-memcg-simplify-mem_cgroup_get_max-v4
has been removed from the -mm tree. Its filename was
mm-memcg-simplify-mem_cgroup_get_max-v4.patch
This patch was dropped because it was folded into mm-memcg-simplify-mem_cgroup_get_max.patch
------------------------------------------------------
From: Waiman Long <longman@xxxxxxxxxx>
Subject: mm-memcg-simplify-mem_cgroup_get_max-v4
Link: https://lkml.kernel.org/r/20200914150928.7841-1-longman@xxxxxxxxxx
Signed-off-by: Waiman Long <longman@xxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Reviewed-by: Shakeel Butt <shakeelb@xxxxxxxxxx>
Cc: Chris Down <chris@xxxxxxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Roman Gushchin <guro@xxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
Cc: Yafang Shao <laoar.shao@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/mm/memcontrol.c~mm-memcg-simplify-mem_cgroup_get_max-v4
+++ a/mm/memcontrol.c
@@ -1640,8 +1640,12 @@ unsigned long mem_cgroup_get_max(struct
max += min(READ_ONCE(memcg->swap.max),
(unsigned long)total_swap_pages);
} else { /* v1 */
- if (mem_cgroup_swappiness(memcg))
- max = memcg->memsw.max;
+ if (mem_cgroup_swappiness(memcg)) {
+ /* Calculate swap excess capacity from memsw limit */
+ unsigned long swap = READ_ONCE(memcg->memsw.max) - max;
+
+ max += min(swap, (unsigned long)total_swap_pages);
+ }
}
return max;
}
_
Patches currently in -mm which might be from longman@xxxxxxxxxx are
mm-memcg-clean-up-obsolete-enum-charge_type.patch
mm-memcg-simplify-mem_cgroup_get_max.patch
mm-memcg-unify-swap-and-memsw-page-counters.patch
