diff options
| author | Joerg Roedel <jroedel@suse.de> | 2021-03-03 15:17:15 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-03-09 12:33:46 +0100 |
| commit | 62441a1fb53263bda349b6e5997c3cc5c120d89e (patch) | |
| tree | a37b3d0c250798e47a5b56e2139e279919d92200 | |
| parent | 545ac14c16b5dbd909d5a90ddf5b5a629a40fa94 (diff) | |
| download | linux-stable-62441a1fb53263bda349b6e5997c3cc5c120d89e.tar.gz linux-stable-62441a1fb53263bda349b6e5997c3cc5c120d89e.tar.bz2 linux-stable-62441a1fb53263bda349b6e5997c3cc5c120d89e.zip | |
x86/sev-es: Correctly track IRQ states in runtime #VC handler
Call irqentry_nmi_enter()/irqentry_nmi_exit() in the #VC handler to
correctly track the IRQ state during its execution.
Fixes: 0786138c78e79 ("x86/sev-es: Add a Runtime #VC Exception Handler")
Reported-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: stable@vger.kernel.org # v5.10+
Link: https://lkml.kernel.org/r/20210303141716.29223-5-joro@8bytes.org
| -rw-r--r-- | arch/x86/kernel/sev-es.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/sev-es.c b/arch/x86/kernel/sev-es.c index 301f20f6d4dd..c3fd8fa79838 100644 --- a/arch/x86/kernel/sev-es.c +++ b/arch/x86/kernel/sev-es.c @@ -1258,13 +1258,12 @@ static __always_inline bool on_vc_fallback_stack(struct pt_regs *regs) DEFINE_IDTENTRY_VC_SAFE_STACK(exc_vmm_communication) { struct sev_es_runtime_data *data = this_cpu_read(runtime_data); + irqentry_state_t irq_state; struct ghcb_state state; struct es_em_ctxt ctxt; enum es_result result; struct ghcb *ghcb; - lockdep_assert_irqs_disabled(); - /* * Handle #DB before calling into !noinstr code to avoid recursive #DB. */ @@ -1273,6 +1272,8 @@ DEFINE_IDTENTRY_VC_SAFE_STACK(exc_vmm_communication) return; } + irq_state = irqentry_nmi_enter(regs); + lockdep_assert_irqs_disabled(); instrumentation_begin(); /* @@ -1335,6 +1336,7 @@ DEFINE_IDTENTRY_VC_SAFE_STACK(exc_vmm_communication) out: instrumentation_end(); + irqentry_nmi_exit(regs, irq_state); return; |