From: "tip-bot2 for Adrian Schlegel" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Adrian Schlegel <me@adrianschlegel.com>,
"Borislav Petkov (AMD)" <bp@alien8.de>,
Qiuxu Zhuo <qzhuo@nvidia.com>, Tony Luck <tony.luck@intel.com>,
Yazen Ghannam <yazen.ghannam@amd.com>,
Sohil Mehta <sohil.mehta@intel.com>, <stable@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] x86/mce: Do not treat cache hierarchy errors as memory errors
Date: Fri, 20 Nov 2026 06:12:17 -0000 [thread overview]
Message-ID: <179515513785.3191731.478144865512652784.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20261012193305.38931-1-me@adrianschlegel.com>
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@adrianschlegel.com>
AuthorDate: Mon, 12 Oct 2026 21:33:05 +02:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
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@adrianschlegel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Qiuxu Zhuo <qzhuo@nvidia.com>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Reviewed-by: Yazen Ghannam <yazen.ghannam@amd.com>
Reviewed-by: Sohil Mehta <sohil.mehta@intel.com>
Cc: <stable@kernel.org>
Link: https://patch.msgid.link/20261012193305.38931-1-me@adrianschlegel.com
---
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;
prev parent reply other threads:[~2026-11-20 6:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-27 15:19 [PATCH] RAS/CEC: Only count corrected DRAM errors on Intel Adrian Schlegel
2026-09-27 18:14 ` Borislav Petkov
2026-09-29 19:01 ` Luck, Tony
2026-10-03 22:20 ` [PATCH v2] x86/mce: Do not treat cache hierarchy errors as memory errors Adrian Schlegel
2026-10-03 23:17 ` Borislav Petkov
2026-10-05 15:30 ` Luck, Tony
2026-10-12 19:33 ` [PATCH v3] " Adrian Schlegel
2026-10-13 0:01 ` Luck, Tony
2026-10-13 1:04 ` Qiuxu (Leo) Zhuo
2026-10-19 15:32 ` Yazen Ghannam
2026-10-19 18:34 ` Adrian Schlegel
2026-10-19 18:42 ` Yazen Ghannam
2026-10-19 20:45 ` Sohil Mehta
2026-10-19 21:06 ` Luck, Tony
2026-10-20 17:09 ` Sohil Mehta
[not found] ` <CAN+_ncWbJh1iPzi+4tKdSguEo_SYj_4R3K=sNkG2_VT8TvkG5g@mail.gmail.com>
2026-11-13 14:35 ` Adrian Schlegel
2026-11-20 6:12 ` tip-bot2 for Adrian Schlegel [this message]
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=179515513785.3191731.478144865512652784.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=me@adrianschlegel.com \
--cc=qzhuo@nvidia.com \
--cc=sohil.mehta@intel.com \
--cc=stable@kernel.org \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
--cc=yazen.ghannam@amd.com \
/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
all inboxes | Powered by JetHome®