diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 66e09ebc4c52..efd43dad1669 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -246,6 +246,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_typec_tcpm_adj_current_limit); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_logbuf); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_tune_scan_type); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_tune_swappiness); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_shrink_slab_bypass); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_psi_event); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_psi_group); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpuset_fork); diff --git a/include/trace/hooks/vmscan.h b/include/trace/hooks/vmscan.h index c691797c09ef..c3500d85e9d0 100644 --- a/include/trace/hooks/vmscan.h +++ b/include/trace/hooks/vmscan.h @@ -16,6 +16,9 @@ DECLARE_HOOK(android_vh_tune_scan_type, DECLARE_HOOK(android_vh_tune_swappiness, TP_PROTO(int *swappiness), TP_ARGS(swappiness)); +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 \ No newline at end of file diff --git a/mm/vmscan.c b/mm/vmscan.c index caa86c8b4f93..b1982859fa56 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -670,6 +670,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