ANDROID: mm: add vendor hook to add folio to specific memcg

Add vendor hook when folio charges memcg. This is to manage some
specific folios in separate memcg for more accurate memory reclamation.

Bug: 423742169

Bug: 373540729
Change-Id: I11b1fca279ea9e9e8be1f789bdf1f9d7c1bf001f
Signed-off-by: Jianan Huang <huangjianan@xiaomi.com>
(cherry picked from commit 6e2565c513127c425ddfb84e473dba8161154036)
(cherry picked from commit f2a18f1865797cb396ba90f89ddb3df8065b29e2)
This commit is contained in:
Jianan Huang
2024-10-15 14:32:06 +08:00
committed by Shijie Sun
parent 72ccaf358b
commit 1da7155f07
4 changed files with 11 additions and 0 deletions

View File

@@ -562,3 +562,5 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_early_resume_begin);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_use_amu_fie);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_tsk_need_resched_lazy);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_pr_set_vma_name_bypass);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mem_cgroup_charge);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_filemap_add_folio);

View File

@@ -523,6 +523,13 @@ DECLARE_HOOK(android_vh_try_to_unmap_one,
TP_PROTO(struct folio *folio, struct vm_area_struct *vma,
unsigned long addr, void *arg, bool ret),
TP_ARGS(folio, vma, addr, arg, ret));
DECLARE_HOOK(android_vh_mem_cgroup_charge,
TP_PROTO(struct folio *folio, struct mem_cgroup **memcg),
TP_ARGS(folio, memcg));
DECLARE_HOOK(android_vh_filemap_add_folio,
TP_PROTO(struct address_space *mapping, struct folio *folio,
pgoff_t index),
TP_ARGS(mapping, folio, index));
#endif /* _TRACE_HOOK_MM_H */
/* This part must be outside protection */

View File

@@ -990,6 +990,7 @@ int filemap_add_folio(struct address_space *mapping, struct folio *folio,
void *shadow = NULL;
int ret;
trace_android_vh_filemap_add_folio(mapping, folio, index);
ret = mem_cgroup_charge(folio, NULL, gfp);
if (ret)
return ret;

View File

@@ -4559,6 +4559,7 @@ int __mem_cgroup_charge(struct folio *folio, struct mm_struct *mm, gfp_t gfp)
int ret;
memcg = get_mem_cgroup_from_mm(mm);
trace_android_vh_mem_cgroup_charge(folio, &memcg);
ret = charge_memcg(folio, memcg, gfp);
css_put(&memcg->css);