From f62f75ba160e9f43dacd3dc9f5e57db4aca3559a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 30 Mar 2022 14:30:49 +0200 Subject: [PATCH] Revert "ANDROID: sched: Add vendor hook to select ilb cpu" This reverts commit 178eea2694ef76cd029dc1a5548cce617ecff398. It causes merge issues with 5.18-rc1 so revert it for now. If it is still needed, it can be forward ported after 5.18-rc1 is merged. Bug: 190228983 Cc: Choonghoon Park Signed-off-by: Greg Kroah-Hartman Change-Id: Iaa5cff0ebc6db74f09f7d81d153fa66fe3ac7a63 --- drivers/android/vendor_hooks.c | 1 - include/trace/hooks/sched.h | 4 ---- kernel/sched/fair.c | 6 +----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index aa0582079184..295527a249f8 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -197,7 +197,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_check_mmap_file); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_check_file_open); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_check_bpf_syscall); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_post_init_entity_util_avg); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_new_ilb); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_do_wake_up_sync); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_wake_flags); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_uclamp_eff_get); diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 6c1966ca9448..33ed33bfe33f 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -325,10 +325,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_post_init_entity_util_avg, TP_PROTO(struct sched_entity *se), TP_ARGS(se), 1); -DECLARE_RESTRICTED_HOOK(android_rvh_find_new_ilb, - TP_PROTO(struct cpumask *nohz_idle_cpus_mask, int *ilb), - TP_ARGS(nohz_idle_cpus_mask, ilb), 1); - DECLARE_HOOK(android_vh_do_wake_up_sync, TP_PROTO(struct wait_queue_head *wq_head, int *done), TP_ARGS(wq_head, done)); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 781bc024779d..0bb581d1af14 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -10509,13 +10509,9 @@ static inline int on_null_domain(struct rq *rq) static inline int find_new_ilb(void) { - int ilb = -1; + int ilb; const struct cpumask *hk_mask; - trace_android_rvh_find_new_ilb(nohz.idle_cpus_mask, &ilb); - if (ilb >= 0) - return ilb; - hk_mask = housekeeping_cpumask(HK_FLAG_MISC); for_each_cpu_and(ilb, nohz.idle_cpus_mask, hk_mask) {