Skip to content

Commit 5c4663e

Browse files
skoralahbp3tk0v
authored andcommitted
x86/mce: Handle AMD threshold interrupt storms
Extend the logic of handling CMCI storms to AMD threshold interrupts. Rely on the similar approach as of Intel's CMCI to mitigate storms per CPU and per bank. But, unlike CMCI, do not set thresholds and reduce interrupt rate on a storm. Rather, disable the interrupt on the corresponding CPU and bank. Re-enable back the interrupts if enough consecutive polls of the bank show no corrected errors (30, as programmed by Intel). Turning off the threshold interrupts would be a better solution on AMD systems as other error severities will still be handled even if the threshold interrupts are disabled. [ Tony: Small tweak because mce_handle_storm() isn't a pointer now ] [ Yazen: Rebase and simplify ] [ Avadhut: Remove check to not clear bank's bit in mce_poll_banks and fix checkpatch warnings. ] Signed-off-by: Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com> Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com> Signed-off-by: Avadhut Naik <avadhut.naik@amd.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://patch.msgid.link/20251121190542.2447913-3-avadhut.naik@amd.com
1 parent d7ac083 commit 5c4663e

3 files changed

Lines changed: 10 additions & 0 deletions

File tree

arch/x86/kernel/cpu/mce/amd.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,11 @@ static void amd_deferred_error_interrupt(void)
852852
machine_check_poll(MCP_TIMESTAMP, &this_cpu_ptr(&mce_amd_data)->dfr_intr_banks);
853853
}
854854

855+
void mce_amd_handle_storm(unsigned int bank, bool on)
856+
{
857+
threshold_restart_bank(bank, on);
858+
}
859+
855860
static void amd_reset_thr_limit(unsigned int bank)
856861
{
857862
threshold_restart_bank(bank, true);

arch/x86/kernel/cpu/mce/internal.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ void mce_prep_record_per_cpu(unsigned int cpu, struct mce *m);
269269
#ifdef CONFIG_X86_MCE_AMD
270270
void mce_threshold_create_device(unsigned int cpu);
271271
void mce_threshold_remove_device(unsigned int cpu);
272+
void mce_amd_handle_storm(unsigned int bank, bool on);
272273
extern bool amd_filter_mce(struct mce *m);
273274
bool amd_mce_usable_address(struct mce *m);
274275
void amd_clear_bank(struct mce *m);
@@ -301,6 +302,7 @@ void smca_bsp_init(void);
301302
#else
302303
static inline void mce_threshold_create_device(unsigned int cpu) { }
303304
static inline void mce_threshold_remove_device(unsigned int cpu) { }
305+
static inline void mce_amd_handle_storm(unsigned int bank, bool on) { }
304306
static inline bool amd_filter_mce(struct mce *m) { return false; }
305307
static inline bool amd_mce_usable_address(struct mce *m) { return false; }
306308
static inline void amd_clear_bank(struct mce *m) { }

arch/x86/kernel/cpu/mce/threshold.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ static void mce_handle_storm(unsigned int bank, bool on)
7676
case X86_VENDOR_INTEL:
7777
mce_intel_handle_storm(bank, on);
7878
break;
79+
case X86_VENDOR_AMD:
80+
mce_amd_handle_storm(bank, on);
81+
break;
7982
}
8083
}
8184

0 commit comments

Comments
 (0)