x86/CPU: Improve AMD Erratum 400 workaround
Subsystems (7)
Borislav Petkov
maintainercover x86/CPU: Improve AMD Erratum 400 workaround
From: Borislav Petkov <[email protected]>
Hi,
here's the final version of the pile we've been working on for a while now, trying to remove that rdmsr on the idle path.
@jolsa: just wait until it lands in tip and then you can run it on your box.
Thanks.
Borislav Petkov (2):
x86/cpufeature: Provide helper to set bugs bits
x86/amd: Simplify AMD E400 aware idle routine
Thomas Gleixner (3):
x86/bugs: Separate AMD E400 erratum and C1E bug x86/amd: Check for the C1E bug post ACPI subsystem init
x86: Remove empty idle.h header
arch/x86/include/asm/acpi.h | 2 +- arch/x86/include/asm/apic.h | 1 - arch/x86/include/asm/cpufeature.h | 1 + arch/x86/include/asm/cpufeatures.h | 2 + arch/x86/include/asm/idle.h | 6 -- arch/x86/include/asm/processor.h | 3 +- arch/x86/kernel/apic/apic.c | 3 +- arch/x86/kernel/apic/io_apic.c | 1 - arch/x86/kernel/cpu/amd.c | 20 +++--- arch/x86/kernel/cpu/common.c | 1 - arch/x86/kernel/cpu/mcheck/mce_amd.c | 1 - arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 - arch/x86/kernel/cpu/mcheck/threshold.c | 1 - arch/x86/kernel/cpu/mshyperv.c | 1 - arch/x86/kernel/irq.c | 1 - arch/x86/kernel/irq_64.c | 1 - arch/x86/kernel/kvm.c | 1 - arch/x86/kernel/process.c | 102 +++++++++++++++---------------- arch/x86/kernel/process_32.c | 1 - arch/x86/kernel/process_64.c | 1 - arch/x86/kernel/smpboot.c | 2 - arch/x86/platform/uv/tlb_uv.c | 1 - drivers/acpi/processor_idle.c | 2 +- drivers/thermal/intel_powerclamp.c | 1 - drivers/xen/events/events_base.c | 1 - init/main.c | 3 + 26 files changed, 74 insertions(+), 87 deletions(-) delete mode 100644 arch/x86/include/asm/idle.h
Signature · 1 line
2.11.0
Borislav Petkov
maintainerPATCH 1/5 x86/cpufeature: Provide helper to set bugs bits
From: Borislav Petkov <[email protected]>
Will be used in a later patch to set bug bits for bugs which need late detection.
--- arch/x86/include/asm/cpufeature.h | 1 + 1 file changed, 1 insertion(+)
arch/x86/include/asm/cpufeature.h +1 -0
@@ -204,6 +204,7 @@ static __always_inline __pure bool _static_cpu_has(u16 bit)#define static_cpu_has_bug (bit) static_cpu_has((bit))#define boot_cpu_has_bug (bit) cpu_has_bug(&boot_cpu_data, (bit)) +#define boot_cpu_set_bug (bit) set_cpu_cap(&boot_cpu_data, (bit))#define MAX_CPU_FEATURES (NCAPINTS * 32)#define cpu_have_feature boot_cpu_has
Signature · 1 line
2.11.0
tip-bot for Borislav Petkov
merge bot[tip:x86/idle] x86/cpufeature: Provide helper to set bugs bits
x86/cpufeature: Provide helper to set bugs bits
Commit-ID: a588b9836447ac683a8f63949ad55265813826f5 Gitweb: http://git.kernel.org/tip/a588b9836447ac683a8f63949ad55265813826f5 Author: Borislav Petkov <[email protected]> AuthorDate: Fri, 9 Dec 2016 19:29:08 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 9 Dec 2016 21:23:20 +0100
x86/cpufeature: Provide helper to set bugs bits
Will be used in a later patch to set bug bits for bugs which need late detection.
--- arch/x86/include/asm/cpufeature.h | 1 + 1 file changed, 1 insertion(+)
arch/x86/include/asm/cpufeature.h +1 -0
@@ -204,6 +204,7 @@ static __always_inline __pure bool _static_cpu_has(u16 bit)#define static_cpu_has_bug (bit) static_cpu_has((bit))#define boot_cpu_has_bug (bit) cpu_has_bug(&boot_cpu_data, (bit)) +#define boot_cpu_set_bug (bit) set_cpu_cap(&boot_cpu_data, (bit))#define MAX_CPU_FEATURES (NCAPINTS * 32)#define cpu_have_feature boot_cpu_has
Borislav Petkov
maintainerPATCH 2/5 x86/bugs: Separate AMD E400 erratum and C1E bug
In reply to Borislav PetkovFrom: Thomas Gleixner <[email protected]>
We need two bits of information in order to properly apply the Erratum 400 workaround:
1. X86_BUG_AMD_E400 - to be able to select the proper idle routine
2. X86_BUG_AMD_APIC_C1E - to actually note that the platform we're currently running on is actually affected by E400.
I say "actually affected" because the bug manifests itself in LAPIC timer stopping in C1E. But the mere decision whether the platform enters C1E is made by the firmware. Thus the dancing through hoops we're doing with this series.
IOW, if the platform firmware decides *not* to enable C1E, we're not affected even if the CPU f/m/s is among the affected ones - we just don't enter C1E.
--- arch/x86/include/asm/cpufeatures.h | 2 ++ arch/x86/kernel/cpu/amd.c | 20 +++++++++++++------- arch/x86/kernel/process.c | 3 +-- 3 files changed, 16 insertions(+), 9 deletions(-)
arch/x86/include/asm/cpufeatures.h +2 -0
@@ -319,4 +319,6 @@#define X86_BUG_NULL_SEG X86_BUG(10)/* Nulling a selector preserves the base */ #define X86_BUG_SWAPGS_FENCE X86_BUG(11)/* SWAPGS without input dep on GS */ #define X86_BUG_MONITOR X86_BUG(12)/* IPI required to wake up remote CPU */ +#define X86_BUG_AMD_E400 X86_BUG(13)/* CPU is among the affected by Erratum 400 */ +#endif /* _ASM_X86_CPUFEATURES_H */
arch/x86/kernel/cpu/amd.c +13 -7
@@ -20,6 +20,10 @@#include "cpu.h" +static const int amd_erratum_383[]; +static const int amd_erratum_400[]; +static bool cpu_has_amd_erratum (struct cpuinfo_x86 *cpu,const int *erratum); +/* * nodes_per_socket: Stores the number of nodes per socket. * Refer to Fam15h Models 00-0fh BKDG - CPUID Fn8000_001E_ECX
@@ -592,11 +596,16 @@ static void early_init_amd(struct cpuinfo_x86 *c)/* F16h erratum 793, CVE-2013-6885 */ if (c->x86 ==0x16 && c->x86_model <=0xf )msr_set_bit (MSR_AMD64_LS_CFG ,15 ); -} -static const int amd_erratum_383[]; -static const int amd_erratum_400[]; -static bool cpu_has_amd_erratum (struct cpuinfo_x86 *cpu,const int *erratum); +/* +* Check whether the machine is affected by erratum 400. This is +* used to select the proper idle routine and to enable the check +* whether the machine is affected in arch_post_acpi_init(), which +* sets the X86_BUG_AMD_APIC_C1E bug depending on the MSR check. +*/ +if (cpu_has_amd_erratum (c, amd_erratum_400)) +set_cpu_bug (c,X86_BUG_AMD_E400 ); +}static void init_amd_k8 (struct cpuinfo_x86 *c) {
@@ -777,9 +786,6 @@ static void init_amd(struct cpuinfo_x86 *c)if (c->x86 >0x11 )set_cpu_cap (c,X86_FEATURE_ARAT ); -if (cpu_has_amd_erratum (c, amd_erratum_400)) -set_cpu_bug (c,X86_BUG_AMD_APIC_C1E ); -rdmsr_safe (MSR_AMD64_PATCH_LEVEL , &c->microcode, &dummy);/* 3DNow or LM implies PREFETCHW */
arch/x86/kernel/process.c +1 -2
@@ -402,8 +402,7 @@ void select_idle_routine(const struct cpuinfo_x86 *c)if (x86_idle || boot_option_idle_override ==IDLE_POLL )return ; -if (cpu_has_bug (c,X86_BUG_AMD_APIC_C1E )) { -/* E400: APIC timer interrupt does not wake up CPU from C1e */ +if (boot_cpu_has_bug (X86_BUG_AMD_E400 )) {pr_info ("using AMD E400 aware idle routine\n" ); x86_idle = amd_e400_idle; }else if (prefer_mwait_c1_over_halt (c)) {
Signature · 1 line
2.11.0
tip-bot for Thomas Gleixner
merge bot[tip:x86/idle] x86/bugs: Separate AMD E400 erratum and C1E bug
x86/bugs: Separate AMD E400 erratum and C1E bug
Commit-ID: 3344ed30791af66dbbad5f375008f3d1863b6c99 Gitweb: http://git.kernel.org/tip/3344ed30791af66dbbad5f375008f3d1863b6c99 Author: Thomas Gleixner <[email protected]> AuthorDate: Fri, 9 Dec 2016 19:29:09 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 9 Dec 2016 21:23:20 +0100
x86/bugs: Separate AMD E400 erratum and C1E bug
The workaround for the AMD Erratum E400 (Local APIC timer stops in C1E state) is a two step process:
- Selection of the E400 aware idle routine
- Detection whether the platform is affected
The idle routine selection happens for possibly affected CPUs depending on family/model/stepping information. These range of CPUs is not necessarily affected as the decision whether to enable the C1E feature is made by the firmware. Unfortunately there is no way to query this at early boot.
The current implementation polls a MSR in the E400 aware idle routine to detect whether the CPU is affected. This is inefficient on non affected CPUs because every idle entry has to do the MSR read.
There is a better way to detect this before going idle for the first time which requires to seperate the bug flags:
X86_BUG_AMD_E400 - Selects the E400 aware idle routine and
enables the detection
X86_BUG_AMD_APIC_C1E - Set when the platform is affected by E400
Replace the current X86_BUG_AMD_APIC_C1E usage by the new X86_BUG_AMD_E400 bug bit to select the idle routine which currently does an unconditional detection poll. X86_BUG_AMD_APIC_C1E is going to be used in later patches to remove the MSR polling and simplify the handling of this misfeature.
--- arch/x86/include/asm/cpufeatures.h | 2 ++ arch/x86/kernel/cpu/amd.c | 20 +++++++++++++------- arch/x86/kernel/process.c | 3 +-- 3 files changed, 16 insertions(+), 9 deletions(-)
arch/x86/include/asm/cpufeatures.h +2 -0
@@ -311,4 +311,6 @@#define X86_BUG_NULL_SEG X86_BUG(10)/* Nulling a selector preserves the base */ #define X86_BUG_SWAPGS_FENCE X86_BUG(11)/* SWAPGS without input dep on GS */ #define X86_BUG_MONITOR X86_BUG(12)/* IPI required to wake up remote CPU */ +#define X86_BUG_AMD_E400 X86_BUG(13)/* CPU is among the affected by Erratum 400 */ +#endif /* _ASM_X86_CPUFEATURES_H */
arch/x86/kernel/cpu/amd.c +13 -7
@@ -20,6 +20,10 @@#include "cpu.h" +static const int amd_erratum_383[]; +static const int amd_erratum_400[]; +static bool cpu_has_amd_erratum (struct cpuinfo_x86 *cpu,const int *erratum); +/* * nodes_per_socket: Stores the number of nodes per socket. * Refer to Fam15h Models 00-0fh BKDG - CPUID Fn8000_001E_ECX
@@ -589,11 +593,16 @@ static void early_init_amd(struct cpuinfo_x86 *c)/* F16h erratum 793, CVE-2013-6885 */ if (c->x86 ==0x16 && c->x86_model <=0xf )msr_set_bit (MSR_AMD64_LS_CFG ,15 ); -} -static const int amd_erratum_383[]; -static const int amd_erratum_400[]; -static bool cpu_has_amd_erratum (struct cpuinfo_x86 *cpu,const int *erratum); +/* +* Check whether the machine is affected by erratum 400. This is +* used to select the proper idle routine and to enable the check +* whether the machine is affected in arch_post_acpi_init(), which +* sets the X86_BUG_AMD_APIC_C1E bug depending on the MSR check. +*/ +if (cpu_has_amd_erratum (c, amd_erratum_400)) +set_cpu_bug (c,X86_BUG_AMD_E400 ); +}static void init_amd_k8 (struct cpuinfo_x86 *c) {
@@ -774,9 +783,6 @@ static void init_amd(struct cpuinfo_x86 *c)if (c->x86 >0x11 )set_cpu_cap (c,X86_FEATURE_ARAT ); -if (cpu_has_amd_erratum (c, amd_erratum_400)) -set_cpu_bug (c,X86_BUG_AMD_APIC_C1E ); -rdmsr_safe (MSR_AMD64_PATCH_LEVEL , &c->microcode, &dummy);/* 3DNow or LM implies PREFETCHW */
arch/x86/kernel/process.c +1 -2
@@ -401,8 +401,7 @@ void select_idle_routine(const struct cpuinfo_x86 *c)if (x86_idle || boot_option_idle_override ==IDLE_POLL )return ; -if (cpu_has_bug (c,X86_BUG_AMD_APIC_C1E )) { -/* E400: APIC timer interrupt does not wake up CPU from C1e */ +if (boot_cpu_has_bug (X86_BUG_AMD_E400 )) {pr_info ("using AMD E400 aware idle routine\n" ); x86_idle = amd_e400_idle; }else if (prefer_mwait_c1_over_halt (c)) {
Borislav Petkov
maintainerPATCH 3/5 x86/amd: Check for the C1E bug post ACPI subsystem init
In reply to Borislav PetkovFrom: Thomas Gleixner <[email protected]>
AMD CPUs affected by the E400 erratum suffer from the issue that the local APIC timer stops when the CPU goes into C1E. Unfortunately there is no way to detect the affected CPUs on early boot. It's only possible to determine the range of possibly affected CPUs from the family/model range.
The actual decision whether to enter C1E and thus cause the bug is done by the firmware and we need to detect that case late, after ACPI has been initialized.
The current solution is to check in the idle routine whether the CPU is affected by reading the MSR_K8_INT_PENDING_MSG MSR and checking for the K8_INTP_C1E_ACTIVE_MASK bits. If one of the bits is set then the CPU is affected and the system is switched into forced broadcast mode.
This is ineffective and on non-affected CPUs every entry to idle does the extra RDMSR.
After doing some research it turns out that the bits are visible on the boot CPU right after the ACPI subsystem is initialized in the early boot process. So instead of polling for the bits in the idle loop, add a detection function after acpi_subsystem_init() and check for the MSR bits. If set, then the X86_BUG_AMD_APIC_C1E is set on the boot CPU and the TSC is marked unstable when X86_FEATURE_NONSTOP_TSC is not set as it will stop in C1E state as well.
The switch to broadcast mode cannot be done at this point because the boot CPU still uses HPET as a clockevent device and the local APIC timer is not yet calibrated and installed. The switch to broadcast mode on the affected CPUs needs to be done when the local APIC timer is actually set up.
This allows to cleanup the amd_e400_idle() function in the next step.
--- arch/x86/kernel/process.c | 23 +++++++++++++++++++++++ init/main.c | 3 +++ 2 files changed, 26 insertions(+)
arch/x86/kernel/process.c +23 -0
@@ -419,6 +419,29 @@ void __init init_amd_e400_c1e_mask(void)zalloc_cpumask_var (&amd_e400_c1e_mask,GFP_KERNEL ); } +void __init arch_post_acpi_subsys_init (void ) +{ +u32 lo, hi; + +if (!boot_cpu_has_bug (X86_BUG_AMD_E400 )) +return ; + +/* +* AMD E400 detection needs to happen after ACPI has been enabled. If +* the machine is affected K8_INTP_C1E_ACTIVE_MASK bits are set in +* MSR_K8_INT_PENDING_MSG. +*/ +rdmsr (MSR_K8_INT_PENDING_MSG , lo, hi); +if (!(lo &K8_INTP_C1E_ACTIVE_MASK )) +return ; + +boot_cpu_set_bug (X86_BUG_AMD_APIC_C1E ); + +if (!boot_cpu_has (X86_FEATURE_NONSTOP_TSC )) +mark_tsc_unstable ("TSC halt in AMD C1E" ); +pr_info ("System has AMD C1E enabled\n" ); +} +static int __init idle_setup (char *str) {if (!str)
init/main.c +3 -0
@@ -448,6 +448,8 @@ void __init parse_early_param(void) done =1 ; } +void __init __weak arch_post_acpi_subsys_init (void ) { } +void __init __weak smp_setup_processor_id (void ) { }
@@ -649,6 +651,7 @@ asmlinkage __visible void __init start_kernel(void)check_bugs ();acpi_subsystem_init (); +arch_post_acpi_subsys_init ();sfi_init_late ();if (efi_enabled (EFI_RUNTIME_SERVICES )) {
Signature · 1 line
2.11.0
tip-bot for Thomas Gleixner
merge bot[tip:x86/idle] x86/amd: Check for the C1E bug post ACPI subsystem init
x86/amd: Check for the C1E bug post ACPI subsystem init
Commit-ID: e7ff3a47630d9512d0bcbdfa73660021087ba445 Gitweb: http://git.kernel.org/tip/e7ff3a47630d9512d0bcbdfa73660021087ba445 Author: Thomas Gleixner <[email protected]> AuthorDate: Fri, 9 Dec 2016 19:29:10 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 9 Dec 2016 21:23:21 +0100
x86/amd: Check for the C1E bug post ACPI subsystem init
AMD CPUs affected by the E400 erratum suffer from the issue that the local APIC timer stops when the CPU goes into C1E. Unfortunately there is no way to detect the affected CPUs on early boot. It's only possible to determine the range of possibly affected CPUs from the family/model range.
The actual decision whether to enter C1E and thus cause the bug is done by the firmware and we need to detect that case late, after ACPI has been initialized.
The current solution is to check in the idle routine whether the CPU is affected by reading the MSR_K8_INT_PENDING_MSG MSR and checking for the K8_INTP_C1E_ACTIVE_MASK bits. If one of the bits is set then the CPU is affected and the system is switched into forced broadcast mode.
This is ineffective and on non-affected CPUs every entry to idle does the extra RDMSR.
After doing some research it turns out that the bits are visible on the boot CPU right after the ACPI subsystem is initialized in the early boot process. So instead of polling for the bits in the idle loop, add a detection function after acpi_subsystem_init() and check for the MSR bits. If set, then the X86_BUG_AMD_APIC_C1E is set on the boot CPU and the TSC is marked unstable when X86_FEATURE_NONSTOP_TSC is not set as it will stop in C1E state as well.
The switch to broadcast mode cannot be done at this point because the boot CPU still uses HPET as a clockevent device and the local APIC timer is not yet calibrated and installed. The switch to broadcast mode on the affected CPUs needs to be done when the local APIC timer is actually set up.
This allows to cleanup the amd_e400_idle() function in the next step.
--- arch/x86/kernel/process.c | 23 +++++++++++++++++++++++ init/main.c | 3 +++ 2 files changed, 26 insertions(+)
arch/x86/kernel/process.c +23 -0
@@ -418,6 +418,29 @@ void __init init_amd_e400_c1e_mask(void)zalloc_cpumask_var (&amd_e400_c1e_mask,GFP_KERNEL ); } +void __init arch_post_acpi_subsys_init (void ) +{ +u32 lo, hi; + +if (!boot_cpu_has_bug (X86_BUG_AMD_E400 )) +return ; + +/* +* AMD E400 detection needs to happen after ACPI has been enabled. If +* the machine is affected K8_INTP_C1E_ACTIVE_MASK bits are set in +* MSR_K8_INT_PENDING_MSG. +*/ +rdmsr (MSR_K8_INT_PENDING_MSG , lo, hi); +if (!(lo &K8_INTP_C1E_ACTIVE_MASK )) +return ; + +boot_cpu_set_bug (X86_BUG_AMD_APIC_C1E ); + +if (!boot_cpu_has (X86_FEATURE_NONSTOP_TSC )) +mark_tsc_unstable ("TSC halt in AMD C1E" ); +pr_info ("System has AMD C1E enabled\n" ); +} +static int __init idle_setup (char *str) {if (!str)
init/main.c +3 -0
@@ -448,6 +448,8 @@ void __init parse_early_param(void) done =1 ; } +void __init __weak arch_post_acpi_subsys_init (void ) { } +void __init __weak smp_setup_processor_id (void ) { }
@@ -649,6 +651,7 @@ asmlinkage __visible void __init start_kernel(void)check_bugs ();acpi_subsystem_init (); +arch_post_acpi_subsys_init ();sfi_init_late ();if (efi_enabled (EFI_RUNTIME_SERVICES )) {
Borislav Petkov
maintainerPATCH 4/5 x86/amd: Simplify AMD E400 aware idle routine
In reply to Borislav PetkovReorganize the E400 detection now that we have everything in place:
switch the CPUs to broadcast mode after the LAPIC has been initialized and remove the facilities that were used previously on the idle path.
We can't use static_cpu_has_bug() on the idle path because alternatives have been applied already and the test will be always false. boot_cpu_has_bug() is still faster than reading the MSR each time. Besides, we're on the idle path...
--- arch/x86/include/asm/acpi.h | 2 +- arch/x86/include/asm/idle.h | 2 -- arch/x86/include/asm/processor.h | 3 +- arch/x86/kernel/apic/apic.c | 2 ++ arch/x86/kernel/cpu/common.c | 1 - arch/x86/kernel/process.c | 75 ++++++++++++++-------------------------- arch/x86/kernel/smpboot.c | 1 - drivers/acpi/processor_idle.c | 2 +- 8 files changed, 31 insertions(+), 57 deletions(-)
arch/x86/include/asm/acpi.h +1 -1
@@ -94,7 +94,7 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate) boot_cpu_data.x86_model <= 0x05 && boot_cpu_data.x86_mask < 0x0A)return 1 ; - else if (amd_e400_c1e_detected) + else if (boot_cpu_has(X86_BUG_AMD_APIC_C1E)) return 1; else return max_cstate;
arch/x86/include/asm/idle.h +0 -2
@@ -1,6 +1,4 @@#ifndef _ASM_X86_IDLE_H#define _ASM_X86_IDLE_H -void amd_e400_remove_cpu (int cpu); -#endif /* _ASM_X86_IDLE_H */
arch/x86/include/asm/processor.h +1 -2
@@ -633,10 +633,9 @@ static inline void sync_core(void) }extern void select_idle_routine (const struct cpuinfo_x86 *c); -extern void init_amd_e400_c1e_mask (void ); +extern void amd_e400_c1e_apic_setup (void );extern unsigned long boot_option_idle_override; -extern bool amd_e400_c1e_detected;enum idle_boot_override {IDLE_NO_OVERRIDE =0 ,IDLE_HALT ,IDLE_NOMWAIT ,IDLE_POLL };
arch/x86/kernel/apic/apic.c +2 -0
@@ -894,11 +894,13 @@ void __init setup_boot_APIC_clock(void)/* Setup the lapic or request the broadcast */ setup_APIC_timer (); +amd_e400_c1e_apic_setup (); }void setup_secondary_APIC_clock (void ) {setup_APIC_timer (); +amd_e400_c1e_apic_setup (); }/*
arch/x86/kernel/cpu/common.c +0 -1
@@ -1172,7 +1172,6 @@ void enable_sep_cpu(void)void __init identify_boot_cpu (void ) {identify_cpu (&boot_cpu_data); -init_amd_e400_c1e_mask ();#ifdef CONFIG_X86_32 sysenter_setup ();enable_sep_cpu ();
arch/x86/kernel/process.c +26 -49
96 lines not on this page · raw message
arch/x86/kernel/smpboot.c +0 -1
@@ -1596,7 +1596,6 @@ void play_dead_common(void) {idle_task_exit ();reset_lazy_tlbstate (); -amd_e400_remove_cpu (raw_smp_processor_id ());/* Ack it */ (void )cpu_report_death ();
drivers/acpi/processor_idle.c +1 -1
@@ -141,7 +141,7 @@ static void lapic_timer_check_state(int state, struct acpi_processor *pr,if (cpu_has (&cpu_data (pr->id),X86_FEATURE_ARAT ))return ; -if (amd_e400_c1e_detected) +if (boot_cpu_has_bug (X86_BUG_AMD_APIC_C1E )) type =ACPI_STATE_C1 ;/*
Signature · 1 line
2.11.0
tip-bot for Borislav Petkov
merge bot[tip:x86/idle] x86/amd: Simplify AMD E400 aware idle routine
x86/amd: Simplify AMD E400 aware idle routine
Commit-ID: 07c94a38125376d70d156bd8bff98ddfe4c8ea95 Gitweb: http://git.kernel.org/tip/07c94a38125376d70d156bd8bff98ddfe4c8ea95 Author: Borislav Petkov <[email protected]> AuthorDate: Fri, 9 Dec 2016 19:29:11 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 9 Dec 2016 21:23:21 +0100
x86/amd: Simplify AMD E400 aware idle routine
Reorganize the E400 detection now that we have everything in place:
switch the CPUs to broadcast mode after the LAPIC has been initialized and remove the facilities that were used previously on the idle path.
Unfortunately static_cpu_has_bug() cannpt be used in the E400 idle routine because alternatives have been applied when the actual detection happens, so the static switching does not take effect and the test will stay false. Use boot_cpu_has_bug() instead which is definitely an improvement over the RDMSR and the cpumask handling.
--- arch/x86/include/asm/acpi.h | 2 +- arch/x86/include/asm/processor.h | 3 +- arch/x86/kernel/apic/apic.c | 2 ++ arch/x86/kernel/cpu/common.c | 1 - arch/x86/kernel/process.c | 75 ++++++++++++++-------------------------- arch/x86/kernel/smpboot.c | 1 - drivers/acpi/processor_idle.c | 2 +- 7 files changed, 31 insertions(+), 55 deletions(-)
arch/x86/include/asm/acpi.h +1 -1
@@ -94,7 +94,7 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate) boot_cpu_data.x86_model <= 0x05 && boot_cpu_data.x86_mask < 0x0A)return 1 ; - else if (amd_e400_c1e_detected) + else if (boot_cpu_has(X86_BUG_AMD_APIC_C1E)) return 1; else return max_cstate;
arch/x86/include/asm/processor.h +1 -2
@@ -621,10 +621,9 @@ static inline void sync_core(void) }extern void select_idle_routine (const struct cpuinfo_x86 *c); -extern void init_amd_e400_c1e_mask (void ); +extern void amd_e400_c1e_apic_setup (void );extern unsigned long boot_option_idle_override; -extern bool amd_e400_c1e_detected;enum idle_boot_override {IDLE_NO_OVERRIDE =0 ,IDLE_HALT ,IDLE_NOMWAIT ,IDLE_POLL };
arch/x86/kernel/apic/apic.c +2 -0
@@ -894,11 +894,13 @@ void __init setup_boot_APIC_clock(void)/* Setup the lapic or request the broadcast */ setup_APIC_timer (); +amd_e400_c1e_apic_setup (); }void setup_secondary_APIC_clock (void ) {setup_APIC_timer (); +amd_e400_c1e_apic_setup (); }/*
arch/x86/kernel/cpu/common.c +0 -1
@@ -1144,7 +1144,6 @@ void enable_sep_cpu(void)void __init identify_boot_cpu (void ) {identify_cpu (&boot_cpu_data); -init_amd_e400_c1e_mask ();#ifdef CONFIG_X86_32 sysenter_setup ();enable_sep_cpu ();
arch/x86/kernel/process.c +26 -49
96 lines not on this page · raw message
arch/x86/kernel/smpboot.c +0 -1
@@ -1575,7 +1575,6 @@ void play_dead_common(void) {idle_task_exit ();reset_lazy_tlbstate (); -amd_e400_remove_cpu (raw_smp_processor_id ());/* Ack it */ (void )cpu_report_death ();
drivers/acpi/processor_idle.c +1 -1
@@ -141,7 +141,7 @@ static void lapic_timer_check_state(int state, struct acpi_processor *pr,if (cpu_has (&cpu_data (pr->id),X86_FEATURE_ARAT ))return ; -if (amd_e400_c1e_detected) +if (boot_cpu_has_bug (X86_BUG_AMD_APIC_C1E )) type =ACPI_STATE_C1 ;/*
Borislav Petkov
maintainerPATCH 5/5 x86: Remove empty idle.h header
In reply to Borislav PetkovFrom: Thomas Gleixner <[email protected]>
One include less is always a good thing(tm). Good riddance.
--- arch/x86/include/asm/apic.h | 1 - arch/x86/include/asm/idle.h | 4 ---- arch/x86/kernel/apic/apic.c | 1 - arch/x86/kernel/apic/io_apic.c | 1 - arch/x86/kernel/cpu/mcheck/mce_amd.c | 1 - arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 - arch/x86/kernel/cpu/mcheck/threshold.c | 1 - arch/x86/kernel/cpu/mshyperv.c | 1 - arch/x86/kernel/irq.c | 1 - arch/x86/kernel/irq_64.c | 1 - arch/x86/kernel/kvm.c | 1 - arch/x86/kernel/process.c | 1 - arch/x86/kernel/process_32.c | 1 - arch/x86/kernel/process_64.c | 1 - arch/x86/kernel/smpboot.c | 1 - arch/x86/platform/uv/tlb_uv.c | 1 - drivers/thermal/intel_powerclamp.c | 1 - drivers/xen/events/events_base.c | 1 - 18 files changed, 21 deletions(-) delete mode 100644 arch/x86/include/asm/idle.h
arch/x86/include/asm/apic.h +0 -1
@@ -11,7 +11,6 @@#include <asm/fixmap.h> #include <asm/mpspec.h> #include <asm/msr.h> -#include <asm/idle.h> #define ARCH_APICTIMER_STOPS_ON_C3 1
arch/x86/include/asm/idle.h deleted +0 -4
@@ -1,4 +0,0 @@ -#ifndef _ASM_X86_IDLE_H -#define _ASM_X86_IDLE_H - -#endif /* _ASM_X86_IDLE_H */
arch/x86/kernel/apic/apic.c +0 -1
@@ -48,7 +48,6 @@#include <asm/io_apic.h> #include <asm/desc.h> #include <asm/hpet.h> -#include <asm/idle.h> #include <asm/mtrr.h> #include <asm/time.h> #include <asm/smp.h>
arch/x86/kernel/apic/io_apic.c +0 -1
@@ -48,7 +48,6 @@#include <linux/bootmem.h> #include <asm/irqdomain.h> -#include <asm/idle.h> #include <asm/io.h> #include <asm/smp.h> #include <asm/cpu.h>
arch/x86/kernel/cpu/mcheck/mce_amd.c +0 -1
@@ -24,7 +24,6 @@#include <asm/amd_nb.h> #include <asm/apic.h> -#include <asm/idle.h> #include <asm/mce.h> #include <asm/msr.h> #include <asm/trace/irq_vectors.h>
arch/x86/kernel/cpu/mcheck/therm_throt.c +0 -1
@@ -26,7 +26,6 @@#include <asm/processor.h> #include <asm/apic.h> -#include <asm/idle.h> #include <asm/mce.h> #include <asm/msr.h> #include <asm/trace/irq_vectors.h>
arch/x86/kernel/cpu/mcheck/threshold.c +0 -1
@@ -6,7 +6,6 @@#include <asm/irq_vectors.h> #include <asm/apic.h> -#include <asm/idle.h> #include <asm/mce.h> #include <asm/trace/irq_vectors.h>
arch/x86/kernel/cpu/mshyperv.c +0 -1
@@ -25,7 +25,6 @@#include <asm/hyperv.h> #include <asm/mshyperv.h> #include <asm/desc.h> -#include <asm/idle.h> #include <asm/irq_regs.h> #include <asm/i8259.h> #include <asm/apic.h>
arch/x86/kernel/irq.c +0 -1
@@ -14,7 +14,6 @@#include <asm/apic.h> #include <asm/io_apic.h> #include <asm/irq.h> -#include <asm/idle.h> #include <asm/mce.h> #include <asm/hw_irq.h> #include <asm/desc.h>
arch/x86/kernel/irq_64.c +0 -1
@@ -16,7 +16,6 @@#include <linux/uaccess.h> #include <linux/smp.h> #include <asm/io_apic.h> -#include <asm/idle.h> #include <asm/apic.h> int sysctl_panic_on_stackoverflow;
arch/x86/kernel/kvm.c +0 -1
@@ -42,7 +42,6 @@#include <asm/traps.h> #include <asm/desc.h> #include <asm/tlbflush.h> -#include <asm/idle.h> #include <asm/apic.h> #include <asm/apicdef.h> #include <asm/hypervisor.h>
arch/x86/kernel/process.c +0 -1
@@ -23,7 +23,6 @@#include <asm/cpu.h> #include <asm/apic.h> #include <asm/syscalls.h> -#include <asm/idle.h> #include <asm/uaccess.h> #include <asm/mwait.h> #include <asm/fpu/internal.h>
arch/x86/kernel/process_32.c +0 -1
@@ -49,7 +49,6 @@#include <asm/tlbflush.h> #include <asm/cpu.h> -#include <asm/idle.h> #include <asm/syscalls.h> #include <asm/debugreg.h> #include <asm/switch_to.h>
arch/x86/kernel/process_64.c +0 -1
@@ -44,7 +44,6 @@#include <asm/desc.h> #include <asm/proto.h> #include <asm/ia32.h> -#include <asm/idle.h> #include <asm/syscalls.h> #include <asm/debugreg.h> #include <asm/switch_to.h>
arch/x86/kernel/smpboot.c +0 -1
@@ -58,7 +58,6 @@#include <asm/desc.h> #include <asm/nmi.h> #include <asm/irq.h> -#include <asm/idle.h> #include <asm/realmode.h> #include <asm/cpu.h> #include <asm/numa.h>
arch/x86/platform/uv/tlb_uv.c +0 -1
@@ -19,7 +19,6 @@#include <asm/uv/uv_hub.h> #include <asm/uv/uv_bau.h> #include <asm/apic.h> -#include <asm/idle.h> #include <asm/tsc.h> #include <asm/irq_vectors.h> #include <asm/timer.h>
drivers/thermal/intel_powerclamp.c +0 -1
@@ -56,7 +56,6 @@#include <asm/msr.h> #include <asm/mwait.h> #include <asm/cpu_device_id.h> -#include <asm/idle.h> #include <asm/hardirq.h> #define MAX_TARGET_RATIO (50U)
drivers/xen/events/events_base.c +0 -1
@@ -37,7 +37,6 @@#include <asm/desc.h> #include <asm/ptrace.h> #include <asm/irq.h> -#include <asm/idle.h> #include <asm/io_apic.h> #include <asm/i8259.h> #include <asm/xen/pci.h>
Signature · 1 line
2.11.0
tip-bot for Thomas Gleixner
merge bot[tip:x86/idle] x86: Remove empty idle.h header
x86: Remove empty idle.h header
Commit-ID: 34bc3560c657d3d4fb17367ed9bfda803166dce0 Gitweb: http://git.kernel.org/tip/34bc3560c657d3d4fb17367ed9bfda803166dce0 Author: Thomas Gleixner <[email protected]> AuthorDate: Fri, 9 Dec 2016 19:29:12 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 9 Dec 2016 21:23:22 +0100
x86: Remove empty idle.h header
One include less is always a good thing(tm). Good riddance.
--- arch/x86/include/asm/apic.h | 1 - arch/x86/include/asm/idle.h | 6 ------ arch/x86/kernel/apic/apic.c | 1 - arch/x86/kernel/apic/io_apic.c | 1 - arch/x86/kernel/cpu/mcheck/mce_amd.c | 1 - arch/x86/kernel/cpu/mcheck/therm_throt.c | 1 - arch/x86/kernel/cpu/mcheck/threshold.c | 1 - arch/x86/kernel/cpu/mshyperv.c | 1 - arch/x86/kernel/irq.c | 1 - arch/x86/kernel/irq_64.c | 1 - arch/x86/kernel/kvm.c | 1 - arch/x86/kernel/process.c | 1 - arch/x86/kernel/process_32.c | 1 - arch/x86/kernel/process_64.c | 1 - arch/x86/kernel/smpboot.c | 1 - arch/x86/platform/uv/tlb_uv.c | 1 - drivers/thermal/intel_powerclamp.c | 1 - drivers/xen/events/events_base.c | 1 - 18 files changed, 23 deletions(-)
arch/x86/include/asm/apic.h +0 -1
@@ -11,7 +11,6 @@#include <asm/fixmap.h> #include <asm/mpspec.h> #include <asm/msr.h> -#include <asm/idle.h> #define ARCH_APICTIMER_STOPS_ON_C3 1
arch/x86/include/asm/idle.h deleted +0 -6
@@ -1,6 +0,0 @@ -#ifndef _ASM_X86_IDLE_H -#define _ASM_X86_IDLE_H - -void amd_e400_remove_cpu (int cpu); - -#endif /* _ASM_X86_IDLE_H */
arch/x86/kernel/apic/apic.c +0 -1
@@ -48,7 +48,6 @@#include <asm/io_apic.h> #include <asm/desc.h> #include <asm/hpet.h> -#include <asm/idle.h> #include <asm/mtrr.h> #include <asm/time.h> #include <asm/smp.h>
arch/x86/kernel/apic/io_apic.c +0 -1
@@ -48,7 +48,6 @@#include <linux/bootmem.h> #include <asm/irqdomain.h> -#include <asm/idle.h> #include <asm/io.h> #include <asm/smp.h> #include <asm/cpu.h>
arch/x86/kernel/cpu/mcheck/mce_amd.c +0 -1
@@ -24,7 +24,6 @@#include <asm/amd_nb.h> #include <asm/apic.h> -#include <asm/idle.h> #include <asm/mce.h> #include <asm/msr.h> #include <asm/trace/irq_vectors.h>
arch/x86/kernel/cpu/mcheck/therm_throt.c +0 -1
@@ -26,7 +26,6 @@#include <asm/processor.h> #include <asm/apic.h> -#include <asm/idle.h> #include <asm/mce.h> #include <asm/msr.h> #include <asm/trace/irq_vectors.h>
arch/x86/kernel/cpu/mcheck/threshold.c +0 -1
@@ -6,7 +6,6 @@#include <asm/irq_vectors.h> #include <asm/apic.h> -#include <asm/idle.h> #include <asm/mce.h> #include <asm/trace/irq_vectors.h>
arch/x86/kernel/cpu/mshyperv.c +0 -1
@@ -25,7 +25,6 @@#include <asm/hyperv.h> #include <asm/mshyperv.h> #include <asm/desc.h> -#include <asm/idle.h> #include <asm/irq_regs.h> #include <asm/i8259.h> #include <asm/apic.h>
arch/x86/kernel/irq.c +0 -1
@@ -14,7 +14,6 @@#include <asm/apic.h> #include <asm/io_apic.h> #include <asm/irq.h> -#include <asm/idle.h> #include <asm/mce.h> #include <asm/hw_irq.h> #include <asm/desc.h>
arch/x86/kernel/irq_64.c +0 -1
@@ -16,7 +16,6 @@#include <linux/uaccess.h> #include <linux/smp.h> #include <asm/io_apic.h> -#include <asm/idle.h> #include <asm/apic.h> int sysctl_panic_on_stackoverflow;
arch/x86/kernel/kvm.c +0 -1
@@ -42,7 +42,6 @@#include <asm/traps.h> #include <asm/desc.h> #include <asm/tlbflush.h> -#include <asm/idle.h> #include <asm/apic.h> #include <asm/apicdef.h> #include <asm/hypervisor.h>
arch/x86/kernel/process.c +0 -1
@@ -23,7 +23,6 @@#include <asm/cpu.h> #include <asm/apic.h> #include <asm/syscalls.h> -#include <asm/idle.h> #include <asm/uaccess.h> #include <asm/mwait.h> #include <asm/fpu/internal.h>
arch/x86/kernel/process_32.c +0 -1
@@ -49,7 +49,6 @@#include <asm/tlbflush.h> #include <asm/cpu.h> -#include <asm/idle.h> #include <asm/syscalls.h> #include <asm/debugreg.h> #include <asm/switch_to.h>
arch/x86/kernel/process_64.c +0 -1
@@ -44,7 +44,6 @@#include <asm/desc.h> #include <asm/proto.h> #include <asm/ia32.h> -#include <asm/idle.h> #include <asm/syscalls.h> #include <asm/debugreg.h> #include <asm/switch_to.h>
arch/x86/kernel/smpboot.c +0 -1
@@ -58,7 +58,6 @@#include <asm/desc.h> #include <asm/nmi.h> #include <asm/irq.h> -#include <asm/idle.h> #include <asm/realmode.h> #include <asm/cpu.h> #include <asm/numa.h>
arch/x86/platform/uv/tlb_uv.c +0 -1
@@ -19,7 +19,6 @@#include <asm/uv/uv_hub.h> #include <asm/uv/uv_bau.h> #include <asm/apic.h> -#include <asm/idle.h> #include <asm/tsc.h> #include <asm/irq_vectors.h> #include <asm/timer.h>
drivers/thermal/intel_powerclamp.c +0 -1
@@ -56,7 +56,6 @@#include <asm/msr.h> #include <asm/mwait.h> #include <asm/cpu_device_id.h> -#include <asm/idle.h> #include <asm/hardirq.h> #define MAX_TARGET_RATIO (50U)
drivers/xen/events/events_base.c +0 -1
@@ -37,7 +37,6 @@#include <asm/desc.h> #include <asm/ptrace.h> #include <asm/irq.h> -#include <asm/idle.h> #include <asm/io_apic.h> #include <asm/i8259.h> #include <asm/xen/pci.h>