Skip to contentSkip to conversation

Patch "x86/idle: Restore trace_cpu_idle to mwait_idle() calls" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Sep 11, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

x86/idle: Restore trace_cpu_idle to mwait_idle() calls

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
x86-idle-restore-trace_cpu_idle-to-mwait_idle-calls.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From e43d0189ac02415fe4487f79fc35e8f147e9ea0d Mon Sep 17 00:00:00 2001

From: Jisheng Zhang <[email protected]>
Date: Thu, 20 Aug 2015 12:54:39 +0800
Subject: x86/idle: Restore trace_cpu_idle to mwait_idle() calls

From: Jisheng Zhang <[email protected]>

commit e43d0189ac02415fe4487f79fc35e8f147e9ea0d upstream.

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
@@ -453,6 +453,7 @@ static int prefer_mwait_c1_over_halt(con
 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 *)&current_thread_info()->flags);
@@ -464,6 +465,7 @@ static void mwait_idle(void)
 			__sti_mwait(0, 0);
 		else
 			local_irq_enable();
+		trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());
 	} else {
 		local_irq_enable();
 	}

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/x86-idle-restore-trace_cpu_idle-to-mwait_idle-calls.patch