Skip to content

Commit 90b926e

Browse files
jgross1bp3tk0v
authored andcommitted
x86/pat: Fix pat_x_mtrr_type() for MTRR disabled case
Since 72cbc8f ("x86/PAT: Have pat_enabled() properly reflect state when running on Xen") PAT can be enabled without MTRR. This has resulted in problems e.g. for a SEV-SNP guest running under Hyper-V, when trying to establish a new mapping via memremap() with WB caching mode, as pat_x_mtrr_type() will call mtrr_type_lookup(), which in turn is returning MTRR_TYPE_INVALID due to MTRR being disabled in this configuration. The result is a mapping with UC- caching, leading to severe performance degradation. Fix that by handling MTRR_TYPE_INVALID the same way as MTRR_TYPE_WRBACK in pat_x_mtrr_type() because MTRR_TYPE_INVALID means MTRRs are disabled. [ bp: Massage commit message. ] Fixes: 72cbc8f ("x86/PAT: Have pat_enabled() properly reflect state when running on Xen") Reported-by: Michael Kelley (LINUX) <[email protected]> Signed-off-by: Juergen Gross <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Reviewed-by: Michael Kelley <[email protected]> Tested-by: Michael Kelley <[email protected]> Cc: <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 7c6dd96 commit 90b926e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/x86/mm/pat/memtype.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,8 @@ static unsigned long pat_x_mtrr_type(u64 start, u64 end,
387387
u8 mtrr_type, uniform;
388388

389389
mtrr_type = mtrr_type_lookup(start, end, &uniform);
390-
if (mtrr_type != MTRR_TYPE_WRBACK)
390+
if (mtrr_type != MTRR_TYPE_WRBACK &&
391+
mtrr_type != MTRR_TYPE_INVALID)
391392
return _PAGE_CACHE_MODE_UC_MINUS;
392393

393394
return _PAGE_CACHE_MODE_WB;

0 commit comments

Comments
 (0)