x86/mce: Fix CMCI preemption bugs
authorIngo Molnar <[email protected]>
Thu, 17 Apr 2014 08:25:53 +0000 (10:25 +0200)
committerIngo Molnar <[email protected]>
Thu, 17 Apr 2014 08:28:42 +0000 (10:28 +0200)
commitea431643d6c38728195e2c456801c3ef66bb9991
tree00a65a9939a45dc15064853da648fb38720c5ef7
parent5be44a6fb1edb57d7d2d77151870dcd79c8c0e58
x86/mce: Fix CMCI preemption bugs

The following commit:

  27f6c573e0f7 ("x86, CMCI: Add proper detection of end of CMCI storms")

Added two preemption bugs:

 - machine_check_poll() does a get_cpu_var() without a matching
   put_cpu_var(), which causes preemption imbalance and crashes upon
   bootup.

 - it does percpu ops without disabling preemption. Preemption is not
   disabled due to the mistaken use of a raw spinlock.

To fix these bugs fix the imbalance and change
cmci_discover_lock to a regular spinlock.

Reported-by: Owen Kibel <[email protected]>
Reported-by: Linus Torvalds <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Cc: Chen, Gong <[email protected]>
Cc: Josh Boyer <[email protected]>
Cc: Tony Luck <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Alexander Todorov <[email protected]>
Cc: Borislav Petkov <[email protected]>
Link: http://lkml.kernel.org/n/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
--
 arch/x86/kernel/cpu/mcheck/mce.c       |    4 +---
 arch/x86/kernel/cpu/mcheck/mce_intel.c |   18 +++++++++---------
 2 files changed, 10 insertions(+), 12 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/cpu/mcheck/mce_intel.c