| Message ID | 1404144343-18720-5-git-send-email-vincent.guittot@linaro.org |
|---|---|
| State | New |
| Headers | show |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 06/30/2014 12:05 PM, Vincent Guittot wrote: > power_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_power that can be > also used by non SMT platform to set power_orig. > > The weak behavior of arch_scale_cpu_power is the previous SMT one > in order to keep backward compatibility in the use of power_orig. > > Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> Acked-by: Rik van Riel <riel@redhat.com> - -- All rights reversed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJTvLLLAAoJEM553pKExN6D/bAH/3bwSpTQUfp37uMHo42JEwHV +GiMv+Q8dnVi6/b14UEYaRa0T7ELBOfbAvn7MjUDJVTGDOhCptXuE1Xedz+fKh01 FaVA5sJmCtyhH6v1n8q0PM5D/HcL6WRCBuf91Mx+3aSJhHcULRgN22wajYfxFOEy IBPQjwwxjbWOBsN4l8UevMnzOVLV3S9I/+NHHTRmIcPpc/gdREO31ey4LX4E1y4U sni6exOmhjYGiWgYwt9x5+Fmio0EwqVbSsdygWrSJykjW5dcUfM5A6ACp44u7keK L2tb/eiZthGGd+ct4J08nF51BLrXUAIBcyXM3wxWNFCIQkwhbnVxYapkfmSfe48= =ucGA -----END PGP SIGNATURE----- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Mon, Jun 30, 2014 at 06:05:35PM +0200, Vincent Guittot wrote: > power_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_power that can be also used by > non SMT platform to set power_orig. > > The weak behavior of arch_scale_cpu_power is the previous SMT one in order to > keep backward compatibility in the use of power_orig. > > Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> > --- > kernel/sched/fair.c | 24 ++++++++++++++++-------- > 1 file changed, 16 insertions(+), 8 deletions(-) > > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c > index 148b277..f0bba5f 100644 > --- a/kernel/sched/fair.c > +++ b/kernel/sched/fair.c > @@ -5614,6 +5614,20 @@ unsigned long __weak arch_scale_smt_capacity(struct sched_domain *sd, int cpu) > return default_scale_smt_capacity(sd, cpu); > } > > +unsigned long __weak arch_scale_cpu_capacity(struct sched_domain *sd, int cpu) > +{ > + unsigned long weight = sd->span_weight; > + > + if ((sd->flags & SD_SHARE_CPUCAPACITY) && weight > 1) { > + if (sched_feat(ARCH_CAPACITY)) > + return arch_scale_smt_capacity(sd, cpu); > + else > + return default_scale_smt_capacity(sd, cpu); > + } > + > + return SCHED_CAPACITY_SCALE; > +} The only caller of arch_scale_smt_capacity is now an arch_ function itself; which makes it entirely redundant, no? Also, sched_feat() and default_scale_smt_capability() aren't available to arch implementations of this function and can thus not retain semantics. Seeing how we currently don't have any arch_scale_smt_capacity implementations other than the default we can easily replace it entirely with something like: unsigned long __weak arch_scale_cpu_capacity() { if ((sd->flags & SD_SHARE_CPUCAPACITY) && (sd->span_weight > 1)) return sd->smt_gain / sd->span_weight; return SCHED_CAPACITY_SCALE; } Hmm?
On 9 July 2014 12:57, Peter Zijlstra <peterz@infradead.org> wrote: > On Mon, Jun 30, 2014 at 06:05:35PM +0200, Vincent Guittot wrote: >> power_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_power that can be also used by >> non SMT platform to set power_orig. >> >> The weak behavior of arch_scale_cpu_power is the previous SMT one in order to >> keep backward compatibility in the use of power_orig. >> >> Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> >> --- >> kernel/sched/fair.c | 24 ++++++++++++++++-------- >> 1 file changed, 16 insertions(+), 8 deletions(-) >> >> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c >> index 148b277..f0bba5f 100644 >> --- a/kernel/sched/fair.c >> +++ b/kernel/sched/fair.c >> @@ -5614,6 +5614,20 @@ unsigned long __weak arch_scale_smt_capacity(struct sched_domain *sd, int cpu) >> return default_scale_smt_capacity(sd, cpu); >> } >> >> +unsigned long __weak arch_scale_cpu_capacity(struct sched_domain *sd, int cpu) >> +{ >> + unsigned long weight = sd->span_weight; >> + >> + if ((sd->flags & SD_SHARE_CPUCAPACITY) && weight > 1) { >> + if (sched_feat(ARCH_CAPACITY)) >> + return arch_scale_smt_capacity(sd, cpu); >> + else >> + return default_scale_smt_capacity(sd, cpu); >> + } >> + >> + return SCHED_CAPACITY_SCALE; >> +} > > The only caller of arch_scale_smt_capacity is now an arch_ function > itself; which makes it entirely redundant, no? > > Also, sched_feat() and default_scale_smt_capability() aren't available > to arch implementations of this function and can thus not retain > semantics. > > Seeing how we currently don't have any arch_scale_smt_capacity > implementations other than the default we can easily replace it entirely > with something like: > > unsigned long __weak arch_scale_cpu_capacity() > { > if ((sd->flags & SD_SHARE_CPUCAPACITY) && (sd->span_weight > 1)) > return sd->smt_gain / sd->span_weight; > > return SCHED_CAPACITY_SCALE; > } > > Hmm? That's fair. i'm going to clean up and remove unused function -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 148b277..f0bba5f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5614,6 +5614,20 @@ unsigned long __weak arch_scale_smt_capacity(struct sched_domain *sd, int cpu) return default_scale_smt_capacity(sd, cpu); } +unsigned long __weak arch_scale_cpu_capacity(struct sched_domain *sd, int cpu) +{ + unsigned long weight = sd->span_weight; + + if ((sd->flags & SD_SHARE_CPUCAPACITY) && weight > 1) { + if (sched_feat(ARCH_CAPACITY)) + return arch_scale_smt_capacity(sd, cpu); + else + return default_scale_smt_capacity(sd, cpu); + } + + return SCHED_CAPACITY_SCALE; +} + static unsigned long scale_rt_capacity(int cpu) { struct rq *rq = cpu_rq(cpu); @@ -5650,18 +5664,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;
power_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_power that can be also used by non SMT platform to set power_orig. The weak behavior of arch_scale_cpu_power is the previous SMT one in order to keep backward compatibility in the use of power_orig. Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> --- kernel/sched/fair.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)