]> git.baikalelectronics.ru Git - kernel.git/commit
x86/sev: Check SME/SEV support in CPUID first
authorPu Wen <puwen@hygon.cn>
Wed, 2 Jun 2021 07:02:07 +0000 (15:02 +0800)
committerBorislav Petkov <bp@suse.de>
Fri, 4 Jun 2021 16:39:09 +0000 (18:39 +0200)
commit34cbf8649e7ed669a75bff88f012e680c8be6142
treed2d5846f0ed5a25530597269c3a86d779d90f64f
parent0a391366ddcca33921b6f49ac8c90b1b7513065c
x86/sev: Check SME/SEV support in CPUID first

The first two bits of the CPUID leaf 0x8000001F EAX indicate whether SEV
or SME is supported, respectively. It's better to check whether SEV or
SME is actually supported before accessing the MSR_AMD64_SEV to check
whether SEV or SME is enabled.

This is both a bare-metal issue and a guest/VM issue. Since the first
generation Hygon Dhyana CPU doesn't support the MSR_AMD64_SEV, reading that
MSR results in a #GP - either directly from hardware in the bare-metal
case or via the hypervisor (because the RDMSR is actually intercepted)
in the guest/VM case, resulting in a failed boot. And since this is very
early in the boot phase, rdmsrl_safe()/native_read_msr_safe() can't be
used.

So check the CPUID bits first, before accessing the MSR.

 [ tlendacky: Expand and improve commit message. ]
 [ bp: Massage commit message. ]

Fixes: 4ea991037211 ("x86/sev: Do not require Hypervisor CPUID bit for SEV guests")
Signed-off-by: Pu Wen <puwen@hygon.cn>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Tom Lendacky <thomas.lendacky@amd.com>
Cc: <stable@vger.kernel.org> # v5.10+
Link: https://lkml.kernel.org/r/20210602070207.2480-1-puwen@hygon.cn
arch/x86/mm/mem_encrypt_identity.c