x86/mtrr: Check if fixed-range MTRRs exist in mtrr_save_fixed_ranges()
authorJiaqing Zhao <jiaqing.zhao@linux.intel.com>
Fri, 9 May 2025 17:06:33 +0000 (17:06 +0000)
committerBorislav Petkov (AMD) <bp@alien8.de>
Mon, 12 May 2025 11:04:40 +0000 (13:04 +0200)
When suspending, save_processor_state() calls mtrr_save_fixed_ranges()
to save fixed-range MTRRs.

On platforms without fixed-range MTRRs like the ACRN hypervisor which
has removed fixed-range MTRR emulation, accessing these MSRs will
trigger an unchecked MSR access error. Make sure fixed-range MTRRs are
supported before access to prevent such error.

Since mtrr_state.have_fixed is only set when MTRRs are present and
enabled, checking the CPU feature flag in mtrr_save_fixed_ranges() is
unnecessary.

Fixes: 3ebad5905609 ("[PATCH] x86: Save and restore the fixed-range MTRRs of the BSP when suspending")
Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/20250509170633.3411169-2-jiaqing.zhao@linux.intel.com
arch/x86/kernel/cpu/mtrr/generic.c

index e2c6b471d2302a9c694f1e83a4ecd24b518b7a43..8c18327eb10bbb3557f6b032d1eced31e580beac 100644 (file)
@@ -593,7 +593,7 @@ static void get_fixed_ranges(mtrr_type *frs)
 
 void mtrr_save_fixed_ranges(void *info)
 {
-       if (boot_cpu_has(X86_FEATURE_MTRR))
+       if (mtrr_state.have_fixed)
                get_fixed_ranges(mtrr_state.fixed_ranges);
 }