From: Vincent Guittot <vincent.guittot@linaro.org>
To: peterz@infradead.org, mingo@kernel.org,
linux-kernel@vger.kernel.org, preeti@linux.vnet.ibm.com,
linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org
Cc: riel@redhat.com, Morten.Rasmussen@arm.com, efault@gmx.de,
nicolas.pitre@linaro.org, linaro-kernel@lists.linaro.org,
daniel.lezcano@linaro.org, dietmar.eggemann@arm.com,
Vincent Guittot <vincent.guittot@linaro.org>
Subject: [PATCH v4 04/12] sched: Allow all archs to set the capacity_orig
Date: Mon, 28 Jul 2014 19:51:38 +0200 [thread overview]
Message-ID: <1406569906-9763-5-git-send-email-vincent.guittot@linaro.org> (raw)
In-Reply-To: <1406569906-9763-1-git-send-email-vincent.guittot@linaro.org>
capacity_orig is only changed for system with a SMT sched_domain level in order
to reflect the lower capacity of CPUs. Heterogenous system 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 platform to set capacity_orig.
The weak behavior of arch_scale_cpu_capacity is the previous SMT one in order to
keep backward compatibility in the use of capacity_orig.
arch_scale_smt_capacity and default_scale_smt_capacity have been removed as
they were not use elsewhere than in arch_scale_cpu_capacity.
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
---
kernel/sched/fair.c | 25 ++++++-------------------
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 647d0a6..00ff5f3 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5642,19 +5642,12 @@ 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)
+unsigned long __weak arch_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;
-}
-
-unsigned long __weak arch_scale_smt_capacity(struct sched_domain *sd, int cpu)
-{
- return default_scale_smt_capacity(sd, cpu);
+ return SCHED_CAPACITY_SCALE;
}
static unsigned long scale_rt_capacity(int cpu)
@@ -5693,18 +5686,12 @@ 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);
+ capacity *= arch_scale_cpu_capacity(sd, cpu);
- capacity >>= SCHED_CAPACITY_SHIFT;
- }
+ capacity >>= SCHED_CAPACITY_SHIFT;
sdg->sgc->capacity_orig = capacity;
--
1.9.1
next prev parent reply other threads:[~2014-07-28 17:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-28 17:51 [PATCH v4 00/12] sched: consolidation of cpu_capacity Vincent Guittot
2014-07-28 17:51 ` [PATCH v4 01/12] sched: fix imbalance flag reset Vincent Guittot
2014-11-23 10:25 ` Wanpeng Li
2014-11-24 10:31 ` Vincent Guittot
2014-11-24 23:47 ` Wanpeng Li
2014-11-25 9:04 ` Vincent Guittot
2014-11-25 10:13 ` Wanpeng Li
2014-07-28 17:51 ` [PATCH v4 02/12] sched: remove a wake_affine condition Vincent Guittot
2014-07-28 17:51 ` [PATCH v4 03/12] sched: fix avg_load computation Vincent Guittot
2014-07-28 17:51 ` Vincent Guittot [this message]
2014-07-28 17:51 ` [PATCH v4 05/12] ARM: topology: use new cpu_capacity interface Vincent Guittot
2014-07-28 17:51 ` [PATCH 06/12] sched: add per rq cpu_capacity_orig Vincent Guittot
2014-07-28 17:51 ` [PATCH v4 07/12] sched: test the cpu's capacity in wake affine Vincent Guittot
2014-07-28 17:51 ` [PATCH v4 08/12] sched: move cfs task on a CPU with higher capacity Vincent Guittot
2014-07-28 18:43 ` Rik van Riel
2014-07-29 7:40 ` Vincent Guittot
2014-07-28 17:51 ` [PATCH 09/12] sched: add usage_load_avg Vincent Guittot
2014-07-28 17:51 ` [PATCH v4 10/12] sched: get CPU's utilization statistic Vincent Guittot
2014-07-28 17:51 ` [PATCH v4 11/12] sched: replace capacity_factor by utilization Vincent Guittot
2014-07-28 17:51 ` [PATCH v4 12/12] sched: add SD_PREFER_SIBLING for SMT level Vincent Guittot
2014-07-28 18:52 ` [PATCH v4 00/12] sched: consolidation of cpu_capacity Rik van Riel
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=1406569906-9763-5-git-send-email-vincent.guittot@linaro.org \
--to=vincent.guittot@linaro.org \
--cc=Morten.Rasmussen@arm.com \
--cc=daniel.lezcano@linaro.org \
--cc=dietmar.eggemann@arm.com \
--cc=efault@gmx.de \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mingo@kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=peterz@infradead.org \
--cc=preeti@linux.vnet.ibm.com \
--cc=riel@redhat.com \
/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
all inboxes | Powered by JetHome®