diff options
| author | Mel Gorman <mgorman@techsingularity.net> | 2021-01-25 08:59:07 +0000 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2021-01-27 17:26:44 +0100 |
| commit | bae4ec13640b0915e7dd86da7e65c5d085160571 (patch) | |
| tree | f3e804e29c67da9cceca309bdbaad323739456d4 /kernel/sched | |
| parent | e6e0dc2d5497f7f3ed970052917e2923c6f453f4 (diff) | |
| download | linux-bae4ec13640b0915e7dd86da7e65c5d085160571.tar.gz linux-bae4ec13640b0915e7dd86da7e65c5d085160571.tar.bz2 linux-bae4ec13640b0915e7dd86da7e65c5d085160571.zip | |
sched/fair: Move avg_scan_cost calculations under SIS_PROP
As noted by Vincent Guittot, avg_scan_costs are calculated for SIS_PROP
even if SIS_PROP is disabled. Move the time calculations under a SIS_PROP
check and while we are at it, exclude the cost of initialising the CPU
mask from the average scan cost.
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org>
Link: https://lkml.kernel.org/r/20210125085909.4600-3-mgorman@techsingularity.net
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/fair.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 124cb6ec6b7b..4c18ef6c1542 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6166,6 +6166,8 @@ static int select_idle_cpu(struct task_struct *p, struct sched_domain *sd, int t if (!this_sd) return -1; + cpumask_and(cpus, sched_domain_span(sd), p->cpus_ptr); + if (sched_feat(SIS_PROP)) { u64 avg_cost, avg_idle, span_avg; @@ -6181,11 +6183,9 @@ static int select_idle_cpu(struct task_struct *p, struct sched_domain *sd, int t nr = div_u64(span_avg, avg_cost); else nr = 4; - } - - time = cpu_clock(this); - cpumask_and(cpus, sched_domain_span(sd), p->cpus_ptr); + time = cpu_clock(this); + } for_each_cpu_wrap(cpu, cpus, target) { if (!--nr) @@ -6194,8 +6194,10 @@ static int select_idle_cpu(struct task_struct *p, struct sched_domain *sd, int t break; } - time = cpu_clock(this) - time; - update_avg(&this_sd->avg_scan_cost, time); + if (sched_feat(SIS_PROP)) { + time = cpu_clock(this) - time; + update_avg(&this_sd->avg_scan_cost, time); + } return cpu; } |