android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "sched/walt: affine tasks as requested by user-space"

Browse Source
This commit is contained in:
qctecmdr 2023-06-12 22:44:27 -07:00 committed by Gerrit - the friendly Code Review server
commit 899d22668f
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/sched/walt/walt.c
View File

@ -4830,16 +4830,6 @@ static void android_rvh_schedule(void *unused, struct task_struct *prev,
}
}
static void android_rvh_sched_getaffinity(void *unused, struct task_struct *p,
struct cpumask *in_mask)
{
if (unlikely(walt_disabled))
return;
if (!(p->flags & PF_KTHREAD))
cpumask_andnot(in_mask, in_mask, cpu_halt_mask);
}
static void android_rvh_sched_fork_init(void *unused, struct task_struct *p)
{
if (unlikely(walt_disabled))
@ -4981,7 +4971,6 @@ static void register_walt_hooks(void)
register_trace_android_rvh_schedule(android_rvh_schedule, NULL);
register_trace_android_rvh_cpu_cgroup_attach(android_rvh_cpu_cgroup_attach, NULL);
register_trace_android_rvh_cpu_cgroup_online(android_rvh_cpu_cgroup_online, NULL);
register_trace_android_rvh_sched_getaffinity(android_rvh_sched_getaffinity, NULL);
register_trace_android_rvh_sched_fork_init(android_rvh_sched_fork_init, NULL);
register_trace_android_rvh_ttwu_cond(android_rvh_ttwu_cond, NULL);
register_trace_android_rvh_sched_exec(android_rvh_sched_exec, NULL);

34
kernel/sched/walt/walt_halt.c
View File

@ -557,7 +557,11 @@ static void android_rvh_set_cpus_allowed_by_task(void *unused,
/* remove halted cpus from the valid mask, and store locally */
cpumask_andnot(&allowed_cpus, cpu_valid_mask, cpu_halt_mask);
*dest_cpu = cpumask_any_and_distribute(&allowed_cpus, new_mask);
cpumask_and(&allowed_cpus, &allowed_cpus, new_mask);
/* do not modify dest_cpu if there are no cpus to choose from */
if (!cpumask_empty(&allowed_cpus))
*dest_cpu = cpumask_any_and_distribute(&allowed_cpus, new_mask);
}
}
@ -589,7 +593,7 @@ static void android_rvh_is_cpu_allowed(void *unused, struct task_struct *p, int
return;
if (cpumask_test_cpu(cpu, cpu_halt_mask)) {
cpumask_t cpus_to_avoid;
cpumask_t cpus_allowed;
/* default reject for any halted cpu */
*allowed = false;
@ -600,21 +604,31 @@ static void android_rvh_is_cpu_allowed(void *unused, struct task_struct *p, int
return;
}
cpumask_complement(&cpus_to_avoid, cpu_active_mask);
cpumask_or(&cpus_to_avoid, &cpus_to_avoid, cpu_halt_mask);
/*
* for cfs threads, active cpus in the affinity are allowed
* but halted cpus are not allowed
*/
cpumask_and(&cpus_allowed, cpu_active_mask, p->cpus_ptr);
cpumask_andnot(&cpus_allowed, &cpus_allowed, cpu_halt_mask);
if (!(p->flags & PF_KTHREAD)) {
if (cpumask_weight(&cpus_to_avoid) == WALT_NR_CPUS) {
/* all cpus are inactive or halted. allow for userspace threads */
if (cpumask_empty(&cpus_allowed)) {
/*
* All affined cpus are inactive or halted.
* Allow this cpu for user threads
*/
*allowed = true;
}
return;
}
/* kthreads. extend avoided cpus to include the dying mask */
cpumask_or(&cpus_to_avoid, &cpus_to_avoid, cpu_dying_mask);
if (cpumask_weight(&cpus_to_avoid) == WALT_NR_CPUS) {
/* all cpus inactive or halted or dying. allow for kthreads */
/* for kthreads, dying cpus are not allowed */
cpumask_andnot(&cpus_allowed, &cpus_allowed, cpu_dying_mask);
if (cpumask_empty(&cpus_allowed)) {
/*
* All affined cpus inactive or halted or dying.
* Allow this cpu for kthreads
*/
*allowed = true;
}
}