Skip to content

Commit f9781bb

Browse files
jchu314atgithubsuryasaimadhu
authored andcommitted
x86/mce: Retrieve poison range from hardware
When memory poison consumption machine checks fire, MCE notifier handlers like nfit_handle_mce() record the impacted physical address range which is reported by the hardware in the MCi_MISC MSR. The error information includes data about blast radius, i.e. how many cachelines did the hardware determine are impacted. A recent change 7917f9c ("acpi/nfit: rely on mce->misc to determine poison granularity") updated nfit_handle_mce() to stop hard coding the blast radius value of 1 cacheline, and instead rely on the blast radius reported in 'struct mce' which can be up to 4K (64 cachelines). It turns out that apei_mce_report_mem_error() had a similar problem in that it hard coded a blast radius of 4K rather than reading the blast radius from the error information. Fix apei_mce_report_mem_error() to convey the proper poison granularity. Signed-off-by: Jane Chu <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Reviewed-by: Dan Williams <[email protected]> Reviewed-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Link: https://lore.kernel.org/r/[email protected]
1 parent d25c694 commit f9781bb

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,26 @@
2929
void apei_mce_report_mem_error(int severity, struct cper_sec_mem_err *mem_err)
3030
{
3131
struct mce m;
32+
int lsb;
3233

3334
if (!(mem_err->validation_bits & CPER_MEM_VALID_PA))
3435
return;
3536

37+
/*
38+
* Even if the ->validation_bits are set for address mask,
39+
* to be extra safe, check and reject an error radius '0',
40+
* and fall back to the default page size.
41+
*/
42+
if (mem_err->validation_bits & CPER_MEM_VALID_PA_MASK)
43+
lsb = find_first_bit((void *)&mem_err->physical_addr_mask, PAGE_SHIFT);
44+
else
45+
lsb = PAGE_SHIFT;
46+
3647
mce_setup(&m);
3748
m.bank = -1;
3849
/* Fake a memory read error with unknown channel */
3950
m.status = MCI_STATUS_VAL | MCI_STATUS_EN | MCI_STATUS_ADDRV | MCI_STATUS_MISCV | 0x9f;
40-
m.misc = (MCI_MISC_ADDR_PHYS << 6) | PAGE_SHIFT;
51+
m.misc = (MCI_MISC_ADDR_PHYS << 6) | lsb;
4152

4253
if (severity >= GHES_SEV_RECOVERABLE)
4354
m.status |= MCI_STATUS_UC;

0 commit comments

Comments
 (0)