From ff55f3e7ea69a22fdba2e415532d7bce00d15561 Mon Sep 17 00:00:00 2001 From: Jianan Huang Date: Tue, 15 Oct 2024 14:47:56 +0800 Subject: [PATCH] ANDROID: mm: add vendor hook to trace shrink_node This is to adjust parameters between different memcgs to achieve more accurate memory reclamation. Bug: 373540729 Change-Id: Ifb97a144c057555c5f9181f357fa146f9509be3e Signed-off-by: Jianan Huang (cherry picked from commit 9d6f981a89e6e289f114270e2f1738b2b6fdd2ab) --- drivers/android/vendor_hooks.c | 1 + include/trace/hooks/vmscan.h | 3 +++ mm/vmscan.c | 1 + 3 files changed, 5 insertions(+) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index bb305ea7fa30..4d120996dbc7 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -440,6 +440,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_queue_request_and_unlock); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_fuse_request_end); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_read_trylock_failed); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_should_memcg_bypass); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_shrink_node); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_shmem_swapin_folio); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_do_wp_page); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_do_swap_page); diff --git a/include/trace/hooks/vmscan.h b/include/trace/hooks/vmscan.h index 991d3365408f..e318c2d51c1f 100644 --- a/include/trace/hooks/vmscan.h +++ b/include/trace/hooks/vmscan.h @@ -86,6 +86,9 @@ DECLARE_HOOK(android_vh_page_referenced_check_bypass, DECLARE_HOOK(android_vh_folio_referenced_check_bypass, TP_PROTO(struct folio *folio, s8 priority, unsigned long nr_to_scan, int lru, bool *bypass), TP_ARGS(folio, priority, nr_to_scan, lru, bypass)); +DECLARE_HOOK(android_vh_shrink_node, + TP_PROTO(pg_data_t *pgdat, struct mem_cgroup *memcg), + TP_ARGS(pgdat, memcg)); DECLARE_HOOK(android_vh_should_memcg_bypass, TP_PROTO(struct mem_cgroup *memcg, int priority, bool *bypass), TP_ARGS(memcg, priority, bypass)); diff --git a/mm/vmscan.c b/mm/vmscan.c index 4caf03d5ecaa..c14a16044515 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -6606,6 +6606,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) struct lruvec *target_lruvec; bool reclaimable = false; + trace_android_vh_shrink_node(pgdat, sc->target_mem_cgroup); if (lru_gen_enabled() && global_reclaim(sc)) { lru_gen_shrink_node(pgdat, sc); return;