commit 109097ed1cce811be730a00dd9605c514c217c8c
author zhaoyang.huang <zhaoyang.huang@unisoc.com> Mon May 23 08:53:48 2022 +0800
committer Carlos Llamas <cmllamas@google.com> Tue Jul 19 12:47:28 2022 +0000
tree d7b4ab7e70bf537df90543d1dbdc76318c43aea0
parent 228e9c813480027c1149d03682d7965c7507e466

ANDROID: Add vendor hook for MemcgV2 optimization

The associated vendor hooks/data are used for implementing dynamic memory.low protection based on memcgv2.

Bug: 232723420
Test: build pass
Change-Id: I2e92bdc2840af1eaaa08ee6427d2a82d78390005
Signed-off-by: zhaoyang.huang <zhaoyang.huang@unisoc.com>

mm/memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 6ef44d4..f28b52a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -71,6 +71,8 @@
 
 #include <trace/events/vmscan.h>
 
+#include <trace/hooks/cgroup.h>
+
 struct cgroup_subsys memory_cgrp_subsys __read_mostly;
 EXPORT_SYMBOL(memory_cgrp_subsys);
 
@@ -5212,6 +5214,7 @@ static struct mem_cgroup *mem_cgroup_alloc(void)
 	INIT_LIST_HEAD(&memcg->event_list);
 	spin_lock_init(&memcg->event_list_lock);
 	memcg->socket_pressure = jiffies;
+	trace_android_rvh_memcgv2_init(memcg);
 #ifdef CONFIG_MEMCG_KMEM
 	memcg->kmemcg_id = -1;
 	INIT_LIST_HEAD(&memcg->objcg_list);
@@ -6726,6 +6729,8 @@ void mem_cgroup_calculate_protection(struct mem_cgroup *root,
 	if (!parent)
 		return;
 
+	trace_android_rvh_memcgv2_calc_decayed_watermark(memcg);
+
 	if (parent == root) {
 		memcg->memory.emin = READ_ONCE(memcg->memory.min);
 		memcg->memory.elow = READ_ONCE(memcg->memory.low);