From: Vasant Karasulli <vsntk18@gmail.com>
To: x86@kernel.org
Cc: joro@8bytes.org, cfir@google.com, dan.j.williams@intel.com,
dave.hansen@linux.intel.com, ebiederm@xmission.com,
erdemaktas@google.com, hpa@zytor.com, jgross@suse.com,
jslaby@suse.cz, keescook@chromium.org, kexec@lists.infradead.org,
kvm@vger.kernel.org, linux-coco@lists.linux.dev,
linux-kernel@vger.kernel.org, luto@kernel.org,
martin.b.radev@gmail.com, mhiramat@kernel.org,
mstunes@vmware.com, nivedita@alum.mit.edu, peterz@infradead.org,
rientjes@google.com, seanjc@google.com, stable@vger.kernel.org,
thomas.lendacky@amd.com,
virtualization@lists.linux-foundation.org,
Joerg Roedel <jroedel@suse.de>,
Vasant Karasulli <vkarasulli@suse.de>
Subject: [PATCH v4 6/9] x86/sev: Use AP Jump Table blob to stop CPU
Date: Mon, 11 Mar 2024 17:17:24 +0100 [thread overview]
Message-ID: <20240311161727.14916-7-vsntk18@gmail.com> (raw)
In-Reply-To: <20240311161727.14916-1-vsntk18@gmail.com>
From: Joerg Roedel <jroedel@suse.de>
To support kexec under SEV-ES the APs can't be parked with HLT. Upon
wakeup the AP needs to find its way to execute at the reset vector set
by the new kernel and in real-mode.
This is what the AP jump table blob provides, so stop the APs the
SEV-ES way by calling the AP-reset-hold VMGEXIT from the AP jump
table.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Vasant Karasulli <vkarasulli@suse.de>
---
arch/x86/include/asm/sev.h | 2 ++
arch/x86/kernel/process.c | 8 ++++++++
arch/x86/kernel/sev.c | 15 ++++++++++++++-
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h
index c48db0bfb707..2dbd2238325a 100644
--- a/arch/x86/include/asm/sev.h
+++ b/arch/x86/include/asm/sev.h
@@ -216,6 +216,7 @@ int snp_issue_guest_request(u64 exit_code, struct snp_req_data *input, struct sn
void snp_accept_memory(phys_addr_t start, phys_addr_t end);
u64 snp_get_unsupported_features(u64 status);
u64 sev_get_status(void);
+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) { }
@@ -244,6 +245,7 @@ static inline int snp_issue_guest_request(u64 exit_code, struct snp_req_data *in
static inline void snp_accept_memory(phys_addr_t start, phys_addr_t end) { }
static inline u64 snp_get_unsupported_features(u64 status) { return 0; }
static inline u64 sev_get_status(void) { return 0; }
+static inline void sev_es_stop_this_cpu(void) { }
#endif
#endif
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index ab49ade31b0d..ddc3fa076f4d 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -52,6 +52,7 @@
#include <asm/tdx.h>
#include <asm/mmu_context.h>
#include <asm/shstk.h>
+#include <asm/sev.h>
#include "process.h"
@@ -836,6 +837,13 @@ void __noreturn stop_this_cpu(void *dummy)
cpumask_clear_cpu(cpu, &cpus_stop_mask);
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
diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c
index 08bf897361b9..10f4294904b4 100644
--- a/arch/x86/kernel/sev.c
+++ b/arch/x86/kernel/sev.c
@@ -1350,7 +1350,6 @@ void setup_ghcb(void)
snp_register_ghcb_early(__pa(&boot_ghcb_page));
}
-#ifdef CONFIG_HOTPLUG_CPU
void __noreturn sev_jumptable_ap_park(void)
{
local_irq_disable();
@@ -1383,6 +1382,20 @@ void __noreturn sev_jumptable_ap_park(void)
}
STACK_FRAME_NON_STANDARD(sev_jumptable_ap_park);
+void sev_es_stop_this_cpu(void)
+{
+ if (!(cc_vendor == CC_VENDOR_AMD) ||
+ !cc_platform_has(CC_ATTR_GUEST_STATE_ENCRYPT))
+ 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;
--
2.34.1
next prev parent reply other threads:[~2024-03-11 16:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-11 16:17 [PATCH v4 0/9] x86/sev: KEXEC/KDUMP support for SEV-ES guests Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 1/9] x86/kexec/64: Disable kexec when SEV-ES is active Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 2/9] x86/sev: Save and print negotiated GHCB protocol version Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 3/9] x86/sev: Set GHCB data structure version Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 4/9] x86/sev: Setup code to park APs in the AP Jump Table Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 5/9] x86/sev: Park APs on AP Jump Table with GHCB protocol version 2 Vasant Karasulli
2024-03-11 16:17 ` Vasant Karasulli [this message]
2024-03-11 16:17 ` [PATCH v4 7/9] x86/sev: Add MMIO handling support to boot/compressed/ code Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 8/9] x86/sev: Handle CLFLUSH MMIO events Vasant Karasulli
2024-03-11 16:17 ` [PATCH v4 9/9] x86/kexec/64: Support kexec under SEV-ES with AP Jump Table Blob Vasant Karasulli
2024-03-11 19:19 ` [PATCH v4 0/9] x86/sev: KEXEC/KDUMP support for SEV-ES guests Tom Lendacky
[not found] ` <CAF2zH5qZKEmECy=9vG4sLmdDt5k7nC=MwjKvJLyVfPyFzt+0hA@mail.gmail.com>
2024-03-12 14:04 ` Tom Lendacky
2024-03-12 15:16 ` Vasant Karasulli
2024-03-12 16:13 ` Tom Lendacky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240311161727.14916-7-vsntk18@gmail.com \
--to=vsntk18@gmail.com \
--cc=cfir@google.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=ebiederm@xmission.com \
--cc=erdemaktas@google.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=jslaby@suse.cz \
--cc=keescook@chromium.org \
--cc=kexec@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=linux-coco@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=martin.b.radev@gmail.com \
--cc=mhiramat@kernel.org \
--cc=mstunes@vmware.com \
--cc=nivedita@alum.mit.edu \
--cc=peterz@infradead.org \
--cc=rientjes@google.com \
--cc=seanjc@google.com \
--cc=stable@vger.kernel.org \
--cc=thomas.lendacky@amd.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=vkarasulli@suse.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).