From: Borislav Petkov <bp@amd64.org>
To: EDAC devel <linux-edac@vger.kernel.org>
Cc: Tony Luck <tony.luck@intel.com>, Ingo Molnar <mingo@elte.hu>,
X86-ML <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
Borislav Petkov <borislav.petkov@amd.com>
Subject: [PATCH 9/9] x86, RAS: Add an injector function
Date: Wed, 19 Oct 2011 16:51:06 +0200 [thread overview]
Message-ID: <1319035866-29570-10-git-send-email-bp@amd64.org> (raw)
In-Reply-To: <1319035866-29570-1-git-send-email-bp@amd64.org>
From: Borislav Petkov <borislav.petkov@amd.com>
Selectively inject either a real MCE or a sw-only version which
exercises the decoding code only. The hardware-injected MCE triggers a
machine check exception (#MC) so that the MCE handler can be bothered to
do something too.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
---
arch/x86/kernel/cpu/ras/amd/mce-inject.c | 50 ++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/ras/amd/mce-inject.c b/arch/x86/kernel/cpu/ras/amd/mce-inject.c
index 8646080..d798096 100644
--- a/arch/x86/kernel/cpu/ras/amd/mce-inject.c
+++ b/arch/x86/kernel/cpu/ras/amd/mce-inject.c
@@ -129,6 +129,53 @@ static int inj_extcpu_set(void *data, u64 val)
DEFINE_SIMPLE_ATTRIBUTE(extcpu_fops, inj_extcpu_get, inj_extcpu_set, "%llu\n");
+static void trigger_mce(void *info)
+{
+ asm volatile("int $18");
+}
+
+static void do_inject(void)
+{
+ u64 mcg_status = 0;
+ unsigned int cpu = i_mce.extcpu;
+ int this_cpu;
+ u8 b = i_mce.bank;
+
+ if (!(i_mce.inject_flags & MCJ_HW_MSR_INJECT)) {
+ amd_decode_mce(NULL, 0, &i_mce);
+ return;
+ }
+
+ /* prep MCE global settings for the injection */
+ mcg_status = MCG_STATUS_MCIP | MCG_STATUS_EIPV;
+
+ if (!(i_mce.status & MCI_STATUS_PCC))
+ mcg_status |= MCG_STATUS_RIPV;
+
+ this_cpu = get_cpu();
+
+ toggle_hw_mce_inject(cpu, true);
+
+ wrmsr_on_cpu(cpu, MSR_IA32_MCG_STATUS,
+ (u32)mcg_status, (u32)(mcg_status >> 32));
+
+ wrmsr_on_cpu(cpu, MSR_IA32_MCx_STATUS(b),
+ (u32)i_mce.status, (u32)(i_mce.status >> 32));
+
+ wrmsr_on_cpu(cpu, MSR_IA32_MCx_ADDR(b),
+ (u32)i_mce.addr, (u32)(i_mce.addr >> 32));
+
+ wrmsr_on_cpu(cpu, MSR_IA32_MCx_MISC(b),
+ (u32)i_mce.misc, (u32)(i_mce.misc >> 32));
+
+ toggle_hw_mce_inject(cpu, false);
+
+ smp_call_function_single(cpu, trigger_mce, NULL, 0);
+
+ put_cpu();
+
+}
+
/*
* This denotes into which bank we're injecting and triggers
* the injection, at the same time.
@@ -144,8 +191,7 @@ static int inj_bank_set(void *data, u64 val)
}
m->bank = val;
-
- amd_decode_mce(NULL, 0, m);
+ do_inject();
return 0;
}
--
1.7.4.rc2
next prev parent reply other threads:[~2011-10-19 14:51 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-19 14:50 [RFC -v2] x86 RAS: Reorganize functionality Borislav Petkov
2011-10-19 14:50 ` [PATCH 1/9] x86, mce: Enable MCA support by default Borislav Petkov
2011-10-19 14:50 ` [PATCH 2/9] x86, RAS: Start reorganizing RAS features support Borislav Petkov
2011-10-19 17:13 ` Luck, Tony
2011-10-19 17:22 ` Mauro Carvalho Chehab
2011-10-19 18:11 ` Borislav Petkov
2011-10-19 19:14 ` Mauro Carvalho Chehab
2011-10-20 15:12 ` Borislav Petkov
2011-10-19 14:51 ` [PATCH 3/9] x86, RAS: Move MCE decoding code into ras/ Borislav Petkov
2011-10-19 14:51 ` [PATCH 4/9] x86, RAS: Move MCE injection " Borislav Petkov
2011-10-19 14:51 ` [PATCH 5/9] x86, MCE: Add a HW injection flag Borislav Petkov
2011-10-19 14:51 ` [PATCH 6/9] x86, RAS: Convert mce-inject module to debugfs Borislav Petkov
2011-10-19 14:51 ` [PATCH 7/9] x86, RAS: Add function enabling direct writes to MCE MSRs Borislav Petkov
2011-10-19 14:51 ` [PATCH 8/9] x86, RAS: Add attributes needed for HW injection Borislav Petkov
2011-10-19 21:03 ` David Rientjes
2011-10-19 21:09 ` Borislav Petkov
2011-10-19 21:19 ` David Rientjes
2011-10-20 15:06 ` Borislav Petkov
2011-10-19 14:51 ` Borislav Petkov [this message]
2011-10-19 17:08 ` [RFC -v2] x86 RAS: Reorganize functionality Luck, Tony
2011-10-19 17:13 ` 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=1319035866-29570-10-git-send-email-bp@amd64.org \
--to=bp@amd64.org \
--cc=borislav.petkov@amd.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--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;
as well as URLs for NNTP newsgroup(s).