Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3c189e7 authored by Jiaqing Zhao's avatar Jiaqing Zhao Committed by Greg Kroah-Hartman
Browse files

x86/mtrr: Check if fixed-range MTRRs exist in mtrr_save_fixed_ranges() 



[ Upstream commit 824c6384e8d9275d4ec7204f3f79a4ac6bc10379 ]

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: 3ebad590 ("[PATCH] x86: Save and restore the fixed-range MTRRs of the BSP when suspending")
Signed-off-by: default avatarJiaqing Zhao <jiaqing.zhao@linux.intel.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/20250509170633.3411169-2-jiaqing.zhao@linux.intel.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8eb5b081

arch/x86/kernel/cpu/mtrr/generic.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,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);

}