@@ -90,12 +90,14 @@ extern enum es_result sev_es_ghcb_hv_call(struct ghcb *ghcb,
struct es_em_ctxt *ctxt,
u64 exit_code, u64 exit_info_1,
u64 exit_info_2);
+void sev_es_stop_this_cpu(void);
#else
static inline void sev_es_ist_enter(struct pt_regs *regs) { }
static inline void sev_es_ist_exit(void) { }
static inline int sev_es_setup_ap_jump_table(struct real_mode_header *rmh) { return 0; }
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) { }
#endif
#endif
@@ -46,6 +46,7 @@
#include <asm/proto.h>
#include <asm/frame.h>
#include <asm/unwind.h>
+#include <asm/sev.h>
#include "process.h"
@@ -769,6 +770,13 @@ void stop_this_cpu(void *dummy)
if (boot_cpu_has(X86_FEATURE_SME))
native_wbinvd();
for (;;) {
+ /*
+ * SEV-ES guests need a special stop routine to support
+ * kexec. Try this first, if it fails the function will
+ * return and native_halt() is used.
+ */
+ sev_es_stop_this_cpu();
+
/*
* Use native_halt() so that memory contents don't change
* (stack usage and variables) after possibly issuing the
@@ -673,7 +673,6 @@ static bool __init sev_es_setup_ghcb(void)
return true;
}
-#ifdef CONFIG_HOTPLUG_CPU
void __noreturn sev_jumptable_ap_park(void)
{
local_irq_disable();
@@ -706,6 +705,19 @@ void __noreturn sev_jumptable_ap_park(void)
}
STACK_FRAME_NON_STANDARD(sev_jumptable_ap_park);
+void sev_es_stop_this_cpu(void)
+{
+ if (!static_branch_unlikely(&sev_es_enable_key))
+ return;
+
+ /* Only park in the AP jump table when the code has been installed */
+ if (!sev_ap_jumptable_blob_installed)
+ return;
+
+ sev_jumptable_ap_park();
+}
+
+#ifdef CONFIG_HOTPLUG_CPU
static void sev_es_ap_hlt_loop(void)
{
struct ghcb_state state;