iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/mce: Use mce_rdmsrl() in severity checking code

Browse Source 
MCA has its own special MSR accessors. Use them.

No functional changes.

Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20211208111343.8130-4-bp@alien8.de
This commit is contained in:
Borislav Petkov 2021-10-06 00:55:38 +02:00
parent ad669ec16a
commit 88f66a4235
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/cpu/mce/core.c
View File

@ -362,7 +362,7 @@ void ex_handler_msr_mce(struct pt_regs *regs, bool wrmsr)
} }
/* MSR access wrappers used for error injection */ /* MSR access wrappers used for error injection */
static noinstr u64 mce_rdmsrl(u32 msr) noinstr u64 mce_rdmsrl(u32 msr)
{ {
DECLARE_ARGS(val, low, high); DECLARE_ARGS(val, low, high);

2
arch/x86/kernel/cpu/mce/internal.h
View File

@ -207,4 +207,6 @@ static inline void pentium_machine_check(struct pt_regs *regs) {}
static inline void winchip_machine_check(struct pt_regs *regs) {} static inline void winchip_machine_check(struct pt_regs *regs) {}
#endif #endif
noinstr u64 mce_rdmsrl(u32 msr);
#endif /* __X86_MCE_INTERNAL_H__ */ #endif /* __X86_MCE_INTERNAL_H__ */

8
arch/x86/kernel/cpu/mce/severity.c
View File

@ -288,8 +288,7 @@ static int error_context(struct mce *m, struct pt_regs *regs)
static int mce_severity_amd_smca(struct mce *m, enum context err_ctx) static int mce_severity_amd_smca(struct mce *m, enum context err_ctx)
{ {
u32 addr = MSR_AMD64_SMCA_MCx_CONFIG(m->bank); u64 mcx_cfg;
u32 low, high;
/* /*
* We need to look at the following bits: * We need to look at the following bits:
@ -300,11 +299,10 @@ static int mce_severity_amd_smca(struct mce *m, enum context err_ctx)
if (!mce_flags.succor) if (!mce_flags.succor)
return MCE_PANIC_SEVERITY; return MCE_PANIC_SEVERITY;
if (rdmsr_safe(addr, &low, &high)) mcx_cfg = mce_rdmsrl(MSR_AMD64_SMCA_MCx_CONFIG(m->bank));
return MCE_PANIC_SEVERITY;
/* TCC (Task context corrupt). If set and if IN_KERNEL, panic. */ /* TCC (Task context corrupt). If set and if IN_KERNEL, panic. */
if ((low & MCI_CONFIG_MCAX) && if ((mcx_cfg & MCI_CONFIG_MCAX) &&
(m->status & MCI_STATUS_TCC) && (m->status & MCI_STATUS_TCC) &&
(err_ctx == IN_KERNEL)) (err_ctx == IN_KERNEL))
return MCE_PANIC_SEVERITY; return MCE_PANIC_SEVERITY;