From: Haozhong Zhang Date: Fri, 7 Apr 2017 13:55:34 +0000 (+0200) Subject: x86/mce: make 'severity_cpu' private to its users X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2279 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=011899a2e00b9f748c04d501c205da04bbff4359;p=xen.git x86/mce: make 'severity_cpu' private to its users The current 'severity_cpu' is used by both mcheck_cmn_handler() and mce_softirq(). If MC# happens during mce_softirq(), the values set in mcheck_cmn_handler() and mce_softirq() may interfere with each other. Use private 'severity_cpu' for each function to fix this issue. Signed-off-by: Haozhong Zhang Reviewed-by: Jan Beulich --- diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 11d0e23403..eb85257d89 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -186,7 +186,6 @@ static struct mce_softirq_barrier mce_trap_bar; */ static DEFINE_SPINLOCK(mce_logout_lock); -static atomic_t severity_cpu = ATOMIC_INIT(-1); static atomic_t found_error = ATOMIC_INIT(0); static cpumask_t mce_fatal_cpus; @@ -453,6 +452,7 @@ static int mce_urgent_action(const struct cpu_user_regs *regs, /* Shared #MC handler. */ void mcheck_cmn_handler(const struct cpu_user_regs *regs) { + static atomic_t severity_cpu = ATOMIC_INIT(-1); struct mca_banks *bankmask = mca_allbanks; struct mca_banks *clear_bank = __get_cpu_var(mce_clear_banks); uint64_t gstatus; @@ -1698,6 +1698,7 @@ static int mce_delayed_action(mctelem_cookie_t mctc) /* Softirq Handler for this MCE# processing */ static void mce_softirq(void) { + static atomic_t severity_cpu; int cpu = smp_processor_id(); unsigned int workcpu;