From: "Luck, Tony" <tony.luck@intel.com>
To: Borislav Petkov <bp@alien8.de>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Philippe Conde <conde.philippe@skynet.be>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] x86/mce: Enable additional error logging on certain Intel CPUs
Date: Fri, 30 Oct 2020 12:08:07 -0700 [thread overview]
Message-ID: <20201030190807.GA13884@agluck-desk2.amr.corp.intel.com> (raw)
In-Reply-To: <20201030190400.GA13797@agluck-desk2.amr.corp.intel.com>
On Fri, Oct 30, 2020 at 12:04:03PM -0700, Luck, Tony wrote:
Bah, didn't notice this conversation didn't include LKML.
> The Xeon versions of Sandy Bridge, Ivy Bridge and Haswell support an
> optional additional error logging mode which is enabled by an MSR.
>
> Previously this mode was enabled from the mcelog(8) tool via /dev/cpu,
> but the kernel is now very picky about which MSRs may be written. So
> move the enabling into the kernel.
>
> Suggested-by: Boris Petkov <bp@alien8.de>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> ---
>
> N.B. I don't have any of these old systems in my lab any more. So
> this is untested :-(
>
> arch/x86/include/asm/msr-index.h | 1 +
> arch/x86/kernel/cpu/mce/intel.c | 20 ++++++++++++++++++++
> 2 files changed, 21 insertions(+)
>
> diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
> index 972a34d93505..b2dd2648c0e2 100644
> --- a/arch/x86/include/asm/msr-index.h
> +++ b/arch/x86/include/asm/msr-index.h
> @@ -139,6 +139,7 @@
> #define MSR_IA32_MCG_CAP 0x00000179
> #define MSR_IA32_MCG_STATUS 0x0000017a
> #define MSR_IA32_MCG_CTL 0x0000017b
> +#define MSR_ERROR_CONTROL 0x0000017f
> #define MSR_IA32_MCG_EXT_CTL 0x000004d0
>
> #define MSR_OFFCORE_RSP_0 0x000001a6
> diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/intel.c
> index abe9fe0fb851..b47883e364b4 100644
> --- a/arch/x86/kernel/cpu/mce/intel.c
> +++ b/arch/x86/kernel/cpu/mce/intel.c
> @@ -509,12 +509,32 @@ static void intel_ppin_init(struct cpuinfo_x86 *c)
> }
> }
>
> +/*
> + * Enable additional error logs from the integrated
> + * memory controller on processors that support this.
> + */
> +static void intel_imc_init(struct cpuinfo_x86 *c)
> +{
> + u64 error_control;
> +
> + switch (c->x86_model) {
> + case INTEL_FAM6_SANDYBRIDGE_X:
> + case INTEL_FAM6_IVYBRIDGE_X:
> + case INTEL_FAM6_HASWELL_X:
> + rdmsrl(MSR_ERROR_CONTROL, error_control);
> + error_control |= 2;
> + wrmsrl(MSR_ERROR_CONTROL, error_control);
> + break;
> + }
> +}
> +
> void mce_intel_feature_init(struct cpuinfo_x86 *c)
> {
> intel_init_thermal(c);
> intel_init_cmci();
> intel_init_lmce();
> intel_ppin_init(c);
> + intel_imc_init(c);
> }
>
> void mce_intel_feature_clear(struct cpuinfo_x86 *c)
> --
> 2.21.1
>
next parent reply other threads:[~2020-10-30 19:08 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <fcb21490-84a1-8b99-b494-3a6ac2a0e16a@skynet.be>
[not found] ` <20201029100655.GA31903@zn.tnic>
[not found] ` <20201029151518.GA23990@agluck-desk2.amr.corp.intel.com>
[not found] ` <20201029194118.GC31903@zn.tnic>
[not found] ` <87ft5wo8zn.fsf@nanos.tec.linutronix.de>
[not found] ` <20201030091056.GA6532@zn.tnic>
[not found] ` <20201030190400.GA13797@agluck-desk2.amr.corp.intel.com>
2020-10-30 19:08 ` Luck, Tony [this message]
2020-11-02 11:12 ` [PATCH] x86/mce: Enable additional error logging on certain Intel CPUs Borislav Petkov
2020-11-02 11:18 ` [tip: ras/core] " tip-bot2 for Tony Luck
2020-11-09 21:55 ` Qian Cai
2020-11-09 22:09 ` Luck, Tony
2020-11-09 22:36 ` Jim Mattson
2020-11-09 22:57 ` Luck, Tony
2020-11-09 23:24 ` [PATCH] x86/mce: Check for hypervisor before enabling additional error logging Luck, Tony
2020-11-10 6:31 ` Borislav Petkov
2020-11-10 8:50 ` Paolo Bonzini
2020-11-10 9:56 ` Borislav Petkov
2020-11-10 10:40 ` Paolo Bonzini
2020-11-10 15:50 ` Borislav Petkov
2020-11-10 16:08 ` Paolo Bonzini
2020-11-10 17:52 ` Luck, Tony
2020-11-10 20:37 ` Paolo Bonzini
2020-11-11 0:39 ` [PATCH v2] x86/mce: Use "safe" MSR functions when " Luck, Tony
2020-11-16 16:44 ` [tip: ras/core] " tip-bot2 for Tony Luck
2020-11-09 23:26 ` [tip: ras/core] x86/mce: Enable additional error logging on certain Intel CPUs Jim Mattson
2020-11-09 23:36 ` Luck, Tony
2020-11-10 9:10 ` Paolo Bonzini
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=20201030190807.GA13884@agluck-desk2.amr.corp.intel.com \
--to=tony.luck@intel.com \
--cc=bp@alien8.de \
--cc=conde.philippe@skynet.be \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--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).