From 96c08d92106026fea3fa1b5543c864b10a6c3316 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 20 Oct 2021 16:12:14 +0200 Subject: [PATCH] Revert portions of "ANDROID: vendor_hooks: Add hooks for scheduler" This reverts part of commit 53e8099784435152ed3d2a60190e265ab0e436eb. The hook android_rvh_check_preempt_wakeup_ignore 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: 182441701 Cc: xieliujie Signed-off-by: Greg Kroah-Hartman Change-Id: I69bdc14143760bfdd07bbd72ed3d5a4127fbc4c8 --- drivers/android/vendor_hooks.c | 1 - include/trace/hooks/sched.h | 3 --- kernel/sched/fair.c | 4 ---- 3 files changed, 8 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index f1e530388bd0..4ebf556d855f 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -238,7 +238,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cgroup_force_kthread_migration); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_syscall_prctl_finished); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_create_worker); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_check_preempt_tick); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_check_preempt_wakeup_ignore); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_replace_next_task_fair); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_sched_yield); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_wait_for_work); diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 0844244c9aff..e6c8bd35e189 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -283,9 +283,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_check_preempt_tick, unsigned long delta_exec, struct cfs_rq *cfs_rq, struct sched_entity *curr, unsigned int granularity), TP_ARGS(p, ideal_runtime, skip_preempt, delta_exec, cfs_rq, curr, granularity), 1); -DECLARE_RESTRICTED_HOOK(android_rvh_check_preempt_wakeup_ignore, - TP_PROTO(struct task_struct *p, bool *ignore), - TP_ARGS(p, ignore), 1); DECLARE_RESTRICTED_HOOK(android_rvh_replace_next_task_fair, TP_PROTO(struct rq *rq, struct task_struct **p, struct sched_entity **se, bool *repick, bool simple, struct task_struct *prev), diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 7d009aaccb72..8dc3d9a02b54 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7064,13 +7064,9 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_ int scale = cfs_rq->nr_running >= sched_nr_latency; int next_buddy_marked = 0; bool preempt = false, nopreempt = false; - bool ignore = false; if (unlikely(se == pse)) return; - trace_android_rvh_check_preempt_wakeup_ignore(curr, &ignore); - if (ignore) - return; /* * This is possible from callers such as attach_tasks(), in which we