From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.skyhub.de ([2a01:4f8:190:11c2::b:1457]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mmgxr-00GlRu-Og for kexec@lists.infradead.org; Mon, 15 Nov 2021 18:44:28 +0000 Date: Mon, 15 Nov 2021 19:44:14 +0100 From: Borislav Petkov Subject: Re: [PATCH v2 09/12] x86/sev: Use AP Jump Table blob to stop CPU Message-ID: References: <20210913155603.28383-1-joro@8bytes.org> <20210913155603.28383-10-joro@8bytes.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210913155603.28383-10-joro@8bytes.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Joerg Roedel Cc: x86@kernel.org, Eric Biederman , kexec@lists.infradead.org, Joerg Roedel , hpa@zytor.com, Andy Lutomirski , Dave Hansen , Peter Zijlstra , Jiri Slaby , Dan Williams , Tom Lendacky , Juergen Gross , Kees Cook , David Rientjes , Cfir Cohen , Erdem Aktas , Masami Hiramatsu , Mike Stunes , Sean Christopherson , Martin Radev , Arvind Sankar , linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org On Mon, Sep 13, 2021 at 05:56:00PM +0200, Joerg Roedel wrote: > diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h > index 134a7c9d91b6..cd14b6e10f12 100644 > --- a/arch/x86/include/asm/sev.h > +++ b/arch/x86/include/asm/sev.h > @@ -81,12 +81,19 @@ static __always_inline void sev_es_nmi_complete(void) > __sev_es_nmi_complete(); > } > extern int __init sev_es_efi_map_ghcbs(pgd_t *pgd); > +void __sev_es_stop_this_cpu(void); > +static __always_inline void sev_es_stop_this_cpu(void) What's that for? IOW, the below seems to build too: --- diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index 1f16fc907636..398105580862 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -87,12 +87,7 @@ 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); -static __always_inline void sev_es_stop_this_cpu(void) -{ - if (static_branch_unlikely(&sev_es_enable_key)) - __sev_es_stop_this_cpu(); -} +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) { } diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c index 39378357dc5a..7a74b3273f1a 100644 --- a/arch/x86/kernel/sev.c +++ b/arch/x86/kernel/sev.c @@ -694,8 +694,11 @@ void __noreturn sev_jumptable_ap_park(void) } STACK_FRAME_NON_STANDARD(sev_jumptable_ap_park); -void __sev_es_stop_this_cpu(void) +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; --- And as previously mentioned s/sev_es/sev/ if those are going to be used on SNP guests too. -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec