[PATCH v2 12/12] x86/sev: Support kexec under SEV-ES with AP Jump Table blob
From: Joerg Roedel <joro@8bytes.org>
Date: 2021-09-13 15:56:49
Also in:
kvm, lkml, virtualization
Subsystem:
the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
From: Joerg Roedel <redacted> When the AP Jump Table blob is installed the kernel can hand over the APs from the old to the new kernel. Enable kexec when the AP Jump Table blob has been installed. Signed-off-by: Joerg Roedel <redacted> --- arch/x86/include/asm/sev.h | 2 ++ arch/x86/kernel/machine_kexec_64.c | 6 +++++- arch/x86/kernel/sev.c | 12 ++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h
index cd14b6e10f12..61910caf2a0d 100644
--- a/arch/x86/include/asm/sev.h
+++ b/arch/x86/include/asm/sev.h@@ -87,6 +87,7 @@ static __always_inline void sev_es_stop_this_cpu(void) if (static_branch_unlikely(&sev_es_enable_key)) __sev_es_stop_this_cpu(); } +bool sev_kexec_supported(void); #else static inline void sev_es_ist_enter(struct pt_regs *regs) { } static inline void sev_es_ist_exit(void) { }
@@ -94,6 +95,7 @@ static inline int sev_es_setup_ap_jump_table(struct real_mode_header *rmh) { ret static inline void sev_es_nmi_complete(void) { } static inline int sev_es_efi_map_ghcbs(pgd_t *pgd) { return 0; } static inline void sev_es_stop_this_cpu(void) { } +static bool sev_kexec_supported(void) { return true; } #endif #endif
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
index a8e16a411b40..06ff51b2b3fb 100644
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c@@ -26,6 +26,7 @@ #include <asm/kexec-bzimage64.h> #include <asm/setup.h> #include <asm/set_memory.h> +#include <asm/sev.h> #ifdef CONFIG_ACPI /*
@@ -597,5 +598,8 @@ void arch_kexec_pre_free_pages(void *vaddr, unsigned int pages) */ bool arch_kexec_supported(void) { - return !sev_es_active(); + if (!sev_kexec_supported()) + return false; + + return true; }
diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c
index 5d4b1d317317..8c7f1ad69185 100644
--- a/arch/x86/kernel/sev.c
+++ b/arch/x86/kernel/sev.c@@ -901,6 +901,18 @@ static int __init sev_es_setup_ap_jump_table_blob(void) } core_initcall(sev_es_setup_ap_jump_table_blob); +bool sev_kexec_supported(void) +{ + /* + * KEXEC with SEV-ES and more than one CPU is only supported + * when the AP Jump Table is installed. + */ + if (num_possible_cpus() > 1) + return !sev_es_active() || sev_ap_jumptable_blob_installed; + else + return true; +} + static void __init alloc_runtime_data(int cpu) { struct sev_es_runtime_data *data;
--
2.33.0