x86: MCE: Fix a race condition about mce_callin and no_way_out
PATCH 1/1 x86: MCE: Fix a race condition about mce_callin and no_way_out
If one CPU has no_way_out == 1, all other CPUs should have no_way_out == 1. But despite global_nwo is read after mce_callin, global_nwo is updated after mce_callin too. So it is possible that some CPU read global_nwo before some other CPU update global_nwo, so that no_way_out == 1 for some CPU, while no_way_out == 0 for some other CPU.
This patch fixes this race condition via moving mce_callin updating after global_nwo updating, with a smp_wmb in between. A smp_rmb is added between their reading too.
Signed-off-by Huang Ying <[email protected]>
Acked-by Andi Kleen <[email protected]>
--- arch/x86/kernel/cpu/mcheck/mce.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +10 -2
@@ -703,6 +703,11 @@ static int mce_start(int no_way_out, int }atomic_add (no_way_out, &global_nwo); +/* +* global_nwo should be updated before mce_callin +*/ +smp_wmb (); + *order =atomic_add_return (1 , &mce_callin);/* * Wait for everyone.
@@ -717,6 +722,10 @@ static int mce_start(int no_way_out, int }/* +* mce_callin should be read before global_nwo +*/ +smp_rmb (); +/* * Cache the global no_way_out state. */ nwo =atomic_read (&global_nwo);
@@ -862,7 +871,7 @@ void do_machine_check(struct pt_regs *re* Establish sequential order between the CPUs entering the machine * check handler. */ -int order; +int order =-1 ;/* * If no_way_out gets set, there is no safe way to recover from this
@@ -887,7 +896,6 @@ void do_machine_check(struct pt_regs *reif (!banks) goto out; - order =atomic_add_return (1 , &mce_callin);mce_setup (&m); m.mcgstatus =mce_rdmsrl (MSR_IA32_MCG_STATUS );