From: Borislav Petkov <bp@amd64.org>
To: Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@elte.hu>,
Peter Zijlstra <peterz@infradead.org>,
Steven Rostedt <rostedt@goodmis.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Borislav Petkov <borislav.petkov@amd.com>
Subject: [PATCH 2/2] x86, mce: Add persistent MCE event
Date: Wed, 21 Mar 2012 15:34:56 +0100 [thread overview]
Message-ID: <1332340496-21658-3-git-send-email-bp@amd64.org> (raw)
In-Reply-To: <1332340496-21658-1-git-send-email-bp@amd64.org>
From: Borislav Petkov <borislav.petkov@amd.com>
Add the necessary glue to enable the mce_record tracepoint on boot,
turning it into a persistent event. This exports the MCE buffer through
a debugfs per-CPU file which a userspace daemon can read and then
process the received error data further.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
---
arch/x86/kernel/cpu/mcheck/mce.c | 53 ++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 5a11ae2e9e91..791c4633d771 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -95,6 +95,13 @@ static DECLARE_WAIT_QUEUE_HEAD(mce_chrdev_wait);
static DEFINE_PER_CPU(struct mce, mces_seen);
static int cpu_missing;
+static struct perf_event_attr pattr = {
+ .type = PERF_TYPE_TRACEPOINT,
+ .size = sizeof(pattr),
+ .sample_type = PERF_SAMPLE_RAW,
+ .persistent = 1,
+};
+
/* MCA banks polled by the period polling timer for corrected events */
DEFINE_PER_CPU(mce_banks_t, mce_poll_banks) = {
[0 ... BITS_TO_LONGS(MAX_NR_BANKS)-1] = ~0UL
@@ -102,6 +109,8 @@ DEFINE_PER_CPU(mce_banks_t, mce_poll_banks) = {
static DEFINE_PER_CPU(struct work_struct, mce_work);
+static DEFINE_PER_CPU(struct pers_event_desc, mce_ev);
+
/*
* CPU/chipset specific EDAC code can register a notifier call here to print
* MCE errors in a human-readable form.
@@ -2109,6 +2118,50 @@ static void __cpuinit mce_reenable_cpu(void *h)
}
}
+static __init int mcheck_init_persistent_event(void)
+{
+
+#define MCE_RECORD_FNAME_SZ 14
+#define MCE_BUF_PAGES 4
+
+ int cpu, err = 0;
+ char buf[MCE_RECORD_FNAME_SZ];
+
+ pattr.config = event_mce_record.event.type;
+ pattr.sample_period = 1;
+ pattr.wakeup_events = 1;
+
+ get_online_cpus();
+
+ for_each_online_cpu(cpu) {
+ struct pers_event_desc *d = &per_cpu(mce_ev, cpu);
+
+ snprintf(buf, MCE_RECORD_FNAME_SZ, "mce_record%d", cpu);
+ d->dfs_name = buf;
+ d->pattr = &pattr;
+
+ if (perf_add_persistent_on_cpu(cpu, d, mce_get_debugfs_dir(),
+ MCE_BUF_PAGES))
+ goto err_unwind;
+ }
+ goto unlock;
+
+err_unwind:
+ err = -EINVAL;
+ for (--cpu; cpu >= 0; cpu--)
+ perf_rm_persistent_on_cpu(cpu, &per_cpu(mce_ev, cpu));
+
+unlock:
+ put_online_cpus();
+
+ return err;
+}
+
+/*
+ * This has to run after event_trace_init()
+ */
+device_initcall(mcheck_init_persistent_event);
+
/* Get notified when a cpu comes on/off. Be hotplug friendly. */
static int __cpuinit
mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
--
1.7.9.3.362.g71319
next prev parent reply other threads:[~2012-03-21 14:35 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-21 14:34 [RFC PATCH 0/2] perf: Add persistent event facilities Borislav Petkov
2012-03-21 14:34 ` [PATCH 1/2] " Borislav Petkov
2012-05-18 9:58 ` Peter Zijlstra
2012-05-18 10:01 ` Borislav Petkov
2012-05-18 10:00 ` Peter Zijlstra
2012-05-18 10:02 ` Peter Zijlstra
2012-05-18 10:09 ` Peter Zijlstra
2012-05-18 10:49 ` Borislav Petkov
2012-05-18 10:14 ` Peter Zijlstra
2012-05-18 11:03 ` Borislav Petkov
2012-05-18 11:24 ` Peter Zijlstra
2012-05-18 11:59 ` Ingo Molnar
2012-05-18 12:55 ` Borislav Petkov
2012-05-18 13:37 ` Peter Zijlstra
2012-05-18 14:09 ` Borislav Petkov
2012-05-18 14:14 ` Peter Zijlstra
2012-05-18 14:21 ` Borislav Petkov
2012-05-18 14:37 ` Peter Zijlstra
2012-05-18 15:24 ` Borislav Petkov
2012-05-31 17:33 ` Borislav Petkov
2012-03-21 14:34 ` Borislav Petkov [this message]
2012-03-22 8:36 ` [PATCH 2/2] x86, mce: Add persistent MCE event Srivatsa S. Bhat
2012-03-22 11:40 ` Borislav Petkov
2012-03-22 11:57 ` Srivatsa S. Bhat
2012-03-23 12:31 ` Ingo Molnar
2012-03-23 13:30 ` Borislav Petkov
2012-03-24 7:37 ` Ingo Molnar
2012-03-24 9:00 ` Borislav Petkov
2012-03-24 9:15 ` Ingo Molnar
2012-05-15 15:32 ` Borislav Petkov
2012-05-18 8:18 ` Ingo Molnar
2012-05-18 10:03 ` Borislav Petkov
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=1332340496-21658-3-git-send-email-bp@amd64.org \
--to=bp@amd64.org \
--cc=borislav.petkov@amd.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.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
Powered by JetHome