[083/181] mm/memcg: simplify mem_cgroup_get_max()

Commit Message

Andrew Morton Oct. 13, 2020, 11:52 p.m. UTC

From: Waiman Long <[e-mail]>
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.

[[e-mail]: v4]
  Link: https://lkml.kernel.org/r/[e-mail]
Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Waiman Long <[e-mail]>
Acked-by: Michal Hocko <[e-mail]>
Reviewed-by: Shakeel Butt <[e-mail]>
Cc: Chris Down <[e-mail]>
Cc: Johannes Weiner <[e-mail]>
Cc: Roman Gushchin <[e-mail]>
Cc: Tejun Heo <[e-mail]>
Cc: Vladimir Davydov <[e-mail]>
Cc: Yafang Shao <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 mm/memcontrol.c |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

Patch

--- a/mm/memcontrol.c~mm-memcg-simplify-mem_cgroup_get_max
+++ a/mm/memcontrol.c
@@ -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;
 }