From a22ff19ff6964b80992f4439ffe8e5b03da92da0 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 --- 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 c7b6b1553b30..c2b34bc5ba33 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -344,3 +344,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_vmscan_kswapd_done); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mm_compaction_begin); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mm_compaction_end); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_bus_iommu_probe); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rmqueue); diff --git a/include/trace/hooks/mm.h b/include/trace/hooks/mm.h index 7018cc8240c3..62f08b0048ff 100644 --- a/include/trace/hooks/mm.h +++ b/include/trace/hooks/mm.h @@ -47,6 +47,12 @@ DECLARE_HOOK(android_vh_page_add_new_anon_rmap, TP_PROTO(struct page *page, struct vm_area_struct *vma, unsigned long address), TP_ARGS(page, vma, address)); +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_proc_show, TP_PROTO(struct seq_file *m), TP_ARGS(m)); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 9a4fa513cc35..b14f39fa06f7 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3940,6 +3940,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 */