mm-memcg-simplify-mem_cgroup_get_max.patch removed from -mm tree
The patch titled
Subject: mm/memcg: simplify mem_cgroup_get_max()
has been removed from the -mm tree. Its filename was
mm-memcg-simplify-mem_cgroup_get_max.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Waiman Long <[email protected]>
Subject: mm/memcg: simplify mem_cgroup_get_max()
mem_cgroup_get_max() used to get memory+swap max from both the v1 memsw and v2 memory+swap page counters & return the maximum of these 2 values. This is redundant and it is more efficient to just get either the v1 or the v2 values depending on which one is currently in use.
[[email protected]: v4]
Signed-off-by Waiman Long <[email protected]>
Acked-by Michal Hocko <[email protected]>
Reviewed-by Shakeel Butt <[email protected]>
Cc Chris Down <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc Tejun Heo <[email protected]>
Cc Vladimir Davydov <[email protected]>
Cc Yafang Shao <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/memcontrol.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcg-simplify-mem_cgroup_get_max +11 -9
@@ -1633,17 +1633,19 @@ void mem_cgroup_print_oom_meminfo(struct*/ unsigned long mem_cgroup_get_max (struct mem_cgroup *memcg) { -unsigned long max; +unsigned long max =READ_ONCE (memcg->memory.max); - max =READ_ONCE (memcg->memory.max); -if (mem_cgroup_swappiness (memcg)) { -unsigned long memsw_max; -unsigned long swap_max; +if (cgroup_subsys_on_dfl (memory_cgrp_subsys)) { +if (mem_cgroup_swappiness (memcg)) + max +=min (READ_ONCE (memcg->swap.max), + (unsigned long )total_swap_pages); + }else {/* v1 */ +if (mem_cgroup_swappiness (memcg)) { +/* Calculate swap excess capacity from memsw limit */ +unsigned long swap =READ_ONCE (memcg->memsw.max) - max; - memsw_max = memcg->memsw.max; - swap_max =READ_ONCE (memcg->swap.max); - swap_max =min (swap_max, (unsigned long )total_swap_pages); - max =min (max + swap_max, memsw_max); + max +=min (swap, (unsigned long )total_swap_pages); + } }return max; }
_
Patches currently in -mm which might be from [email protected] are