evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "sched: avoid RT tasks contention during sched boost"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-03 20:51:01 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1625604b6e
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
kernel/sched/rt.c
View file

@ -1823,6 +1823,7 @@ static int find_lowest_rq_hmp(struct task_struct *task)
* the best one based on our affinity and topology. * the best one based on our affinity and topology.
*/ */
retry:
for_each_sched_cluster(cluster) { for_each_sched_cluster(cluster) {
if (boost_on_big && cluster->capacity != max_possible_capacity) if (boost_on_big && cluster->capacity != max_possible_capacity)
continue; continue;
@ -1830,6 +1831,15 @@ static int find_lowest_rq_hmp(struct task_struct *task)
cpumask_and(&candidate_mask, &cluster->cpus, lowest_mask); cpumask_and(&candidate_mask, &cluster->cpus, lowest_mask);
cpumask_andnot(&candidate_mask, &candidate_mask, cpumask_andnot(&candidate_mask, &candidate_mask,
cpu_isolated_mask); cpu_isolated_mask);
/*
* When placement boost is active, if there is no eligible CPU
* in the highest capacity cluster, we fallback to the other
* clusters. So clear the CPUs of the traversed cluster from
* the lowest_mask.
*/
if (unlikely(boost_on_big))
cpumask_andnot(lowest_mask, lowest_mask,
&cluster->cpus);
if (cpumask_empty(&candidate_mask)) if (cpumask_empty(&candidate_mask))
continue; continue;
@ -1869,6 +1879,11 @@ static int find_lowest_rq_hmp(struct task_struct *task)
break; break;
} }
if (unlikely(boost_on_big && best_cpu == -1)) {
boost_on_big = 0;
goto retry;
}
return best_cpu; return best_cpu;
} }
#endif /* CONFIG_SCHED_HMP */ #endif /* CONFIG_SCHED_HMP */