From: Andi Kleen <ak@linux.intel.com>
To: tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org, x86@kernel.org,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH v5] x86/mtrr: Check if fixed MTRRs exist before saving them
Date: Wed, 7 Aug 2024 17:02:44 -0700 [thread overview]
Message-ID: <20240808000244.946864-1-ak@linux.intel.com> (raw)
MTRRs have an obsolete fixed variant for fine grained caching control
of the 640K-1MB region that uses separate MSRs. This fixed variant has
a separate capability bit in the MTRR capability MSR, however all x86
CPUs which have MTRR generally had this separate bit set.
The code to save MTRRs forgets to check the capability bit before
accessing the fixed MTRR MSRs. This results in a #GP on a system that
does not support the fixed MTRR capability. The #GP is harmless because
the RDMSR fault is handled and harmless, but results in a WARN_ON printout
that looks scary to the user.
Found by testing Linux on a setup without fixed MTRRs.
Fixes: 2b1f6278d77c ("[PATCH] x86: Save the MTRRs of the BSP before booting an AP")
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
v2: Add Fixes tag and expand description.
v3: Expand description
v4: Expand description
v5: Change description
---
arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.c b/arch/x86/kernel/cpu/mtrr/mtrr.c
index 767bf1c71aad..2a2fc14955cd 100644
--- a/arch/x86/kernel/cpu/mtrr/mtrr.c
+++ b/arch/x86/kernel/cpu/mtrr/mtrr.c
@@ -609,7 +609,7 @@ void mtrr_save_state(void)
{
int first_cpu;
- if (!mtrr_enabled())
+ if (!mtrr_enabled() || !mtrr_state.have_fixed)
return;
first_cpu = cpumask_first(cpu_online_mask);
--
2.45.2
next reply other threads:[~2024-08-08 0:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-08 0:02 Andi Kleen [this message]
2024-08-08 15:13 ` [tip: x86/urgent] x86/mtrr: Check if fixed MTRRs exist before saving them tip-bot2 for Andi Kleen
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=20240808000244.946864-1-ak@linux.intel.com \
--to=ak@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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