Skip to contentSkip to conversation

x86/smpboot: Don't do mwait_play_dead() on AMD systems

PATCH In review Yazen Ghannam 3 participants 3 messages Apr 3, 2018 – Apr 26, 2018 x86

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 x86/smpboot: Don't do mwait_play_dead() on AMD systems

From: Yazen Ghannam <[email protected]>

Recent AMD systems support using MWAIT for C1 state. However, MWAIT will not allow deeper cstates than C1 on current systems.

With play_dead() we expect the OS to use the deepest state available. The deepest state available on AMD systems is reached through SystemIO or HALT. If MWAIT is available, we use it instead of the other methods, so we never reach the deepest state.

Don't try to use MWAIT to play_dead() on AMD systems. Instead, we'll use CPUIDLE to enter the deepest state advertised by firmware. If CPUIDLE is not available then we fallback to HALT.

---
Link:
https://lkml.kernel.org/r/[email protected]

v1->v2:
* Drop comment in code.

 arch/x86/kernel/smpboot.c | 2 ++
 1 file changed, 2 insertions(+)
arch/x86/kernel/smpboot.c +2 -0
index ff99e2b6fc54..12599e55e040 100644
@@ -1536,6 +1536,8 @@ static inline void mwait_play_dead(void)
 	void *mwait_ptr;
 	int i;
 
+	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+		return;
 	if (!this_cpu_has(X86_FEATURE_MWAIT))
 		return;
 	if (!this_cpu_has(X86_FEATURE_CLFLUSH))
Signature · 1 line
2.14.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 31 lines · Yazen Ghannam

From: Yazen Ghannam <[email protected]>

Recent AMD systems support using MWAIT for C1 state. However, MWAIT will not allow deeper cstates than C1 on current systems.

With play_dead() we expect the OS to use the deepest state available. The deepest state available on AMD systems is reached through SystemIO or HALT. If MWAIT is available, we use it instead of the other methods, so we never reach the deepest state.

Don't try to use MWAIT to play_dead() on AMD systems. Instead, we'll use CPUIDLE to enter the deepest state advertised by firmware. If CPUIDLE is not available then we fallback to HALT.

---
Link:
https://lkml.kernel.org/r/[email protected]

v1->v2:
* Drop comment in code.

 arch/x86/kernel/smpboot.c | 2 ++
 1 file changed, 2 insertions(+)
arch/x86/kernel/smpboot.c +0 -0
index ff99e2b6fc54..12599e55e040 100644

arch/x86/kernel/smpboot.c static inline void mwait_play_dead(void) · line 1543

Quoted 8 lines
arch/x86/kernel/smpboot.c +2 -0
@@ -1536,6 +1536,8 @@ static inline void mwait_play_dead(void)
 	void *mwait_ptr;
 	int i;
 
+	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+		return;
 	if (!this_cpu_has(X86_FEATURE_MWAIT))
 		return;
 	if (!this_cpu_has(X86_FEATURE_CLFLUSH))
Signature · 5 lines
Regards/Gruss,
    Boris.

SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
-- 
#2 lore raw

[tip:x86/urgent] x86/smpboot: Don't use mwait_play_dead() on AMD systems

In reply to Yazen Ghannam
x86/smpboot: Don't use mwait_play_dead() on AMD systems
Commit-ID:  da6fa7ef67f07108a1b0cb9fd9e7fcaabd39c051
Gitweb:     https://git.kernel.org/tip/da6fa7ef67f07108a1b0cb9fd9e7fcaabd39c051
Author:     Yazen Ghannam <[email protected]>
AuthorDate: Tue, 3 Apr 2018 09:02:28 -0500
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Thu, 26 Apr 2018 16:06:19 +0200

x86/smpboot: Don't use mwait_play_dead() on AMD systems

Recent AMD systems support using MWAIT for C1 state. However, MWAIT will not allow deeper cstates than C1 on current systems.

play_dead() expects to use the deepest state available. The deepest state available on AMD systems is reached through SystemIO or HALT. If MWAIT is available, it is preferred over the other methods, so the CPU never reaches the deepest possible state.

Don't try to use MWAIT to play_dead() on AMD systems. Instead, use CPUIDLE to enter the deepest state advertised by firmware. If CPUIDLE is not available then fallback to HALT.

---
 arch/x86/kernel/smpboot.c | 2 ++
 1 file changed, 2 insertions(+)
arch/x86/kernel/smpboot.c +2 -0
index 45175b81dd5b..0f1cbb042f49 100644
@@ -1571,6 +1571,8 @@ static inline void mwait_play_dead(void)
 	void *mwait_ptr;
 	int i;
 
+	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+		return;
 	if (!this_cpu_has(X86_FEATURE_MWAIT))
 		return;
 	if (!this_cpu_has(X86_FEATURE_CLFLUSH))