sched/idle/x86: add missing trace_cpu_idle to mwait_idle()
PATCH 1/1 sched/idle/x86: add missing trace_cpu_idle to mwait_idle()
Commit b253149b843f ("sched/idle/x86: Restore mwait_idle() to fix boot hangs, to improve power savings and to improve performance") restores mwait_idle(), but the trace_cpu_idle related callings are missing, this causes powertop on my old desktop powered by Intel Core2 E6550 reports zero wakeups and zero events.
After this patch, the powertop tool works again.
--- arch/x86/kernel/process.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/process.c +2 -0
@@ -408,6 +408,7 @@ static int prefer_mwait_c1_over_halt(const struct cpuinfo_x86 *c)static void mwait_idle (void ) {if (!current_set_polling_and_test ()) { +trace_cpu_idle_rcuidle (1 ,smp_processor_id ());if (this_cpu_has (X86_BUG_CLFLUSH_MONITOR )) {smp_mb ();/* quirk */ clflush ((void *)¤t_thread_info ()->flags);
@@ -419,6 +420,7 @@ static void mwait_idle(void)__sti_mwait (0 ,0 ); elselocal_irq_enable (); +trace_cpu_idle_rcuidle (PWR_EVENT_EXIT ,smp_processor_id ()); }else {local_irq_enable (); }
Signature · 1 line
2.5.0
tip-bot for Jisheng Zhang
merge bot[tip:x86/urgent] x86/idle: Restore trace_cpu_idle to mwait_idle() calls
x86/idle: Restore trace_cpu_idle to mwait_idle() calls
Commit-ID: e43d0189ac02415fe4487f79fc35e8f147e9ea0d Gitweb: http://git.kernel.org/tip/e43d0189ac02415fe4487f79fc35e8f147e9ea0d Author: Jisheng Zhang <[email protected]> AuthorDate: Thu, 20 Aug 2015 12:54:39 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 20 Aug 2015 21:37:45 +0200
x86/idle: Restore trace_cpu_idle to mwait_idle() calls
Commit b253149b843f ("sched/idle/x86: Restore mwait_idle() to fix boot hangs, to improve power savings and to improve performance") restores mwait_idle(), but the trace_cpu_idle related calls are missing. This causes powertop on my old desktop powered by Intel Core2 E6550 to report zero wakeups and zero events.
Add them back to restore the proper behaviour.
--- arch/x86/kernel/process.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/process.c +2 -0
@@ -408,6 +408,7 @@ static int prefer_mwait_c1_over_halt(const struct cpuinfo_x86 *c)static void mwait_idle (void ) {if (!current_set_polling_and_test ()) { +trace_cpu_idle_rcuidle (1 ,smp_processor_id ());if (this_cpu_has (X86_BUG_CLFLUSH_MONITOR )) {smp_mb ();/* quirk */ clflush ((void *)¤t_thread_info ()->flags);
@@ -419,6 +420,7 @@ static void mwait_idle(void)__sti_mwait (0 ,0 ); elselocal_irq_enable (); +trace_cpu_idle_rcuidle (PWR_EVENT_EXIT ,smp_processor_id ()); }else {local_irq_enable (); }