ANDROID: adjust check_flags parameter

Along with I746f4fbc20df5cf394d7644ff2cd6f25916c9790,
it also needs to adjust check_flags.

Bug: 416087944
Bug: 436973821
Change-Id: I2871ab305963da00fcc8b0a7755bd8db7859e4c5
Signed-off-by: Minchan Kim <minchan@google.com>
(cherry picked from commit 8f5494d90cac148e269da2937456243ed2d5906f)
Signed-off-by: Richard Chang <richardycc@google.com>
This commit is contained in:
Minchan Kim
2025-05-06 19:57:28 +00:00
parent 48363298ca
commit 7c4c173a5f
3 changed files with 8 additions and 1 deletions
+1
View File
@@ -447,6 +447,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_kmalloc_slab);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_exit_signal);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_process_madvise_bypass);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_free_pages_prepare_init);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_free_one_page_flag_check);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_post_alloc_hook);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_check_new_page);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_madvise_pageout_return_error);
+3
View File
@@ -355,6 +355,9 @@ DECLARE_HOOK(android_vh_free_folio_bypass,
DECLARE_HOOK(android_vh_free_pages_prepare_init,
TP_PROTO(struct page *page, int nr_pages, bool *init),
TP_ARGS(page, nr_pages, init));
DECLARE_HOOK(android_vh_free_one_page_flag_check,
TP_PROTO(unsigned long *flags),
TP_ARGS(flags));
DECLARE_HOOK(android_vh_post_alloc_hook,
TP_PROTO(struct page *page, unsigned int order, bool *init),
TP_ARGS(page, order, init));
+4 -1
View File
@@ -915,6 +915,7 @@ static inline void __free_one_page(struct page *page,
bool to_tail;
bool bypass = false;
int max_order = zone_max_order(zone);
unsigned long check_flags;
trace_android_vh_free_one_page_bypass(page, zone, order,
migratetype, (int)fpi_flags, &bypass);
@@ -923,7 +924,9 @@ static inline void __free_one_page(struct page *page,
return;
VM_BUG_ON(!zone_is_initialized(zone));
VM_BUG_ON_PAGE(page->flags & PAGE_FLAGS_CHECK_AT_PREP, page);
check_flags = PAGE_FLAGS_CHECK_AT_PREP;
trace_android_vh_free_one_page_flag_check(&check_flags);
VM_BUG_ON_PAGE(page->flags & check_flags, page);
VM_BUG_ON(migratetype == -1);
VM_BUG_ON_PAGE(pfn & ((1 << order) - 1), page);