From ac2a74af548e798cbbbeb997276e7bfb6c84f758 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: 423742169 Bug: 373540729 Change-Id: Ifb97a144c057555c5f9181f357fa146f9509be3e Signed-off-by: Jianan Huang (cherry picked from commit 9d6f981a89e6e289f114270e2f1738b2b6fdd2ab) (cherry picked from commit ff55f3e7ea69a22fdba2e415532d7bce00d15561) --- 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 bec69637294a..2e785dc58f8f 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -564,3 +564,4 @@ 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); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_shrink_node); diff --git a/include/trace/hooks/vmscan.h b/include/trace/hooks/vmscan.h index 43e730a4407a..e47dd8e03619 100644 --- a/include/trace/hooks/vmscan.h +++ b/include/trace/hooks/vmscan.h @@ -105,6 +105,9 @@ DECLARE_HOOK(android_vh_direct_reclaim_end, DECLARE_HOOK(android_vh_throttle_direct_reclaim_bypass, TP_PROTO(bool *bypass), TP_ARGS(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_shrink_node_memcgs, TP_PROTO(struct mem_cgroup *memcg, bool *skip), TP_ARGS(memcg, skip)); diff --git a/mm/vmscan.c b/mm/vmscan.c index 1e734e73f1ee..79d3501dd8ad 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -6099,6 +6099,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() && root_reclaim(sc)) { memset(&sc->nr, 0, sizeof(sc->nr)); lru_gen_shrink_node(pgdat, sc);