diff options
| author | Joerg Roedel <jroedel@suse.de> | 2020-09-07 15:16:02 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-09-09 11:33:20 +0200 |
| commit | cb1ad3ecea959593400dfac4f027dbc005e62c39 (patch) | |
| tree | 06bcf285e1f07a59a8e4bfde430344c2d41eb282 /arch | |
| parent | a2d0171a9cf59637411281a929900fde80e6c1cb (diff) | |
| download | linux-stable-cb1ad3ecea959593400dfac4f027dbc005e62c39.tar.gz linux-stable-cb1ad3ecea959593400dfac4f027dbc005e62c39.tar.bz2 linux-stable-cb1ad3ecea959593400dfac4f027dbc005e62c39.zip | |
x86/sev-es: Handle #DB Events
Handle #VC exceptions caused by #DB exceptions in the guest. Those
must be handled outside of instrumentation_begin()/end() so that the
handler will not be raised recursively.
Handle them by calling the kernel's debug exception handler.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200907131613.12703-62-joro@8bytes.org
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/sev-es.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/x86/kernel/sev-es.c b/arch/x86/kernel/sev-es.c index 8867c481e3e2..79d5190cbc6b 100644 --- a/arch/x86/kernel/sev-es.c +++ b/arch/x86/kernel/sev-es.c @@ -922,6 +922,14 @@ static enum es_result vc_handle_trap_ac(struct ghcb *ghcb, return ES_EXCEPTION; } +static __always_inline void vc_handle_trap_db(struct pt_regs *regs) +{ + if (user_mode(regs)) + noist_exc_debug(regs); + else + exc_debug(regs); +} + static enum es_result vc_handle_exitcode(struct es_em_ctxt *ctxt, struct ghcb *ghcb, unsigned long exit_code) @@ -1033,6 +1041,15 @@ DEFINE_IDTENTRY_VC_SAFE_STACK(exc_vmm_communication) struct ghcb *ghcb; lockdep_assert_irqs_disabled(); + + /* + * Handle #DB before calling into !noinstr code to avoid recursive #DB. + */ + if (error_code == SVM_EXIT_EXCP_BASE + X86_TRAP_DB) { + vc_handle_trap_db(regs); + return; + } + instrumentation_begin(); /* |