[PATCH v3 4/6] x86/mce/inject: Simplify evaluation of writes ignored in status registers
From: Smita Koralahalli <hidden>
Date: 2021-11-04 21:59:18
Also in:
lkml
Subsystem:
the rest, x86 architecture (32-bit and 64-bit), x86 mce infrastructure · Maintainers:
Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, Tony Luck
Clean up code in prepare_msrs() and avoid reading the status variable and checking for writes ignored each time for SMCA, legacy and deferred case. Signed-off-by: Smita Koralahalli <redacted> --- arch/x86/kernel/cpu/mce/inject.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c
index 4d5689342384..8772d8820994 100644
--- a/arch/x86/kernel/cpu/mce/inject.c
+++ b/arch/x86/kernel/cpu/mce/inject.c@@ -483,41 +483,34 @@ static void prepare_msrs(void *info) struct mce m = *i_mce_err->mce; u8 b = m.bank; + u32 status_reg = MSR_IA32_MCx_STATUS(b); + wrmsrl(MSR_IA32_MCG_STATUS, m.mcgstatus); if (boot_cpu_has(X86_FEATURE_SMCA)) { if (m.inject_flags == DFR_INT_INJ) { - wrmsrl(MSR_AMD64_SMCA_MCx_DESTAT(b), m.status); - rdmsrl(MSR_AMD64_SMCA_MCx_DESTAT(b), m.status); - if (!m.status) - goto out; - + status_reg = MSR_AMD64_SMCA_MCx_DESTAT(b); wrmsrl(MSR_AMD64_SMCA_MCx_DEADDR(b), m.addr); } else { - wrmsrl(MSR_AMD64_SMCA_MCx_STATUS(b), m.status); - rdmsrl(MSR_AMD64_SMCA_MCx_STATUS(b), m.status); - if (!m.status) - goto out; - + status_reg = MSR_AMD64_SMCA_MCx_STATUS(b); wrmsrl(MSR_AMD64_SMCA_MCx_ADDR(b), m.addr); } wrmsrl(MSR_AMD64_SMCA_MCx_MISC(b), m.misc); wrmsrl(MSR_AMD64_SMCA_MCx_SYND(b), m.synd); } else { - wrmsrl(MSR_IA32_MCx_STATUS(b), m.status); - rdmsrl(MSR_IA32_MCx_STATUS(b), m.status); - if (!m.status) - goto out; - wrmsrl(MSR_IA32_MCx_ADDR(b), m.addr); wrmsrl(MSR_IA32_MCx_MISC(b), m.misc); } -out: - pr_err("Error injection is not available\n"); - i_mce_err->err = -EINVAL; - return; + wrmsrl(status_reg, m.status); + rdmsrl(status_reg, m.status); + + if (!m.status) { + pr_err("Error injection is not available\n"); + i_mce_err->err = -EINVAL; + return; + } } static void do_inject(void)
--
2.17.1