From: tip-bot for Vincent Guittot <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
kamalesh@linux.vnet.ibm.com, torvalds@linux-foundation.org,
peterz@infradead.org, preeti@linux.vnet.ibm.com,
vincent.guittot@linaro.org, tglx@linutronix.de
Subject: [tip:sched/core] sched: Allow all architectures to set ' capacity_orig'
Date: Fri, 19 Sep 2014 04:47:54 -0700 [thread overview]
Message-ID: <tip-26bc3c50d3b3984564c270da86f1fbbfb774dbcd@git.kernel.org> (raw)
In-Reply-To: <1409051215-16788-5-git-send-email-vincent.guittot@linaro.org>
Commit-ID: 26bc3c50d3b3984564c270da86f1fbbfb774dbcd
Gitweb: http://git.kernel.org/tip/26bc3c50d3b3984564c270da86f1fbbfb774dbcd
Author: Vincent Guittot <vincent.guittot@linaro.org>
AuthorDate: Tue, 26 Aug 2014 13:06:47 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 19 Sep 2014 12:35:27 +0200
sched: Allow all architectures to set 'capacity_orig'
'capacity_orig' is only changed for systems with an SMT sched_domain level in order
to reflect the lower capacity of CPUs. Heterogenous systems also have to reflect an
original capacity that is different from the default value.
Create a more generic function arch_scale_cpu_capacity that can be also used by
non SMT platforms to set capacity_orig.
The __weak implementation of arch_scale_cpu_capacity() is the previous SMT variant,
in order to keep backward compatibility with the use of capacity_orig.
arch_scale_smt_capacity() and default_scale_smt_capacity() have been removed as
they were not used elsewhere than in arch_scale_cpu_capacity().
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
Reviewed-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Reviewed-by: Preeti U. Murthy <preeti@linux.vnet.ibm.com>
[ Added default_scale_cpu_capacity() back. ]
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: riel@redhat.com
Cc: Morten.Rasmussen@arm.com
Cc: efault@gmx.de
Cc: nicolas.pitre@linaro.org
Cc: daniel.lezcano@linaro.org
Cc: dietmar.eggemann@arm.com
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/1409051215-16788-5-git-send-email-vincent.guittot@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/sched/fair.c | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index eb87229..be530e4 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5705,19 +5705,17 @@ unsigned long __weak arch_scale_freq_capacity(struct sched_domain *sd, int cpu)
return default_scale_capacity(sd, cpu);
}
-static unsigned long default_scale_smt_capacity(struct sched_domain *sd, int cpu)
+static unsigned long default_scale_cpu_capacity(struct sched_domain *sd, int cpu)
{
- unsigned long weight = sd->span_weight;
- unsigned long smt_gain = sd->smt_gain;
+ if ((sd->flags & SD_SHARE_CPUCAPACITY) && (sd->span_weight > 1))
+ return sd->smt_gain / sd->span_weight;
- smt_gain /= weight;
-
- return smt_gain;
+ return SCHED_CAPACITY_SCALE;
}
-unsigned long __weak arch_scale_smt_capacity(struct sched_domain *sd, int cpu)
+unsigned long __weak arch_scale_cpu_capacity(struct sched_domain *sd, int cpu)
{
- return default_scale_smt_capacity(sd, cpu);
+ return default_scale_cpu_capacity(sd, cpu);
}
static unsigned long scale_rt_capacity(int cpu)
@@ -5756,18 +5754,15 @@ static unsigned long scale_rt_capacity(int cpu)
static void update_cpu_capacity(struct sched_domain *sd, int cpu)
{
- unsigned long weight = sd->span_weight;
unsigned long capacity = SCHED_CAPACITY_SCALE;
struct sched_group *sdg = sd->groups;
- if ((sd->flags & SD_SHARE_CPUCAPACITY) && weight > 1) {
- if (sched_feat(ARCH_CAPACITY))
- capacity *= arch_scale_smt_capacity(sd, cpu);
- else
- capacity *= default_scale_smt_capacity(sd, cpu);
+ if (sched_feat(ARCH_CAPACITY))
+ capacity *= arch_scale_cpu_capacity(sd, cpu);
+ else
+ capacity *= default_scale_cpu_capacity(sd, cpu);
- capacity >>= SCHED_CAPACITY_SHIFT;
- }
+ capacity >>= SCHED_CAPACITY_SHIFT;
sdg->sgc->capacity_orig = capacity;
next prev parent reply other threads:[~2014-09-19 11:48 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-26 11:06 [PATCH v5 00/12] sched: consolidation of cpu_capacity Vincent Guittot
2014-08-26 11:06 ` [PATCH v5 01/12] sched: fix imbalance flag reset Vincent Guittot
2014-09-19 11:47 ` [tip:sched/core] sched: Fix " tip-bot for Vincent Guittot
2014-08-26 11:06 ` [PATCH v5 02/12] sched: remove a wake_affine condition Vincent Guittot
2014-09-19 11:47 ` [tip:sched/core] sched: Remove a wake_affine() condition tip-bot for Vincent Guittot
2014-08-26 11:06 ` [PATCH v5 03/12] sched: fix avg_load computation Vincent Guittot
2014-08-30 12:00 ` Preeti U Murthy
2014-09-03 11:09 ` Vincent Guittot
2014-09-03 23:43 ` Tim Chen
2014-09-04 7:17 ` Vincent Guittot
2014-09-04 16:26 ` Tim Chen
2014-09-05 11:10 ` Preeti U Murthy
2014-09-19 11:47 ` [tip:sched/core] sched: Fix " tip-bot for Vincent Guittot
2014-08-26 11:06 ` [PATCH v5 04/12] sched: Allow all archs to set the capacity_orig Vincent Guittot
2014-08-27 13:12 ` Kamalesh Babulal
2014-08-30 17:07 ` Preeti U Murthy
2014-09-01 8:05 ` Vincent Guittot
2014-09-03 8:41 ` Preeti U Murthy
2014-09-10 13:50 ` Peter Zijlstra
2014-09-10 14:22 ` Vincent Guittot
2014-09-11 10:36 ` Preeti U Murthy
2014-09-19 11:47 ` tip-bot for Vincent Guittot [this message]
2014-08-26 11:06 ` [PATCH v5 05/12] ARM: topology: use new cpu_capacity interface Vincent Guittot
2014-09-11 18:52 ` Nicolas Pitre
2014-09-19 11:48 ` [tip:sched/core] ARM: topology: Use the " tip-bot for Vincent Guittot
2014-08-26 11:06 ` [PATCH v5 06/12] sched: add per rq cpu_capacity_orig Vincent Guittot
2014-08-27 13:32 ` Kamalesh Babulal
2014-08-28 7:34 ` Vincent Guittot
2014-09-10 13:53 ` Peter Zijlstra
2014-09-10 14:19 ` Vincent Guittot
2014-09-11 19:02 ` Nicolas Pitre
2014-09-15 21:22 ` Vincent Guittot
2014-08-26 11:06 ` [PATCH v5 07/12] sched: test the cpu's capacity in wake affine Vincent Guittot
2014-09-10 14:19 ` Peter Zijlstra
2014-09-19 11:48 ` [tip:sched/core] sched: Test the CPU's capacity in wake_affine() tip-bot for Vincent Guittot
2014-08-26 11:06 ` [PATCH v5 08/12] sched: move cfs task on a CPU with higher capacity Vincent Guittot
2014-08-30 17:50 ` Preeti U Murthy
2014-09-01 8:45 ` Vincent Guittot
2014-09-03 9:11 ` Preeti U Murthy
2014-09-03 11:44 ` Vincent Guittot
2014-09-03 12:26 ` Preeti U Murthy
2014-09-03 12:49 ` Vincent Guittot
2014-09-11 9:27 ` Peter Zijlstra
2014-09-05 12:06 ` Preeti U Murthy
2014-09-05 12:24 ` Vincent Guittot
2014-09-11 10:07 ` Peter Zijlstra
2014-09-11 11:20 ` Vincent Guittot
2014-09-11 10:13 ` Peter Zijlstra
2014-09-11 12:14 ` Vincent Guittot
2014-09-11 11:54 ` Peter Zijlstra
2014-08-26 11:06 ` [PATCH v5 09/12] sched: add usage_load_avg Vincent Guittot
2014-09-04 7:34 ` [PATCH v5 09/11] " Vincent Guittot
2014-09-11 11:17 ` Peter Zijlstra
2014-09-11 11:17 ` [PATCH v5 09/12] " Peter Zijlstra
2014-09-11 12:18 ` Vincent Guittot
2014-09-11 12:20 ` Vincent Guittot
2014-09-15 19:15 ` Morten Rasmussen
2014-09-15 22:33 ` Vincent Guittot
2014-08-26 11:06 ` [PATCH v5 10/12] sched: get CPU's utilization statistic Vincent Guittot
2014-09-11 12:34 ` Peter Zijlstra
2014-09-11 13:07 ` Vincent Guittot
2014-09-11 14:04 ` Peter Zijlstra
2014-09-11 19:17 ` Nicolas Pitre
2014-09-12 7:41 ` Vincent Guittot
2014-09-15 19:45 ` Morten Rasmussen
2014-09-16 22:43 ` Vincent Guittot
2014-09-15 19:28 ` Morten Rasmussen
2014-08-26 11:06 ` [PATCH v5 11/12] sched: replace capacity_factor by utilization Vincent Guittot
2014-09-11 15:39 ` Peter Zijlstra
2014-09-11 16:15 ` Peter Zijlstra
2014-09-11 17:26 ` Vincent Guittot
2014-09-14 19:41 ` Peter Zijlstra
2014-09-14 19:51 ` Peter Zijlstra
2014-09-15 11:42 ` Peter Zijlstra
2014-09-15 19:07 ` Nicolas Pitre
2014-09-15 20:01 ` Peter Zijlstra
2014-09-17 18:45 ` Morten Rasmussen
2014-09-17 18:58 ` Morten Rasmussen
2014-09-17 23:03 ` Peter Zijlstra
2014-09-15 22:14 ` Vincent Guittot
2014-09-15 22:18 ` Vincent Guittot
2014-09-17 22:25 ` Peter Zijlstra
2014-09-18 1:32 ` Vincent Guittot
2014-09-16 17:00 ` Dietmar Eggemann
2014-08-26 11:06 ` [PATCH v5 12/12] sched: add SD_PREFER_SIBLING for SMT level Vincent Guittot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-26bc3c50d3b3984564c270da86f1fbbfb774dbcd@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=kamalesh@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=preeti@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).