From da4e60efe1644efa0874f40bad2d4f09758bab43 Mon Sep 17 00:00:00 2001 From: Dezhi Huang Date: Wed, 24 May 2023 16:16:57 +0800 Subject: [PATCH] ANDROID: mm: create vendor hooks for shrink_slab() Trace_android_vh_shrink_slab_bypass is added in the beginning of the function shrink_slab() to bypass kernel page reclaim in some conditons. Bug: 279793370 Change-Id: I6d5c8be28addf43d6fc9d07b5133135641590c3a Signed-off-by: Dezhi Huang --- drivers/android/vendor_hooks.c | 1 + include/trace/hooks/vmscan.h | 3 +++ mm/vmscan.c | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 7b7712002dbc..78a03f93e0fb 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -243,6 +243,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_reply); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_trans); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mmap_region); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_try_to_unmap_one); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_shrink_slab_bypass); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_get_page_wmark); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_page_add_new_anon_rmap); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_psi_event); diff --git a/include/trace/hooks/vmscan.h b/include/trace/hooks/vmscan.h index 6cba5fd70e8a..229a8d8f45c0 100644 --- a/include/trace/hooks/vmscan.h +++ b/include/trace/hooks/vmscan.h @@ -15,6 +15,9 @@ DECLARE_RESTRICTED_HOOK(android_rvh_set_balance_anon_file_reclaim, DECLARE_HOOK(android_vh_kswapd_per_node, TP_PROTO(int nid, bool *skip, bool run), TP_ARGS(nid, skip, run)); +DECLARE_HOOK(android_vh_shrink_slab_bypass, + TP_PROTO(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg, int priority, bool *bypass), + TP_ARGS(gfp_mask, nid, memcg, priority, bypass)); #endif /* _TRACE_HOOK_VMSCAN_H */ /* This part must be outside protection */ #include diff --git a/mm/vmscan.c b/mm/vmscan.c index d8ef7ca0b8ed..be951f3d0bb9 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -991,6 +991,11 @@ static unsigned long shrink_slab(gfp_t gfp_mask, int nid, { unsigned long ret, freed = 0; struct shrinker *shrinker; + bool bypass = false; + + trace_android_vh_shrink_slab_bypass(gfp_mask, nid, memcg, priority, &bypass); + if (bypass) + return 0; /* * The root memcg might be allocated even though memcg is disabled