From 842c68a97781e41d7f0f8151fd387ad4e486d2d0 Mon Sep 17 00:00:00 2001 From: wudean Date: Tue, 27 Apr 2021 17:40:41 +0800 Subject: [PATCH] ANDROID: vendor_hooks: bypass shrink slab Add hooks for bypass shrink slab. Bug: 185951972 (cherry picked from commit 396a6adfd31573ee8f53a86f84372cfb4d228e95) Change-Id: I343e02ae5cd6d076d525d0e4bfc09ecdfeda1d7b Signed-off-by: wudean --- 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 16515cdbf7f6..56256b0e9f03 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -221,6 +221,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_drain_all_pages_bypass); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cma_drain_all_pages_bypass); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_pcplist_add_cma_pages_bypass); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_irqtime_account_process_tick); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_shrink_slab_bypass); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_free_task); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_dup_task_struct); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_after_enqueue_task); diff --git a/include/trace/hooks/vmscan.h b/include/trace/hooks/vmscan.h index 2ed356dd7dc7..5abeec9fc06d 100644 --- a/include/trace/hooks/vmscan.h +++ b/include/trace/hooks/vmscan.h @@ -22,6 +22,9 @@ DECLARE_HOOK(android_vh_page_referenced_check_bypass, DECLARE_HOOK(android_vh_shrink_node_memcgs, TP_PROTO(struct mem_cgroup *memcg, bool *skip), TP_ARGS(memcg, skip)); +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 83e357095919..de68f2872257 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -908,6 +908,11 @@ 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