From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Tony Luck <tony.luck@intel.com>,
Borislav Petkov <borislav.petkov@amd.com>,
Chen Gong <gong.chen@linux.intel.com>,
x86@kernel.org, Peter Zijlstra <peterz@infradead.org>
Subject: [patch 3/6] x86: mce: Serialize mce injection
Date: Wed, 06 Jun 2012 21:27:14 -0000 [thread overview]
Message-ID: <20120606212334.641854445@linutronix.de> (raw)
In-Reply-To: 20120606211746.693649684@linutronix.de
[-- Attachment #1: x86-mce-serialize-mce-injection.patch --]
[-- Type: text/plain, Size: 1006 bytes --]
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>
---
arch/x86/kernel/cpu/mcheck/mce-inject.c | 4 ++++
1 file changed, 4 insertions(+)
Index: tip/arch/x86/kernel/cpu/mcheck/mce-inject.c
===================================================================
--- tip.orig/arch/x86/kernel/cpu/mcheck/mce-inject.c
+++ tip/arch/x86/kernel/cpu/mcheck/mce-inject.c
@@ -78,6 +78,7 @@ static void raise_exception(struct mce *
}
static cpumask_var_t mce_inject_cpumask;
+static DEFINE_MUTEX(mce_inject_mutex);
static int mce_raise_notify(unsigned int cmd, struct pt_regs *regs)
{
@@ -229,7 +230,10 @@ static ssize_t mce_write(struct file *fi
* so do it a jiffie or two later everywhere.
*/
schedule_timeout(2);
+
+ mutex_lock(&mce_inject_mutex);
raise_mce(&m);
+ mutex_unlock(&mce_inject_mutex);
return usize;
}
next prev parent reply other threads:[~2012-06-06 21:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-06 21:27 [patch 0/6] x86: mce: Bugfixes, cleanups and a new CMCI poll version Thomas Gleixner
2012-06-06 21:27 ` [patch 1/6] x86: mce: Create devices in CPU_UP_PREPARE Thomas Gleixner
2012-06-06 21:38 ` Thomas Gleixner
2012-06-06 21:42 ` Borislav Petkov
2012-06-06 21:52 ` Thomas Gleixner
2012-06-06 21:27 ` [patch 2/6] x86: mce: Disable preemption when calling raise_local() Thomas Gleixner
2012-06-06 21:27 ` Thomas Gleixner [this message]
2012-06-06 21:27 ` [patch 4/6] x86: mce: Split timer init Thomas Gleixner
2012-06-06 21:27 ` [patch 6/6] x86: mce: Add cmci poll mode Thomas Gleixner
2012-06-06 21:27 ` [patch 5/6] x86: mce: Remove the frozen cases in the hotplug code Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120606212334.641854445@linutronix.de \
--to=tglx@linutronix.de \
--cc=borislav.petkov@amd.com \
--cc=gong.chen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox