* tip-bot for Vincent Guittot <[email protected]> wrote:
> Commit-ID: 2e62c4743adc4c7bfcbc1f45118fc7bec58cf30a > Gitweb: > https://git.kernel.org/tip/2e62c4743adc4c7bfcbc1f45118fc7bec58cf30a > Author: Vincent Guittot <[email protected]> > AuthorDate: Thu, 19 Jul 2018 14:00:06 +0200 > Committer: Ingo Molnar <[email protected]> > CommitDate: Wed, 25 Jul 2018 11:41:05 +0200 > > sched/fair: Remove #ifdefs from scale_rt_capacity() > > Reuse cpu_util_irq() that has been defined for schedutil and set irq util > to 0 when !CONFIG_IRQ_TIME_ACCOUNTING. > > But the compiler is not able to optimize the sequence (at least with > aarch64 GCC 7.2.1): > > free *= (max - irq); > free /= max; > > when irq is fixed to 0 > > Add a new inline function scale_irq_capacity() that will scale utilization > when irq is accounted. Reuse this funciton in schedutil which applies > similar formula. > > Suggested-by: Ingo Molnar <[email protected]> > Signed-off-by: Vincent Guittot <[email protected]> > Signed-off-by: Peter Zijlstra (Intel) <[email protected]> > Acked-by: Viresh Kumar <[email protected]> > Cc: Linus Torvalds <[email protected]> > Cc: Peter Zijlstra <[email protected]> > Cc: Thomas Gleixner <[email protected]> > Cc: [email protected] > Link: > http://lkml.kernel.org/r/[email protected] > Signed-off-by: Ingo Molnar <[email protected]> > --- > kernel/sched/core.c | 2 +- > kernel/sched/cpufreq_schedutil.c | 3 +-- > kernel/sched/fair.c | 13 +++---------- > kernel/sched/sched.h | 20 ++++++++++++++++++-- > 4 files changed, 23 insertions(+), 15 deletions(-) This commit introduced a build warning in the SMP=n case, could we please fix that? (Probably the best to maintain variant would be to mark it as __maybe_unused.) Also, while at it, there's a number of other places that use this pattern: > -#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || > defined(CONFIG_PARAVIRT_TIME_ACCOUNTING) > +#ifdef HAVE_SCHED_AVG_IRQ Could we convert those to HAVE_SCHED_AVG_IRQ as well? dagon:~/tip> git grep 'defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING)' kernel/sched/ kernel/sched/core.c:#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING) kernel/sched/fair.c:#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING) kernel/sched/pelt.c:#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING) kernel/sched/pelt.h:#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING) kernel/sched/sched.h:#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING) Thanks, Ingo
