Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9013ac4d authored by Vishal Verma's avatar Vishal Verma Committed by Greg Kroah-Hartman
Browse files

acpi/nfit, x86/mce: Handle only uncorrectable machine checks 



commit 5d96c9342c23ee1d084802dcf064caa67ecaa45b upstream.

The MCE handler for nfit devices is called for memory errors on a
Non-Volatile DIMM and adds the error location to a 'badblocks' list.
This list is used by the various NVDIMM drivers to avoid consuming known
poison locations during IO.

The MCE handler gets called for both corrected and uncorrectable errors.
Until now, both kinds of errors have been added to the badblocks list.
However, corrected memory errors indicate that the problem has already
been fixed by hardware, and the resulting interrupt is merely a
notification to Linux.

As far as future accesses to that location are concerned, it is
perfectly fine to use, and thus doesn't need to be included in the above
badblocks list.

Add a check in the nfit MCE handler to filter out corrected mce events,
and only process uncorrectable errors.

Fixes: 6839a6d9 ("nfit: do an ARS scrub on hitting a latent media error")
Reported-by: default avatarOmar Avelar <omar.avelar@intel.com>
Signed-off-by: default avatarVishal Verma <vishal.l.verma@intel.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
CC: Arnd Bergmann <arnd@arndb.de>
CC: Dan Williams <dan.j.williams@intel.com>
CC: Dave Jiang <dave.jiang@intel.com>
CC: elliott@hpe.com
CC: "H. Peter Anvin" <hpa@zytor.com>
CC: Ingo Molnar <mingo@redhat.com>
CC: Len Brown <lenb@kernel.org>
CC: linux-acpi@vger.kernel.org
CC: linux-edac <linux-edac@vger.kernel.org>
CC: linux-nvdimm@lists.01.org
CC: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
CC: "Rafael J. Wysocki" <rjw@rjwysocki.net>
CC: Ross Zwisler <zwisler@kernel.org>
CC: stable <stable@vger.kernel.org>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Tony Luck <tony.luck@intel.com>
CC: x86-ml <x86@kernel.org>
CC: Yazen Ghannam <yazen.ghannam@amd.com>
Link: http://lkml.kernel.org/r/20181026003729.8420-1-vishal.l.verma@intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3690f530

arch/x86/include/asm/mce.h

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ static inline int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *s 


int mce_available(struct cpuinfo_x86 *c);

bool mce_is_memory_error(struct mce *m);

bool mce_is_correctable(struct mce *m);



DECLARE_PER_CPU(unsigned, mce_exception_count);

DECLARE_PER_CPU(unsigned, mce_poll_count);

arch/x86/kernel/cpu/mcheck/mce.c

+2 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ bool mce_is_memory_error(struct mce *m) 
}

EXPORT_SYMBOL_GPL(mce_is_memory_error);



static bool mce_is_correctable(struct mce *m)

bool mce_is_correctable(struct mce *m)

{

	if (m->cpuvendor == X86_VENDOR_AMD && m->status & MCI_STATUS_DEFERRED)

		return false;
@@ -544,6 +544,7 @@ static bool mce_is_correctable(struct mce *m) 


	return true;

}

EXPORT_SYMBOL_GPL(mce_is_correctable);



static bool cec_add_mce(struct mce *m)

{

drivers/acpi/nfit/mce.c

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ static int nfit_handle_mce(struct notifier_block *nb, unsigned long val, 
	struct acpi_nfit_desc *acpi_desc;

	struct nfit_spa *nfit_spa;



	/* We only care about memory errors */

	if (!mce_is_memory_error(mce))

	/* We only care about uncorrectable memory errors */

	if (!mce_is_memory_error(mce) || mce_is_correctable(mce))

		return NOTIFY_DONE;



	/*