p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpuidle: Fix idle time tracking 

Ville reported that on his Core2, which has TSC stop in idle, we would
always report very short idle durations. He tracked this down to
commit:

  e93e59ce5b ("cpuidle: Replace ktime_get() with local_clock()")

which replaces ktime_get() with local_clock().

Add a sched_clock_idle_wakeup_event() call, which will re-sync the
clock with ktime_get_ns() when TSC is unstable and no-op otherwise.

Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J . Wysocki <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Fixes: e93e59ce5b ("cpuidle: Replace ktime_get() with local_clock()")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Peter Zijlstra 2017-04-21 12:43:59 +02:00 committed by Ingo Molnar
parent 3067a33d5f
commit f9fccdb9ef
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/cpuidle/cpuidle.c
View File

@ -220,6 +220,7 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
entered_state = target_state->enter(dev, drv, index); entered_state = target_state->enter(dev, drv, index);
start_critical_timings(); start_critical_timings();
sched_clock_idle_wakeup_event();
time_end = ns_to_ktime(local_clock()); time_end = ns_to_ktime(local_clock());
trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu); trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);

11
kernel/sched/clock.c
View File

@ -410,14 +410,21 @@ void sched_clock_idle_sleep_event(void)
EXPORT_SYMBOL_GPL(sched_clock_idle_sleep_event); EXPORT_SYMBOL_GPL(sched_clock_idle_sleep_event);
/* /*
* We just idled; resync with ktime. (called with irqs disabled): * We just idled; resync with ktime.
*/ */
void sched_clock_idle_wakeup_event(void) void sched_clock_idle_wakeup_event(void)
{ {
if (timekeeping_suspended) unsigned long flags;
if (sched_clock_stable())
return; return;
if (unlikely(timekeeping_suspended))
return;
local_irq_save(flags);
sched_clock_tick(); sched_clock_tick();
local_irq_restore(flags);
} }
EXPORT_SYMBOL_GPL(sched_clock_idle_wakeup_event); EXPORT_SYMBOL_GPL(sched_clock_idle_wakeup_event);