| Message ID | 1436293469-25707-28-git-send-email-morten.rasmussen@arm.com (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
Hi Morten, On Tue, Jul 07, 2015 at 07:24:10PM +0100, Morten Rasmussen wrote: > The idle-state of each cpu is currently pointed to by rq->idle_state but > there isn't any information in the struct cpuidle_state that can used to > look up the idle-state energy model data stored in struct > sched_group_energy. For this purpose is necessary to store the idle > state index as well. Ideally, the idle-state data should be unified. > > cc: Ingo Molnar <mingo@redhat.com> > cc: Peter Zijlstra <peterz@infradead.org> > > Signed-off-by: Morten Rasmussen <morten.rasmussen@arm.com> This patch should re-base with latest kernel; otherwise it will have conflict with below commits: 827a5ae sched / idle: Call default_idle_call() from cpuidle_enter_state() faad384 sched / idle: Call idle_set_state() from cpuidle_enter_state() bcf6ad8 sched / idle: Eliminate the "reflect" check from cpuidle_idle_call() 82f6632 sched / idle: Move the default idle call code to a separate function Thanks, Leo Yan -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Leo Yan, On Tue, Jul 21, 2015 at 02:41:10PM +0800, Leo Yan wrote: > Hi Morten, > > On Tue, Jul 07, 2015 at 07:24:10PM +0100, Morten Rasmussen wrote: > > The idle-state of each cpu is currently pointed to by rq->idle_state but > > there isn't any information in the struct cpuidle_state that can used to > > look up the idle-state energy model data stored in struct > > sched_group_energy. For this purpose is necessary to store the idle > > state index as well. Ideally, the idle-state data should be unified. > > > > cc: Ingo Molnar <mingo@redhat.com> > > cc: Peter Zijlstra <peterz@infradead.org> > > > > Signed-off-by: Morten Rasmussen <morten.rasmussen@arm.com> > > This patch should re-base with latest kernel; otherwise it will have > conflict with below commits: > > 827a5ae sched / idle: Call default_idle_call() from cpuidle_enter_state() > faad384 sched / idle: Call idle_set_state() from cpuidle_enter_state() > bcf6ad8 sched / idle: Eliminate the "reflect" check from cpuidle_idle_call() > 82f6632 sched / idle: Move the default idle call code to a separate function I will make sure to rebase the patches and hopefully make an updated branch available for those who want test the patches. Thanks, Morten -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index fefcb1f..6832fa1 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -151,6 +151,7 @@ static void cpuidle_idle_call(void) /* Take note of the planned idle state. */ idle_set_state(this_rq(), &drv->states[next_state]); + idle_set_state_idx(this_rq(), next_state); /* * Enter the idle state previously returned by the governor decision. @@ -161,6 +162,7 @@ static void cpuidle_idle_call(void) /* The cpu is no longer idle or about to enter idle. */ idle_set_state(this_rq(), NULL); + idle_set_state_idx(this_rq(), -1); if (entered_state == -EBUSY) goto use_default; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 9589d9e..c395559 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -701,6 +701,7 @@ struct rq { #ifdef CONFIG_CPU_IDLE /* Must be inspected within a rcu lock section */ struct cpuidle_state *idle_state; + int idle_state_idx; #endif }; @@ -1316,6 +1317,17 @@ static inline struct cpuidle_state *idle_get_state(struct rq *rq) WARN_ON(!rcu_read_lock_held()); return rq->idle_state; } + +static inline void idle_set_state_idx(struct rq *rq, int idle_state_idx) +{ + rq->idle_state_idx = idle_state_idx; +} + +static inline int idle_get_state_idx(struct rq *rq) +{ + WARN_ON(!rcu_read_lock_held()); + return rq->idle_state_idx; +} #else static inline void idle_set_state(struct rq *rq, struct cpuidle_state *idle_state) @@ -1326,6 +1338,15 @@ static inline struct cpuidle_state *idle_get_state(struct rq *rq) { return NULL; } + +static inline void idle_set_state_idx(struct rq *rq, int idle_state_idx) +{ +} + +static inline int idle_get_state_idx(struct rq *rq) +{ + return -1; +} #endif extern void sysrq_sched_debug_show(void);
The idle-state of each cpu is currently pointed to by rq->idle_state but there isn't any information in the struct cpuidle_state that can used to look up the idle-state energy model data stored in struct sched_group_energy. For this purpose is necessary to store the idle state index as well. Ideally, the idle-state data should be unified. cc: Ingo Molnar <mingo@redhat.com> cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Morten Rasmussen <morten.rasmussen@arm.com> --- kernel/sched/idle.c | 2 ++ kernel/sched/sched.h | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+)