[tip: x86/urgent] x86/mce: Do not treat cache hierarchy errors as memory errors

From: tip-bot2 for Adrian Schlegel

Date: Fri Nov 20 2026 - 01:12:32 EST


The following commit has been merged into the x86/urgent branch of tip:

Commit-ID: 29b74cf57f432d60da2b79c827f1379125409611
Gitweb: https://git.kernel.org/tip/29b74cf57f432d60da2b79c827f1379125409611
Author: Adrian Schlegel <me@xxxxxxxxxxxxxxxxxx>
AuthorDate: Mon, 12 Oct 2026 21:33:05 +02:00
Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx>
CommitterDate: Thu, 19 Nov 2026 21:58:07 -08:00

x86/mce: Do not treat cache hierarchy errors as memory errors

On Intel and Zhaoxin, mce_is_memory_error() also returns true for cache
hierarchy errors. All callers expect it to report memory errors only.

The CEC uses it to count corrected DRAM errors. A corrected cache error only
names the cache line that was affected, not a faulty DRAM page. With a faulty
CPU core, the CEC therefore soft-offlines healthy pages. On an i9-9900K this
caused about 500 soft-offline attempts per hour.

Report only memory controller errors on Intel and Zhaoxin, as is already done
for AMD.

Fixes: fa92c5869426 ("x86, mce: Support memory error recovery for both UCNA and Deferred error in machine_check_poll")
Signed-off-by: Adrian Schlegel <me@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Reviewed-by: Qiuxu Zhuo <qzhuo@xxxxxxxxxx>
Reviewed-by: Tony Luck <tony.luck@xxxxxxxxx>
Reviewed-by: Yazen Ghannam <yazen.ghannam@xxxxxxx>
Reviewed-by: Sohil Mehta <sohil.mehta@xxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Link: https://patch.msgid.link/20261012193305.38931-1-me@xxxxxxxxxxxxxxxxxx
---
arch/x86/kernel/cpu/mce/core.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 50b1614..eb0e51a 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -540,21 +540,13 @@ bool mce_is_memory_error(struct mce *m)
case X86_VENDOR_INTEL:
case X86_VENDOR_ZHAOXIN:
/*
- * Intel SDM Volume 3B - 15.9.2 Compound Error Codes
+ * Intel SDM Volume 3B "Compound Error Codes".
*
- * Bit 7 of the MCACOD field of IA32_MCi_STATUS is used for
- * indicating a memory error. Bit 8 is used for indicating a
- * cache hierarchy error. The combination of bit 2 and bit 3
- * is used for indicating a `generic' cache hierarchy error
- * But we can't just blindly check the above bits, because if
- * bit 11 is set, then it is a bus/interconnect error - and
- * either way the above bits just gives more detail on what
- * bus/interconnect error happened. Note that bit 12 can be
- * ignored, as it's the "filter" bit.
+ * Memory controller errors have an MCACOD of 000F 0000 1MMM CCCC:
+ * bit 7 set, bits 8-11 and 13-15 clear. Bit 12 is the "filter"
+ * bit and is ignored.
*/
- return (m->status & 0xef80) == BIT(7) ||
- (m->status & 0xef00) == BIT(8) ||
- (m->status & 0xeffc) == 0xc;
+ return (m->status & 0xef80) == BIT(7);

default:
return false;