diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2012-07-19 13:59:38 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2012-08-03 14:45:56 -0400 |
commit | b5975917a3e5f93b5d1c95561aab0aa44327baea (patch) | |
tree | aa2e9ffd6ba21164f2d891224552bed72ae4655a /arch/x86/kernel | |
parent | ea22571c8fd912f28e2525f7112bbb84b474ff3a (diff) |
x86: mce: Serialize mce injection
raise_mce() fiddles with global state, but lacks any kind of
serialization.
Add a mutex around the raise_mce() call, so concurrent writers do not
stomp on each other toes.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Chen Gong <gong.chen@linux.intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce-inject.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c index 753746f6dbd..ddc72f83933 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-inject.c +++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c | |||
@@ -78,6 +78,7 @@ static void raise_exception(struct mce *m, struct pt_regs *pregs) | |||
78 | } | 78 | } |
79 | 79 | ||
80 | static cpumask_var_t mce_inject_cpumask; | 80 | static cpumask_var_t mce_inject_cpumask; |
81 | static DEFINE_MUTEX(mce_inject_mutex); | ||
81 | 82 | ||
82 | static int mce_raise_notify(unsigned int cmd, struct pt_regs *regs) | 83 | static int mce_raise_notify(unsigned int cmd, struct pt_regs *regs) |
83 | { | 84 | { |
@@ -229,7 +230,10 @@ static ssize_t mce_write(struct file *filp, const char __user *ubuf, | |||
229 | * so do it a jiffie or two later everywhere. | 230 | * so do it a jiffie or two later everywhere. |
230 | */ | 231 | */ |
231 | schedule_timeout(2); | 232 | schedule_timeout(2); |
233 | |||
234 | mutex_lock(&mce_inject_mutex); | ||
232 | raise_mce(&m); | 235 | raise_mce(&m); |
236 | mutex_unlock(&mce_inject_mutex); | ||
233 | return usize; | 237 | return usize; |
234 | } | 238 | } |
235 | 239 | ||