From: Joerg Roedel <joro@8bytes.org> To: x86@kernel.org Cc: Eric Biederman <ebiederm@xmission.com>, kexec@lists.infradead.org, Joerg Roedel <jroedel@suse.de>, hpa@zytor.com, Andy Lutomirski <luto@kernel.org>, Dave Hansen <dave.hansen@linux.intel.com>, Peter Zijlstra <peterz@infradead.org>, Jiri Slaby <jslaby@suse.cz>, Dan Williams <dan.j.williams@intel.com>, Tom Lendacky <thomas.lendacky@amd.com>, Juergen Gross <jgross@suse.com>, Kees Cook <keescook@chromium.org>, David Rientjes <rientjes@google.com>, Cfir Cohen <cfir@google.com>, Erdem Aktas <erdemaktas@google.com>, Masami Hiramatsu <mhiramat@kernel.org>, Mike Stunes <mstunes@vmware.com>, Sean Christopherson <seanjc@google.com>, Martin Radev <martin.b.radev@gmail.com>, Arvind Sankar <nivedita@alum.mit.edu>, Joerg Roedel <joro@8bytes.org>, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: [PATCH v2 12/12] x86/sev: Support kexec under SEV-ES with AP Jump Table blob Date: Mon, 13 Sep 2021 17:56:03 +0200 [thread overview] Message-ID: <20210913155603.28383-13-joro@8bytes.org> (raw) In-Reply-To: <20210913155603.28383-1-joro@8bytes.org> From: Joerg Roedel <jroedel@suse.de> 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 <jroedel@suse.de> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Joerg Roedel <joro@8bytes.org> To: x86@kernel.org Cc: kvm@vger.kernel.org, Peter Zijlstra <peterz@infradead.org>, Dave Hansen <dave.hansen@linux.intel.com>, virtualization@lists.linux-foundation.org, Arvind Sankar <nivedita@alum.mit.edu>, hpa@zytor.com, Jiri Slaby <jslaby@suse.cz>, Joerg Roedel <joro@8bytes.org>, David Rientjes <rientjes@google.com>, Masami Hiramatsu <mhiramat@kernel.org>, Martin Radev <martin.b.radev@gmail.com>, Tom Lendacky <thomas.lendacky@amd.com>, Joerg Roedel <jroedel@suse.de>, Kees Cook <keescook@chromium.org>, Cfir Cohen <cfir@google.com>, linux-coco@lists.linux.dev, Andy Lutomirski <luto@kernel.org>, Dan Williams <dan.j.williams@intel.com>, Juergen Gross <jgross@suse.com>, Mike Stunes <mstunes@vmware.com>, Sean Christopherson <seanjc@google.com>, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Eric Biederman <ebiederm@xmission.com>, Erdem Aktas <erdemaktas@google.com> Subject: [PATCH v2 12/12] x86/sev: Support kexec under SEV-ES with AP Jump Table blob Date: Mon, 13 Sep 2021 17:56:03 +0200 [thread overview] Message-ID: <20210913155603.28383-13-joro@8bytes.org> (raw) In-Reply-To: <20210913155603.28383-1-joro@8bytes.org> From: Joerg Roedel <jroedel@suse.de> 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 <jroedel@suse.de> --- 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 _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2021-09-13 15:56 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-13 15:55 [PATCH v2 00/12] x86/sev: KEXEC/KDUMP support for SEV-ES guests Joerg Roedel 2021-09-13 15:55 ` Joerg Roedel 2021-09-13 15:55 ` [PATCH v2 01/12] kexec: Allow architecture code to opt-out at runtime Joerg Roedel 2021-09-13 15:55 ` Joerg Roedel 2021-11-01 16:10 ` Borislav Petkov 2021-11-01 16:10 ` Borislav Petkov 2021-11-01 16:10 ` Borislav Petkov 2021-11-01 21:11 ` Eric W. Biederman 2021-11-01 21:11 ` Eric W. Biederman 2021-11-01 21:11 ` Eric W. Biederman 2021-11-02 16:37 ` Joerg Roedel 2021-11-02 16:37 ` Joerg Roedel 2021-11-02 16:37 ` Joerg Roedel 2021-11-02 17:00 ` Joerg Roedel 2021-11-02 17:00 ` Joerg Roedel 2021-11-02 17:00 ` Joerg Roedel 2021-11-02 18:17 ` Eric W. Biederman 2021-11-02 18:17 ` Eric W. Biederman 2021-11-02 18:17 ` Eric W. Biederman 2021-11-02 17:17 ` Borislav Petkov 2021-11-02 17:17 ` Borislav Petkov 2021-11-02 17:17 ` Borislav Petkov 2021-09-13 15:55 ` [PATCH v2 02/12] x86/kexec/64: Forbid kexec when running as an SEV-ES guest Joerg Roedel 2021-09-13 15:55 ` Joerg Roedel 2021-09-13 15:55 ` [PATCH v2 03/12] x86/sev: Save and print negotiated GHCB protocol version Joerg Roedel 2021-09-13 15:55 ` Joerg Roedel 2021-11-03 14:27 ` Borislav Petkov 2021-11-03 14:27 ` Borislav Petkov 2021-11-03 14:27 ` Borislav Petkov 2022-01-26 9:27 ` Joerg Roedel 2022-01-26 9:27 ` Joerg Roedel 2022-01-26 9:27 ` Joerg Roedel 2021-09-13 15:55 ` [PATCH v2 04/12] x86/sev: Do not hardcode " Joerg Roedel 2021-09-13 15:55 ` Joerg Roedel 2021-09-13 15:55 ` [PATCH v2 05/12] x86/sev: Use GHCB protocol version 2 if supported Joerg Roedel 2021-09-13 15:55 ` Joerg Roedel 2021-11-03 16:05 ` Borislav Petkov 2021-11-03 16:05 ` Borislav Petkov 2021-11-03 16:05 ` Borislav Petkov 2021-09-13 15:55 ` [PATCH v2 06/12] x86/sev: Cache AP Jump Table Address Joerg Roedel 2021-09-13 15:55 ` Joerg Roedel 2021-11-08 18:14 ` Borislav Petkov 2021-11-08 18:14 ` Borislav Petkov 2021-11-08 18:14 ` Borislav Petkov 2021-09-13 15:55 ` [PATCH v2 07/12] x86/sev: Setup code to park APs in the AP Jump Table Joerg Roedel 2021-09-13 15:55 ` Joerg Roedel 2021-11-10 16:37 ` Borislav Petkov 2021-11-10 16:37 ` Borislav Petkov 2021-11-10 16:37 ` Borislav Petkov 2022-01-26 14:26 ` Joerg Roedel 2022-01-26 14:26 ` Joerg Roedel 2022-01-26 14:26 ` Joerg Roedel 2021-09-13 15:55 ` [PATCH v2 08/12] x86/sev: Park APs on AP Jump Table with GHCB protocol version 2 Joerg Roedel 2021-09-13 15:55 ` Joerg Roedel 2021-11-12 16:33 ` Borislav Petkov 2021-11-12 16:33 ` Borislav Petkov 2021-11-12 16:33 ` Borislav Petkov 2022-01-27 9:01 ` Joerg Roedel 2022-01-27 9:01 ` Joerg Roedel 2022-01-27 9:01 ` Joerg Roedel 2021-09-13 15:56 ` [PATCH v2 09/12] x86/sev: Use AP Jump Table blob to stop CPU Joerg Roedel 2021-09-13 15:56 ` Joerg Roedel 2021-11-15 18:44 ` Borislav Petkov 2021-11-15 18:44 ` Borislav Petkov 2021-11-15 18:44 ` Borislav Petkov 2021-09-13 15:56 ` [PATCH v2 10/12] x86/sev: Add MMIO handling support to boot/compressed/ code Joerg Roedel 2021-09-13 15:56 ` Joerg Roedel 2021-09-13 15:56 ` [PATCH v2 11/12] x86/sev: Handle CLFLUSH MMIO events Joerg Roedel 2021-09-13 15:56 ` Joerg Roedel 2021-09-13 15:56 ` Joerg Roedel [this message] 2021-09-13 15:56 ` [PATCH v2 12/12] x86/sev: Support kexec under SEV-ES with AP Jump Table blob Joerg Roedel 2021-09-13 16:02 ` [PATCH v2 00/12] x86/sev: KEXEC/KDUMP support for SEV-ES guests Dave Hansen 2021-09-13 16:02 ` Dave Hansen 2021-09-13 16:02 ` Dave Hansen 2021-09-13 16:14 ` Joerg Roedel 2021-09-13 16:14 ` Joerg Roedel 2021-09-13 16:14 ` Joerg Roedel 2021-09-13 16:21 ` Dave Hansen 2021-09-13 16:21 ` Dave Hansen 2021-09-13 16:21 ` Dave Hansen
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=20210913155603.28383-13-joro@8bytes.org \ --to=joro@8bytes.org \ --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=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=thomas.lendacky@amd.com \ --cc=virtualization@lists.linux-foundation.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.