From 6ab12e6b6925fa3e580095df09ef4d5ec047c088 Mon Sep 17 00:00:00 2001 From: Martin Liu Date: Fri, 25 Apr 2025 15:33:50 +0000 Subject: [PATCH] ANDROID: vendor_hook: add vendor hook on calculate_totalreserve_pages This vendor hook enables or disables updating the LMKD zone watermark level. Bug: 396115949 Test: build Change-Id: I0089a0586821120e47c46e08bcfea11a1602d516 Signed-off-by: Martin Liu --- drivers/android/vendor_hooks.c | 1 + include/trace/hooks/mm.h | 3 +++ mm/page_alloc.c | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 63bc27a22586..32d52f2f4f4c 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -512,3 +512,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_compaction_try_to_compact_exit); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mm_direct_reclaim_enter); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mm_direct_reclaim_exit); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mm_may_oom_exit); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_calculate_totalreserve_pages); diff --git a/include/trace/hooks/mm.h b/include/trace/hooks/mm.h index b3454f626d36..cfc8346ebd19 100644 --- a/include/trace/hooks/mm.h +++ b/include/trace/hooks/mm.h @@ -444,6 +444,9 @@ struct oom_control; DECLARE_HOOK(android_vh_mm_may_oom_exit, TP_PROTO(struct oom_control *oc, unsigned long did_some_progress), TP_ARGS(oc, did_some_progress)); +DECLARE_HOOK(android_vh_calculate_totalreserve_pages, + TP_PROTO(bool *skip), + TP_ARGS(skip)); #endif /* _TRACE_HOOK_MM_H */ /* This part must be outside protection */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d5799abdbb47..459c254c2fe7 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6330,6 +6330,7 @@ static void calculate_totalreserve_pages(void) struct pglist_data *pgdat; unsigned long reserve_pages = 0; enum zone_type i, j; + bool skip = false; for_each_online_pgdat(pgdat) { @@ -6358,6 +6359,9 @@ static void calculate_totalreserve_pages(void) } } totalreserve_pages = reserve_pages; + trace_android_vh_calculate_totalreserve_pages(&skip); + if (skip) + return; trace_mm_calculate_totalreserve_pages(totalreserve_pages); }