Skip to content

Commit bee6cf1

Browse files
committed
x86/sev: Do not try to parse for the CC blob on non-AMD hardware
Tao Liu reported a boot hang on an Intel Atom machine due to an unmapped EFI config table. The reason being that the CC blob which contains the CPUID page for AMD SNP guests is parsed for before even checking whether the machine runs on AMD hardware. Usually that's not a problem on !AMD hw - it simply won't find the CC blob's GUID and return. However, if any parts of the config table pointers array is not mapped, the kernel will #PF very early in the decompressor stage without any opportunity to recover. Therefore, do a superficial CPUID check before poking for the CC blob. This will fix the current issue on real hardware. It would also work as a guest on a non-lying hypervisor. For the lying hypervisor, the check is done again, *after* parsing the CC blob as the real CPUID page will be present then. Clear the #VC handler in case SEV-{ES,SNP} hasn't been detected, as a precaution. Fixes: c01fce9 ("x86/compressed: Add SEV-SNP feature detection/setup") Reported-by: Tao Liu <ltao@redhat.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Acked-by: Tom Lendacky <thomas.lendacky@amd.com> Tested-by: Tao Liu <ltao@redhat.com> Cc: <stable@kernel.org> Link: https://lore.kernel.org/r/20230601072043.24439-1-ltao@redhat.com
1 parent 52a93d3 commit bee6cf1

File tree

2 files changed

+43
-3
lines changed

2 files changed

+43
-3
lines changed

arch/x86/boot/compressed/idt_64.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,14 @@ void load_stage2_idt(void)
6363
set_idt_entry(X86_TRAP_PF, boot_page_fault);
6464

6565
#ifdef CONFIG_AMD_MEM_ENCRYPT
66-
set_idt_entry(X86_TRAP_VC, boot_stage2_vc);
66+
/*
67+
* Clear the second stage #VC handler in case guest types
68+
* needing #VC have not been detected.
69+
*/
70+
if (sev_status & BIT(1))
71+
set_idt_entry(X86_TRAP_VC, boot_stage2_vc);
72+
else
73+
set_idt_entry(X86_TRAP_VC, NULL);
6774
#endif
6875

6976
load_boot_idt(&boot_idt_desc);

arch/x86/boot/compressed/sev.c

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,21 +404,54 @@ void sev_enable(struct boot_params *bp)
404404
if (bp)
405405
bp->cc_blob_address = 0;
406406

407+
/*
408+
* Do an initial SEV capability check before snp_init() which
409+
* loads the CPUID page and the same checks afterwards are done
410+
* without the hypervisor and are trustworthy.
411+
*
412+
* If the HV fakes SEV support, the guest will crash'n'burn
413+
* which is good enough.
414+
*/
415+
416+
/* Check for the SME/SEV support leaf */
417+
eax = 0x80000000;
418+
ecx = 0;
419+
native_cpuid(&eax, &ebx, &ecx, &edx);
420+
if (eax < 0x8000001f)
421+
return;
422+
423+
/*
424+
* Check for the SME/SEV feature:
425+
* CPUID Fn8000_001F[EAX]
426+
* - Bit 0 - Secure Memory Encryption support
427+
* - Bit 1 - Secure Encrypted Virtualization support
428+
* CPUID Fn8000_001F[EBX]
429+
* - Bits 5:0 - Pagetable bit position used to indicate encryption
430+
*/
431+
eax = 0x8000001f;
432+
ecx = 0;
433+
native_cpuid(&eax, &ebx, &ecx, &edx);
434+
/* Check whether SEV is supported */
435+
if (!(eax & BIT(1)))
436+
return;
437+
407438
/*
408439
* Setup/preliminary detection of SNP. This will be sanity-checked
409440
* against CPUID/MSR values later.
410441
*/
411442
snp = snp_init(bp);
412443

413-
/* Check for the SME/SEV support leaf */
444+
/* Now repeat the checks with the SNP CPUID table. */
445+
446+
/* Recheck the SME/SEV support leaf */
414447
eax = 0x80000000;
415448
ecx = 0;
416449
native_cpuid(&eax, &ebx, &ecx, &edx);
417450
if (eax < 0x8000001f)
418451
return;
419452

420453
/*
421-
* Check for the SME/SEV feature:
454+
* Recheck for the SME/SEV feature:
422455
* CPUID Fn8000_001F[EAX]
423456
* - Bit 0 - Secure Memory Encryption support
424457
* - Bit 1 - Secure Encrypted Virtualization support

0 commit comments

Comments
 (0)