From fa351f080eb15575322a4c69aada7a9759064fd9 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 15 Mar 2023 12:12:45 -0700 Subject: [PATCH] ANDROID: Revert "ANDROID: sched: add hook to set_cpus_allowed_ptr_locked" This reverts commit a027f0d72e6943e6c67db4e896f9b13b496e03f2. Multiple partners have requested for this hook which has resulted in two different versions -- android_rvh_set_cpus_allowed_by_task and android_rvh_set_cpus_allowed_ptr_locked. These have since been consolidated into a single vendor hook on android-mainline (https://r.android.com/2135713). So let's update this branch to only use android_rvh_set_cpus_allowed_by_task(). Bug: 236775946 Change-Id: I86f08021d6d87be96f559e133ccd09031bd1b8cd Signed-off-by: Will McVicker --- include/trace/hooks/sched.h | 5 ----- kernel/sched/core.c | 2 -- kernel/sched/vendor_hooks.c | 1 - 3 files changed, 8 deletions(-) diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 10c537161edc..24362bec8f54 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -298,11 +298,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_check_preempt_wakeup, TP_ARGS(rq, p, preempt, nopreempt, wake_flags, se, pse, next_buddy_marked, granularity), 1); -DECLARE_RESTRICTED_HOOK(android_rvh_set_cpus_allowed_ptr_locked, - TP_PROTO(const struct cpumask *cpu_valid_mask, const struct cpumask *new_mask, - unsigned int *dest_cpu), - TP_ARGS(cpu_valid_mask, new_mask, dest_cpu), 1); - DECLARE_RESTRICTED_HOOK(android_rvh_do_sched_yield, TP_PROTO(struct rq *rq), TP_ARGS(rq), 1); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 43bd448d62af..2d8b8afb0179 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2905,8 +2905,6 @@ static int __set_cpus_allowed_ptr_locked(struct task_struct *p, * immediately required to distribute the tasks within their new mask. */ dest_cpu = cpumask_any_and_distribute(cpu_valid_mask, new_mask); - trace_android_rvh_set_cpus_allowed_ptr_locked(cpu_valid_mask, new_mask, &dest_cpu); - if (dest_cpu >= nr_cpu_ids) { ret = -EINVAL; goto out; diff --git a/kernel/sched/vendor_hooks.c b/kernel/sched/vendor_hooks.c index 4b79d6eff596..6792c7aef320 100644 --- a/kernel/sched/vendor_hooks.c +++ b/kernel/sched/vendor_hooks.c @@ -75,7 +75,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_replace_next_task_fair); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_balance_rt); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_pick_next_entity); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_check_preempt_wakeup); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_cpus_allowed_ptr_locked); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_do_sched_yield); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_free_task); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_irqtime_account_process_tick);