From a42f6e7d0aa09de1ccd2e8094fb069ae7860b9fe Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 15 Feb 2023 09:25:47 +0000 Subject: [PATCH] Revert "ANDROID: sched/cpuset: Add vendor hook to change tasks affinity" This reverts commit 8ecd88d9d38f849d5aac59596ebc7a8679405f5b as it is broken with regards to upstream changes made in 6.1.12. If this is still needed, it can be brought back in a way that works properly based on the changes made upstream. Bug: 174125747 Cc: Satya Durga Srinivasu Prabhala Cc: Sai Harshini Nimmala Change-Id: Ic3163351faabbecbce688a87215f79ca3b5d6188 Signed-off-by: Greg Kroah-Hartman --- include/trace/hooks/sched.h | 5 ----- kernel/cgroup/cpuset.c | 18 ++---------------- kernel/sched/vendor_hooks.c | 1 - 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 00aa8a1107b3..ae4aa902df1c 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -193,11 +193,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_update_misfit_status, TP_PROTO(struct task_struct *p, struct rq *rq, bool *need_update), TP_ARGS(p, rq, need_update), 1); -DECLARE_RESTRICTED_HOOK(android_rvh_update_cpus_allowed, - TP_PROTO(struct task_struct *p, cpumask_var_t cpus_requested, - const struct cpumask *new_mask, int *ret), - TP_ARGS(p, cpus_requested, new_mask, ret), 1); - DECLARE_RESTRICTED_HOOK(android_rvh_sched_fork_init, TP_PROTO(struct task_struct *p), TP_ARGS(p), 1); diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 74c0837cff7e..01319b9f4149 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -67,8 +67,6 @@ #include #include -#include - DEFINE_STATIC_KEY_FALSE(cpusets_pre_enable_key); DEFINE_STATIC_KEY_FALSE(cpusets_enabled_key); @@ -1198,18 +1196,6 @@ void rebuild_sched_domains(void) } EXPORT_SYMBOL_GPL(rebuild_sched_domains); -static int update_cpus_allowed(struct cpuset *cs, struct task_struct *p, - const struct cpumask *new_mask) -{ - int ret = -EINVAL; - - trace_android_rvh_update_cpus_allowed(p, cs->cpus_requested, new_mask, &ret); - if (!ret) - return ret; - - return set_cpus_allowed_ptr(p, new_mask); -} - /** * update_tasks_cpumask - Update the cpumasks of tasks in the cpuset. * @cs: the cpuset in which each task's cpus_allowed mask needs to be changed @@ -1232,7 +1218,7 @@ static void update_tasks_cpumask(struct cpuset *cs) if (top_cs && (task->flags & PF_KTHREAD) && kthread_is_per_cpu(task)) continue; - update_cpus_allowed(cs, task, cs->effective_cpus); + set_cpus_allowed_ptr(task, cs->effective_cpus); } css_task_iter_end(&it); } @@ -2542,7 +2528,7 @@ static void cpuset_attach(struct cgroup_taskset *tset) * can_attach beforehand should guarantee that this doesn't * fail. TODO: have a better way to handle failure here */ - WARN_ON_ONCE(update_cpus_allowed(cs, task, cpus_attach)); + WARN_ON_ONCE(set_cpus_allowed_ptr(task, cpus_attach)); cpuset_change_task_nodemask(task, &cpuset_attach_nodemask_to); cpuset_update_task_spread_flag(cs, task); diff --git a/kernel/sched/vendor_hooks.c b/kernel/sched/vendor_hooks.c index 2fd59c3664a8..5df92650244a 100644 --- a/kernel/sched/vendor_hooks.c +++ b/kernel/sched/vendor_hooks.c @@ -35,7 +35,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_busiest_queue); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_migrate_queued_task); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_overutilized); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_setaffinity); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_update_cpus_allowed); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_build_sched_domains); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_check_preempt_tick); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_check_preempt_wakeup_ignore);