diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 963b012f0192..134b65cf4235 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -274,4 +274,5 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mem_cgroup_free); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mem_cgroup_alloc); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cma_alloc_start); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cma_alloc_finish); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cma_alloc_adjust); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_enable_thermal_genl_check); diff --git a/include/trace/hooks/mm.h b/include/trace/hooks/mm.h index afa3cd6850d0..e52ad0e1de39 100644 --- a/include/trace/hooks/mm.h +++ b/include/trace/hooks/mm.h @@ -41,6 +41,9 @@ DECLARE_HOOK(android_vh_show_mem, DECLARE_HOOK(android_vh_alloc_pages_slowpath, TP_PROTO(gfp_t gfp_mask, unsigned int order, unsigned long delta), TP_ARGS(gfp_mask, order, delta)); +DECLARE_HOOK(android_vh_cma_alloc_adjust, + TP_PROTO(struct zone *zone, bool *is_cma_alloc), + TP_ARGS(zone, is_cma_alloc)); DECLARE_HOOK(android_vh_print_slabinfo_header, TP_PROTO(struct seq_file *m), TP_ARGS(m)); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 78b69ca44311..acf1aa9754d5 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3101,12 +3101,16 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order, */ spin_lock(&zone->lock); for (i = 0; i < count; ++i) { - struct page *page; + struct page *page = NULL; - if (is_migrate_cma(migratetype)) - page = __rmqueue_cma(zone, order, migratetype, + if (is_migrate_cma(migratetype)) { + bool is_cma_alloc = true; + + trace_android_vh_cma_alloc_adjust(zone, &is_cma_alloc); + if (is_cma_alloc) + page = __rmqueue_cma(zone, order, migratetype, alloc_flags); - else + } else page = __rmqueue(zone, order, migratetype, alloc_flags); if (unlikely(page == NULL))