diff mbox series

[6/6] x86/sev-es: Leave NMI-mode before sending signals

Message ID 20210512075445.18935-7-joro@8bytes.org (mailing list archive)
State New, archived
Headers show
Series x86/sev-es: Fixes for SEV-ES guest support | expand

Commit Message

Joerg Roedel May 12, 2021, 7:54 a.m. UTC
From: Joerg Roedel <jroedel@suse.de>

The error path in the runtime #VC handler sends a signal to kill the
current task if the exception was raised from user-space. Some parts of
the #VC handler run in NMI mode, because it is critical that it is not
interrupted (except from an NMI) while the GHCB is in use.

But sending signals in NMI-mode is actually broken and triggers lockdep
warnings. On the other side, when the signal is sent, there is no reason
for the handler to still be in NMI-mode, as the GHCB is not used

Leave NMI-mode before entering the error path to get rid of the lockdep

Fixes: 62441a1fb532 ("x86/sev-es: Correctly track IRQ states in runtime #VC handler")
Signed-off-by: Joerg Roedel <jroedel@suse.de>
 arch/x86/kernel/sev.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)
diff mbox series


diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c
index 77155c4f07f5..79cbed2f28de 100644
--- a/arch/x86/kernel/sev.c
+++ b/arch/x86/kernel/sev.c
@@ -1300,9 +1300,10 @@  DEFINE_IDTENTRY_VC_SAFE_STACK(exc_vmm_communication)
+	instrumentation_begin();
 	irq_state = irqentry_nmi_enter(regs);
-	instrumentation_begin();
 	 * This is invoked through an interrupt gate, so IRQs are disabled. The
@@ -1352,13 +1353,19 @@  DEFINE_IDTENTRY_VC_SAFE_STACK(exc_vmm_communication)
-	instrumentation_end();
 	irqentry_nmi_exit(regs, irq_state);
+	instrumentation_end();
+	/*
+	 * Leave NMI mode - the GHCB is not busy anymore and depending on where
+	 * the #VC came from this code is about to either kill the task (when in
+	 * task context) or kill the machine.
+	 */
+	irqentry_nmi_exit(regs, irq_state);
 	if (user_mode(regs)) {
 		 * Do not kill the machine if user-space triggered the
@@ -1380,7 +1387,9 @@  DEFINE_IDTENTRY_VC_SAFE_STACK(exc_vmm_communication)
 		panic("Returned from Terminate-Request to Hypervisor\n");
-	goto out;
+	instrumentation_end();
+	return;
 /* This handler runs on the #VC fall-back stack. It can cause further #VC exceptions */