mce: prevent concurrent polling of MCE events
Subsystems (3)
PATCH v4 1/1 mce: prevent concurrent polling of MCE events
On Intel microarchitectures that support CMCI but have it disabled (BIOS, kernel option or CMCI storm code) the kernel will resort to polling for MCEs. In these microarchitectures the IMC registers are shared by all CPUs in the same package and despite the fact that the polling is set up in the kernel to prevent all CPUs to poll at the same time, it's still possible they'll overlap and report the same MCE multiple times.
This patch fixes this by introducing synchronization during polling only for the affected microarchitectures.
v4: get rid of unneeded variable on intel_cmci_poll_unlock() and simplify unserialize_mc_bank_access()
v3: add {,un}serialize_mc_bank_access() as intermediate functions as requested by Tony Luck
--- arch/x86/kernel/cpu/mce/core.c | 18 +++++++++++++++ arch/x86/kernel/cpu/mce/intel.c | 44 +++++++++++++++++++++++++++++++------ arch/x86/kernel/cpu/mce/internal.h | 4 +++ 3 files changed, 59 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/mce/core.c +18 -0
@@ -1578,6 +1578,22 @@ return 0; }#endif +static bool serialize_mc_bank_access (void ) +{ +if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL ) +return false; + +return intel_cmci_poll_lock (); +} + +static void unserialize_mc_bank_access (bool locked) +{ +if (!locked) +return ; + +intel_cmci_poll_unlock (); +} +/* * Periodic polling timer for "silent" machine check errors. If the * poller finds an MCE, poll 2x faster. When the poller finds no more
@@ -1618,7 +1634,9 @@ static void mce_timer_fn(struct timer_li iv =__this_cpu_read (mce_next_interval);if (mce_available (this_cpu_ptr (&cpu_info))) { +bool locked =serialize_mc_bank_access ();machine_check_poll (0 ,this_cpu_ptr (&mce_poll_banks)); +unserialize_mc_bank_access (locked);if (mce_intel_cmci_poll ()) { iv =mce_adjust_timer (iv);
arch/x86/kernel/cpu/mce/intel.c +37 -7
63 lines not on this page · raw message
arch/x86/kernel/cpu/mce/internal.h +4 -0
@@ -49,6 +49,8 @@ void intel_init_cmci(void);void intel_init_lmce (void );void intel_clear_lmce (void );bool intel_filter_mce (struct mce *m); +bool intel_cmci_poll_lock (void ); +void intel_cmci_poll_unlock (void );#else # define cmci_intel_adjust_timer mce_adjust_timer_defaultstatic inline bool mce_intel_cmci_poll (void ) {return false; }
@@ -58,6 +60,8 @@ static inline void intel_init_cmci(void)static inline void intel_init_lmce (void ) { }static inline void intel_clear_lmce (void ) { }static inline bool intel_filter_mce (struct mce *m) {return false; } +static inline bool intel_cmci_poll_lock (void ) {return false; } +static inline void intel_cmci_poll_unlock (void ) { }#endif void mce_timer_kick (unsigned long interval);
Signature · 1 line
Aristeu
Borislav Petkov
maintainerQuoted 20 lines · Aristeu Rozanski
On Intel microarchitectures that support CMCI but have it disabled (BIOS, kernel option or CMCI storm code) the kernel will resort to polling for MCEs. In these microarchitectures the IMC registers are shared by all CPUs in the same package and despite the fact that the polling is set up in the kernel to prevent all CPUs to poll at the same time, it's still possible they'll overlap and report the same MCE multiple times.
This patch fixes this by introducing synchronization during polling only for the affected microarchitectures.
v4: get rid of unneeded variable on
intel_cmci_poll_unlock()and simplifyunserialize_mc_bank_access()
v3: add {,un}serialize_mc_bank_access() as intermediate functions as requested by Tony LuckSigned-off-by Aristeu Rozanski <[email protected]>Reviewed-by Tony Luck <[email protected]>Cc Tony Luck <[email protected]>Cc Aristeu Rozanski <[email protected]>Cc Borislav Petkov <[email protected]>
Quoted 5 lines
--- arch/x86/kernel/cpu/mce/core.c | 18 +++++++++++++++ arch/x86/kernel/cpu/mce/intel.c | 44 +++++++++++++++++++++++++++++++------ arch/x86/kernel/cpu/mce/internal.h | 4 +++ 3 files changed, 59 insertions(+), 7 deletions(-)
Does this work?
---
arch/x86/kernel/cpu/mce/core.c +8 -1
@@ -1608,6 +1608,13 @@ static void __start_timer(struct timer_list *t, unsigned long interval)local_irq_restore (flags); } +static void mc_poll_banks_default (void ) +{ +machine_check_poll (0 ,this_cpu_ptr (&mce_poll_banks)); +} + +void (*mc_poll_banks)(void ) = mc_poll_banks_default; +static void mce_timer_fn (struct timer_list *t) {struct timer_list *cpu_t =this_cpu_ptr (&mce_timer);
@@ -1618,7 +1625,7 @@ static void mce_timer_fn(struct timer_list *t) iv =__this_cpu_read (mce_next_interval);if (mce_available (this_cpu_ptr (&cpu_info))) { -machine_check_poll (0 ,this_cpu_ptr (&mce_poll_banks)); +mc_poll_banks ();if (mce_intel_cmci_poll ()) { iv =mce_adjust_timer (iv);
arch/x86/kernel/cpu/mce/intel.c +18 -1
@@ -56,6 +56,13 @@ static DEFINE_PER_CPU(int, cmci_backoff_cnt);*/ static DEFINE_RAW_SPINLOCK (cmci_discover_lock); +/* +* On systems that do support CMCI but it's disabled, polling for MCEs can +* cause the same event to be reported multiple times because IA32_MCi_STATUS +* is shared by the same package. +*/ +static DEFINE_SPINLOCK (cmci_poll_lock); +#define CMCI_THRESHOLD 1#define CMCI_POLL_INTERVAL (30 * HZ)#define CMCI_STORM_INTERVAL (HZ)
@@ -426,12 +433,22 @@ void cmci_disable_bank(int bank)raw_spin_unlock_irqrestore (&cmci_discover_lock, flags); } +/* Bank polling function when CMCI is disabled. */ +static void cmci_mc_poll_banks (void ) +{ +spin_lock (&cmci_poll_lock); +machine_check_poll (0 ,this_cpu_ptr (&mce_poll_banks)); +spin_unlock (&cmci_poll_lock); +} +void intel_init_cmci (void ) {int banks; -if (!cmci_supported (&banks)) +if (!cmci_supported (&banks)) { + mc_poll_banks = cmci_mc_poll_banks;return ; + } mce_threshold_vector = intel_threshold_interrupt;cmci_discover (banks);
arch/x86/kernel/cpu/mce/internal.h +1 -0
@@ -274,4 +274,5 @@ static __always_inline u32 mca_msr_reg(int bank, enum mca_msr reg) return 0; } +extern void (*mc_poll_banks)(void );#endif /* __X86_MCE_INTERNAL_H__ */
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 1 line · Borislav Petkov
Does this work?
Yes. Much better. Thanks.
Signature · 1 line
Aristeu
Borislav Petkov
maintainerPATCH 1/1 x86/mce: Prevent duplicate error records
From: "Borislav Petkov (AMD)" <[email protected]>
Date: Wed, 19 Jul 2023 14:19:50 +0200
A legitimate use case of the MCA infrastructure is to have the firmware log all uncorrectable errors and also, have the OS see all correctable errors.
The uncorrectable, UCNA errors are usually configured to be reported through an SMI. CMCI, which is the correctable error reporting interrupt, uses SMI too and having both enabled, leads to unnecessary overhead.
So what ends up happening is, people disable CMCI in the wild and leave on only the UCNA SMI.
When CMCI is disabled, the MCA infrastructure resorts to polling the MCA banks. If a MCA MSR is shared between the logical threads, one error ends up getting logged multiple times as the polling runs on every logical thread.
Therefore, introduce locking on the Intel side of the polling routine to prevent such duplicate error records from appearing.
Based on a patch by Aristeu Rozanski <[email protected]>.
--- arch/x86/kernel/cpu/mce/core.c | 9 ++++++++- arch/x86/kernel/cpu/mce/intel.c | 19 ++++++++++++++++++- arch/x86/kernel/cpu/mce/internal.h | 1 + 3 files changed, 27 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/mce/core.c +8 -1
@@ -1608,6 +1608,13 @@ static void __start_timer(struct timer_list *t, unsigned long interval)local_irq_restore (flags); } +static void mc_poll_banks_default (void ) +{ +machine_check_poll (0 ,this_cpu_ptr (&mce_poll_banks)); +} + +void (*mc_poll_banks)(void ) = mc_poll_banks_default; +static void mce_timer_fn (struct timer_list *t) {struct timer_list *cpu_t =this_cpu_ptr (&mce_timer);
@@ -1618,7 +1625,7 @@ static void mce_timer_fn(struct timer_list *t) iv =__this_cpu_read (mce_next_interval);if (mce_available (this_cpu_ptr (&cpu_info))) { -machine_check_poll (0 ,this_cpu_ptr (&mce_poll_banks)); +mc_poll_banks ();if (mce_intel_cmci_poll ()) { iv =mce_adjust_timer (iv);
arch/x86/kernel/cpu/mce/intel.c +18 -1
@@ -56,6 +56,13 @@ static DEFINE_PER_CPU(int, cmci_backoff_cnt);*/ static DEFINE_RAW_SPINLOCK (cmci_discover_lock); +/* +* On systems that do support CMCI but it's disabled, polling for MCEs can +* cause the same event to be reported multiple times because IA32_MCi_STATUS +* is shared by the same package. +*/ +static DEFINE_SPINLOCK (cmci_poll_lock); +#define CMCI_THRESHOLD 1#define CMCI_POLL_INTERVAL (30 * HZ)#define CMCI_STORM_INTERVAL (HZ)
@@ -426,12 +433,22 @@ void cmci_disable_bank(int bank)raw_spin_unlock_irqrestore (&cmci_discover_lock, flags); } +/* Bank polling function when CMCI is disabled. */ +static void cmci_mc_poll_banks (void ) +{ +spin_lock (&cmci_poll_lock); +machine_check_poll (0 ,this_cpu_ptr (&mce_poll_banks)); +spin_unlock (&cmci_poll_lock); +} +void intel_init_cmci (void ) {int banks; -if (!cmci_supported (&banks)) +if (!cmci_supported (&banks)) { + mc_poll_banks = cmci_mc_poll_banks;return ; + } mce_threshold_vector = intel_threshold_interrupt;cmci_discover (banks);
arch/x86/kernel/cpu/mce/internal.h +1 -0
@@ -274,4 +274,5 @@ static __always_inline u32 mca_msr_reg(int bank, enum mca_msr reg) return 0; } +extern void (*mc_poll_banks)(void );#endif /* __X86_MCE_INTERNAL_H__ */
Signature · 8 lines
2.41.0
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteRe: [PATCH] x86/mce: Prevent duplicate error records
Quoted 105 lines · Borislav Petkov
A legitimate use case of the MCA infrastructure is to have the firmware log all uncorrectable errors and also, have the OS see all correctable errors.
The uncorrectable, UCNA errors are usually configured to be reported through an SMI. CMCI, which is the correctable error reporting interrupt, uses SMI too and having both enabled, leads to unnecessary overhead.
So what ends up happening is, people disable CMCI in the wild and leave on only the UCNA SMI.
When CMCI is disabled, the MCA infrastructure resorts to polling the MCA banks. If a MCA MSR is shared between the logical threads, one error ends up getting logged multiple times as the polling runs on every logical thread.
Therefore, introduce locking on the Intel side of the polling routine to prevent such duplicate error records from appearing.
Based on a patch by Aristeu Rozanski <[email protected]>.
Signed-off-by Borislav Petkov (AMD) <[email protected]>Tested-by Tony Luck <[email protected]>--- arch/x86/kernel/cpu/mce/core.c | 9 ++++++++- arch/x86/kernel/cpu/mce/intel.c | 19 ++++++++++++++++++- arch/x86/kernel/cpu/mce/internal.h | 1 + 3 files changed, 27 insertions(+), 2 deletions(-)arch/x86/kernel/cpu/mce/core.c +8
-1@@ -1608,6 +1608,13 @@ static void __start_timer(struct timer_list *t, unsigned long interval)local_irq_restore (flags); } +static void mc_poll_banks_default (void ) +{ +machine_check_poll (0 ,this_cpu_ptr (&mce_poll_banks)); +} + +void (*mc_poll_banks)(void ) = mc_poll_banks_default; +static void mce_timer_fn (struct timer_list *t) {struct timer_list *cpu_t =this_cpu_ptr (&mce_timer);@@ -1618,7 +1625,7 @@ static void mce_timer_fn(struct timer_list *t) iv =__this_cpu_read (mce_next_interval);if (mce_available (this_cpu_ptr (&cpu_info))) { -machine_check_poll (0 ,this_cpu_ptr (&mce_poll_banks)); +mc_poll_banks ();if (mce_intel_cmci_poll ()) { iv =mce_adjust_timer (iv);arch/x86/kernel/cpu/mce/intel.c +18
-1@@ -56,6 +56,13 @@ static DEFINE_PER_CPU(int, cmci_backoff_cnt);*/ static DEFINE_RAW_SPINLOCK (cmci_discover_lock); +/* +* On systems that do support CMCI but it's disabled, polling for MCEs can +* cause the same event to be reported multiple times because IA32_MCi_STATUS +* is shared by the same package. +*/ +static DEFINE_SPINLOCK (cmci_poll_lock); +#define CMCI_THRESHOLD 1#define CMCI_POLL_INTERVAL (30 * HZ)#define CMCI_STORM_INTERVAL (HZ)@@ -426,12 +433,22 @@ void cmci_disable_bank(int bank)raw_spin_unlock_irqrestore (&cmci_discover_lock, flags); } +/* Bank polling function when CMCI is disabled. */ +static void cmci_mc_poll_banks (void ) +{ +spin_lock (&cmci_poll_lock); +machine_check_poll (0 ,this_cpu_ptr (&mce_poll_banks)); +spin_unlock (&cmci_poll_lock); +} +void intel_init_cmci (void ) {int banks; -if (!cmci_supported (&banks)) +if (!cmci_supported (&banks)) { + mc_poll_banks = cmci_mc_poll_banks;return ; + } mce_threshold_vector = intel_threshold_interrupt;cmci_discover (banks);arch/x86/kernel/cpu/mce/internal.h +0
-0
arch/x86/kernel/cpu/mce/internal.h static __always_inline u32 mca_msr_reg(int bank, enum mca_msr reg) · line 278
Quoted 5 lines
arch/x86/kernel/cpu/mce/internal.h +1
-0@@ -274,4 +274,5 @@ static __always_inline u32 mca_msr_reg(int bank, enum mca_msr reg) return 0; } +extern void (*mc_poll_banks)(void );#endif /* __X86_MCE_INTERNAL_H__ */
Signature · 1 line
Aristeu