Re: cpufreq governors broken with !CONFIG_SMP?

From	Peter Zijlstra <peterz@infradead.org>
Newsgroups	linux.kernel
Subject	Re: cpufreq governors broken with !CONFIG_SMP?
Date	2016-05-06 13:50 +0200
Message-ID	<rvMqC-4be-13@gated-at.bofh.it> (permalink)
References	<rvBbQ-1tA-15@gated-at.bofh.it> <rvBvb-20s-7@gated-at.bofh.it> <rvBOy-2eS-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Fri, May 06, 2016 at 02:25:16AM +0200, Rafael J. Wysocki wrote:
> On Friday, May 06, 2016 02:09:07 AM Rafael J. Wysocki wrote:
> > On Thursday, May 05, 2016 04:49:22 PM Steve Muckle wrote:
> > > While working on a few patches for schedutil I noticed that the CFS
> > > cpufreq hooks depend on PELT, which depends on CONFIG_SMP.

> > For governors other than schedutil fixing that would be a matter of
> > adding a !CONFIG_SMP variant of update_load_avg() that will call
> > cpufreq_update_util() and do nothing else.  It doesn't matter what
> > is passed via util and max then.
> 
> Maybe something like the below, FWIW, as a quick fix for 4.6?

Right; I suppose that'll have to do for 4.6.

> ---
>  kernel/sched/fair.c |    9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> Index: linux-pm/kernel/sched/fair.c
> ===================================================================
> --- linux-pm.orig/kernel/sched/fair.c
> +++ linux-pm/kernel/sched/fair.c
> @@ -3030,7 +3030,14 @@ static int idle_balance(struct rq *this_
>  
>  #else /* CONFIG_SMP */
>  
> -static inline void update_load_avg(struct sched_entity *se, int update_tg) {}
> +static inline void update_load_avg(struct sched_entity *se, int not_used)
> +{
> +	struct cfs_rq *cfs_rq = cfs_rq_of(se);
> +	struct rq *rq = rq_of(cfs_rq);
> +
> +	cpufreq_trigger_update(rq_clock(rq));
> +}
> +
>  static inline void
>  enqueue_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) {}
>  static inline void
>

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

cpufreq governors broken with !CONFIG_SMP? Steve Muckle <steve.muckle@linaro.org> - 2016-05-06 01:50 +0200
  Re: cpufreq governors broken with !CONFIG_SMP? "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-05-06 02:10 +0200
    Re: cpufreq governors broken with !CONFIG_SMP? Steve Muckle <steve.muckle@linaro.org> - 2016-05-06 02:30 +0200
      Re: cpufreq governors broken with !CONFIG_SMP? "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-05-06 02:40 +0200
      Re: cpufreq governors broken with !CONFIG_SMP? Peter Zijlstra <peterz@infradead.org> - 2016-05-06 13:50 +0200
    Re: cpufreq governors broken with !CONFIG_SMP? "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-05-06 02:30 +0200
      Re: cpufreq governors broken with !CONFIG_SMP? "Rafael J. Wysocki" <rafael@kernel.org> - 2016-05-06 13:50 +0200
      Re: cpufreq governors broken with !CONFIG_SMP? Peter Zijlstra <peterz@infradead.org> - 2016-05-06 13:50 +0200

csiph-web