From ae3f6c72e7e41e475f292a010d7815ecef15d02a Mon Sep 17 00:00:00 2001 From: Chiawei Wang Date: Thu, 18 Feb 2021 10:43:50 +0800 Subject: [PATCH] ANDROID: mm: Add vendor hook in rmqueue() Add a vendor hook for costly order page counting and other vendor specific functions. Bug: 174521902 Bug: 172987241 Signed-off-by: Chiawei Wang Change-Id: I89206727a462548cc3500b695d85c83ff003eec7 Signed-off-by: Richard Chang (cherry picked from commit 369de3780428a17e9afece2f5747f03619d589b6) Signed-off-by: liangjlee (cherry picked from commit 86a45bb2dc315fd0b1d0b513b0f2e1be82d25f70) Signed-off-by: Dmitry Skiba --- drivers/android/vendor_hooks.c | 1 + include/trace/hooks/mm.h | 6 ++++++ mm/page_alloc.c | 2 ++ 3 files changed, 9 insertions(+) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index fdd02b764d5f..98b1e9951a6d 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -423,3 +423,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_pages_failure_bypass); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_save_vmalloc_stack); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_show_stack_hash); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_exit_check); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rmqueue); diff --git a/include/trace/hooks/mm.h b/include/trace/hooks/mm.h index dec2f43ef5a7..0ba9a0f08325 100644 --- a/include/trace/hooks/mm.h +++ b/include/trace/hooks/mm.h @@ -123,6 +123,12 @@ DECLARE_HOOK(android_vh_process_madvise_begin, DECLARE_HOOK(android_vh_process_madvise_iter, TP_PROTO(struct task_struct *task, int behavior, ssize_t *ret), TP_ARGS(task, behavior, ret)); +DECLARE_HOOK(android_vh_rmqueue, + TP_PROTO(struct zone *preferred_zone, struct zone *zone, + unsigned int order, gfp_t gfp_flags, + unsigned int alloc_flags, int migratetype), + TP_ARGS(preferred_zone, zone, order, + gfp_flags, alloc_flags, migratetype)); DECLARE_HOOK(android_vh_meminfo_cache_adjust, TP_PROTO(unsigned long *cached), TP_ARGS(cached)); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 5de9d9e4aa6e..1dcdd00e3089 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3347,6 +3347,8 @@ struct page *rmqueue(struct zone *preferred_zone, page = rmqueue_buddy(preferred_zone, zone, order, alloc_flags, migratetype); + trace_android_vh_rmqueue(preferred_zone, zone, order, + gfp_flags, alloc_flags, migratetype); out: /* Separate test+clear to avoid unnecessary atomics */