From b3e6d6eec69f8dd7b55b16b0b614122f16911be1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 22 Oct 2021 15:35:23 +0200 Subject: [PATCH] Revert "ANDROID: vendor_hooks: add hook and OEM data for slab shrink" This reverts commit bf769b72164aeef29c303888604266cae5d32264. The hook android_vh_do_shrink_slab is not used by any vendor, so remove it to help with merge issues with future LTS releases. If this is needed by any real user, it can easily be reverted to add it back and then the symbol should be added to the abi list at the same time to prevent it from being removed again later. Bug: 203756332 Bug: 188684131 Cc: rongqianfeng Signed-off-by: Greg Kroah-Hartman Change-Id: I814e3aad76770140063fad4a81951fc025b2b1dd --- drivers/android/vendor_hooks.c | 1 - include/trace/hooks/vmscan.h | 3 --- mm/vmscan.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index fe6962df9180..d86c973aa04c 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -268,7 +268,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_get_from_fragment_pool); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_exclude_reserved_zone); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_include_reserved_zone); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_show_mem); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_do_shrink_slab); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_typec_tcpci_override_toggling); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_typec_tcpci_chk_contaminant); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_typec_tcpci_get_vbus); diff --git a/include/trace/hooks/vmscan.h b/include/trace/hooks/vmscan.h index b6b77d9895cd..ecbff00093ee 100644 --- a/include/trace/hooks/vmscan.h +++ b/include/trace/hooks/vmscan.h @@ -22,9 +22,6 @@ DECLARE_HOOK(android_vh_shrink_slab_bypass, DECLARE_HOOK(android_vh_tune_inactive_ratio, TP_PROTO(unsigned long *inactive_ratio, int file), TP_ARGS(inactive_ratio, file)) -DECLARE_HOOK(android_vh_do_shrink_slab, - TP_PROTO(struct shrinker *shrinker, struct shrink_control *shrinkctl, int priority), - TP_ARGS(shrinker, shrinkctl, priority)); DECLARE_RESTRICTED_HOOK(android_rvh_set_balance_anon_file_reclaim, TP_PROTO(bool *balance_anon_file_reclaim), TP_ARGS(balance_anon_file_reclaim), 1); diff --git a/mm/vmscan.c b/mm/vmscan.c index d49cd9cb79e0..3f5a834dd764 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -451,8 +451,6 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, : SHRINK_BATCH; long scanned = 0, next_deferred; - trace_android_vh_do_shrink_slab(shrinker, shrinkctl, priority); - if (!(shrinker->flags & SHRINKER_NUMA_AWARE)) nid = 0;