On Thu, 2017-04-20 at 16:18 -0600, Vishal Verma wrote: Forgot to include, Fixes: 6839a6d96f4e nfit: do an ARS scrub on hitting a latent media error > Signed-off-by: Vishal Verma <vishal.l.verma(a)intel.com&gt; > --- >  drivers/acpi/nfit/mce.c | 2 +- >  1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/acpi/nfit/mce.c b/drivers/acpi/nfit/mce.c > index 3ba1c34..23e12a0 100644 > --- a/drivers/acpi/nfit/mce.c > +++ b/drivers/acpi/nfit/mce.c > @@ -26,7 +26,7 @@ static int nfit_handle_mce(struct notifier_block > *nb, unsigned long val, >   struct nfit_spa *nfit_spa; >   >   /* We only care about memory errors */ > - if (!(mce->status & MCACOD)) > + if (!(mce->status & 0xef80) == BIT(7)) >   return NOTIFY_DONE; >   >   /*

On Thu, Apr 20, 2017 at 3:18 PM, Vishal Verma <vishal.l.verma(a)intel.com&gt; wrote: Can we get a define for this, or a comment explaining all the magic that's happening on that one line?

From: Borislav Petkov <bp(a)suse.de&gt; Date: Mon, 24 Apr 2017 13:16:50 +0200 Subject: [PATCH 1/2] x86/MCE: Export memory_error() Export the function which checks whether an MCE is a memory error to other users so that we can reuse the logic. Drop the boot_cpu_data use, while at it, as mce.cpuvendor already has the CPU vendor in there. Signed-off-by: Borislav Petkov <bp(a)suse.de&gt; --- arch/x86/include/asm/mce.h | 1 + arch/x86/kernel/cpu/mcheck/mce.c | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 4fd5195deed0..3f9a3d2a5209 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -266,6 +266,7 @@ static inline int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *s #endif int mce_available(struct cpuinfo_x86 *c); +bool mce_is_memory_error(struct mce *m); DECLARE_PER_CPU(unsigned, mce_exception_count); DECLARE_PER_CPU(unsigned, mce_poll_count); diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 4a29f7481761..5e79dd211d35 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -510,16 +510,14 @@ static int mce_usable_address(struct mce *m) return 1; } -static bool memory_error(struct mce *m) +bool mce_is_memory_error(struct mce *m) { - struct cpuinfo_x86 *c = &boot_cpu_data; - - if (c->x86_vendor == X86_VENDOR_AMD) { + if (m->cpuvendor == X86_VENDOR_AMD) { /* ErrCodeExt[20:16] */ u8 xec = (m->status >> 16) & 0x1f; return (xec == 0x0 || xec == 0x8); - } else if (c->x86_vendor == X86_VENDOR_INTEL) { + } else if (m->cpuvendor == X86_VENDOR_INTEL) { /* * Intel SDM Volume 3B - 15.9.2 Compound Error Codes * @@ -547,7 +545,7 @@ static bool cec_add_mce(struct mce *m) return false; /* We eat only correctable DRAM errors with usable addresses. */ - if (memory_error(m) && + if (mce_is_memory_error(m) && !(m->status & MCI_STATUS_UC) && mce_usable_address(m)) if (!cec_add_elem(m->addr >> PAGE_SHIFT)) @@ -724,7 +722,7 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b) severity = mce_severity(&m, mca_cfg.tolerant, NULL, false); - if (severity == MCE_DEFERRED_SEVERITY && memory_error(&m)) + if (severity == MCE_DEFERRED_SEVERITY && mce_is_memory_error(&m)) if (m.status & MCI_STATUS_ADDRV) m.severity = severity; -- 2.11.0 -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply.

On Tue, 2017-04-25 at 15:07 -0600, Vishal Verma wrote: Hi Boris/Tony, I didn't see the above patches in the RAS branches of the tip tree - were you thinking we would carry these through the nvdimm tree (including my updated patch below)? > > Here is the updated patch to use the above helper: > > 8<----- > > > From 9661a85799c9067d762ecf29630f2b7f69897628 Mon Sep 17 00:00:00 2001 > From: Vishal Verma <vishal.l.verma(a)intel.com&gt; > Date: Tue, 25 Apr 2017 15:00:58 -0600 > Subject: [PATCH v2] acpi, nfit: fix the memory error check in > nfit_handle_mce > > The check for an MCE being a memory error in the NFIT mce handler was > bogus. Export the new mce_is_memory_error helper, and use that tp > perform the correct check in the handler. > > Reported-by: Tony Luck <tony.luck(a)intel.com&gt; > Cc: Borislav Petkov <bp(a)suse.de&gt; > Cc: <stable(a)vger.kernel.org&gt; > Signed-off-by: Vishal Verma <vishal.l.verma(a)intel.com&gt; > --- >  arch/x86/kernel/cpu/mcheck/mce.c | 1 + >  drivers/acpi/nfit/mce.c          | 2 +- >  2 files changed, 2 insertions(+), 1 deletion(-) > > This applies on tip/master + Borislav's patches in this thread above. > I'm not sure what the right process for queueing this for both > upstream and -stable is, so just replying here. Should I post it > independently? > > diff --git a/arch/x86/kernel/cpu/mcheck/mce.c > b/arch/x86/kernel/cpu/mcheck/mce.c > index 361865ca..5cfbaeb 100644 > --- a/arch/x86/kernel/cpu/mcheck/mce.c > +++ b/arch/x86/kernel/cpu/mcheck/mce.c > @@ -527,6 +527,7 @@ bool mce_is_memory_error(struct mce *m) >   >   return false; >  } > +EXPORT_SYMBOL_GPL(mce_is_memory_error); >   >  static bool cec_add_mce(struct mce *m) >  { > diff --git a/drivers/acpi/nfit/mce.c b/drivers/acpi/nfit/mce.c > index 3ba1c34..fd86bec 100644 > --- a/drivers/acpi/nfit/mce.c > +++ b/drivers/acpi/nfit/mce.c > @@ -26,7 +26,7 @@ static int nfit_handle_mce(struct notifier_block > *nb, unsigned long val, >   struct nfit_spa *nfit_spa; >   >   /* We only care about memory errors */ > - if (!(mce->status & MCACOD)) > + if (!mce_is_memory_error(mce)) >   return NOTIFY_DONE; >   >   /*

From: Borislav Petkov <bp(a)suse.de&gt; Date: Mon, 24 Apr 2017 13:19:34 +0200 Subject: [PATCH 2/2] x86/ras/mce_amd_inj: Preset MCE injection struct Populate the MCE injection struct before doing initial injection so that values which don't change already have proper values. Signed-off-by: Borislav Petkov <bp(a)suse.de&gt; --- arch/x86/ras/mce_amd_inj.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/ras/mce_amd_inj.c b/arch/x86/ras/mce_amd_inj.c index 8730c2882fff..e3b5d7e7e9ee 100644 --- a/arch/x86/ras/mce_amd_inj.c +++ b/arch/x86/ras/mce_amd_inj.c @@ -463,6 +463,8 @@ static int __init init_mce_inject(void) goto err_dfs_add; } + mce_setup(&i_mce); + return 0; err_dfs_add: -- 2.11.0 -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply.