diff options
| author | Syed Rameez Mustafa <rameezmustafa@codeaurora.org> | 2015-07-21 15:00:59 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:02:15 -0700 |
| commit | d109fbbf71373e66ae6b78e0b2706ffc4cf3e716 (patch) | |
| tree | 6f7303e10be8443a40399f6a70880bcc9d194da1 | |
| parent | 17bb9bcd5481e0b9c2bd519fced7d166b0d7315d (diff) | |
sched: Add load based placement for RT tasks
Currently RT tasks prefer to go to the lowest power CPU in the
system. This can end up causing contention on the lowest power
CPU. Instead ensure that RT tasks end up on the lowest power
cluster and the least loaded CPU within that cluster.
Change-Id: I363b3d43236924962c67d2fb5d3d2d09800cd994
Signed-off-by: Syed Rameez Mustafa <rameezmustafa@codeaurora.org>
| -rw-r--r-- | kernel/sched/rt.c | 18 | ||||
| -rw-r--r-- | kernel/sched/sched.h | 1 |
2 files changed, 18 insertions, 1 deletions
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index a817272a390b..235f6295590d 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -1656,6 +1656,7 @@ static int find_lowest_rq_hmp(struct task_struct *task) { struct cpumask *lowest_mask = *this_cpu_ptr(&local_cpu_mask); int cpu_cost, min_cost = INT_MAX; + u64 cpu_load, min_load = ULLONG_MAX; int best_cpu = -1; int i; @@ -1689,11 +1690,26 @@ static int find_lowest_rq_hmp(struct task_struct *task) if (sched_boost() && capacity(rq) != max_capacity) continue; - if (cpu_cost < min_cost && !sched_cpu_high_irqload(i)) { + if (power_delta_exceeded(cpu_cost, min_cost)) { + if (cpu_cost > min_cost) + continue; + min_cost = cpu_cost; + min_load = ULLONG_MAX; + best_cpu = -1; + } + + if (sched_cpu_high_irqload(i)) + continue; + + cpu_load = scale_load_to_cpu( + rq->hmp_stats.cumulative_runnable_avg, i); + if (cpu_load < min_load) { + min_load = cpu_load; best_cpu = i; } } + return best_cpu; } diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index c595be354732..08f1f7e9c0e9 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1208,6 +1208,7 @@ extern void check_for_migration(struct rq *rq, struct task_struct *p); extern void pre_big_small_task_count_change(const struct cpumask *cpus); extern void post_big_small_task_count_change(const struct cpumask *cpus); extern void set_hmp_defaults(void); +extern int power_delta_exceeded(unsigned int cpu_cost, unsigned int base_cost); extern unsigned int power_cost_at_freq(int cpu, unsigned int freq); extern void reset_all_window_stats(u64 window_start, unsigned int window_size); extern void boost_kick(int cpu); |