File 5b348954-x86-guard-against-NM.patch of Package xen.8389
# Commit 00cebd6f22beb6d5fa65ed2d8d1ff9acf59bce61
# Date 2018-06-28 09:08:04 +0200
# Author Jan Beulich <jbeulich@suse.com>
# Committer Jan Beulich <jbeulich@suse.com>
x86: guard against #NM
Just in case we still don't get CR0.TS handling right, prevent a host
crash by honoring exception fixups in do_device_not_available(). This
would in particular cover emulator stubs raising #NM.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -1722,7 +1722,21 @@ void do_device_not_available(struct cpu_
{
struct vcpu *curr = current;
- BUG_ON(!guest_mode(regs));
+ if ( !guest_mode(regs) )
+ {
+ unsigned long fixup = search_exception_table(regs);
+
+ gprintk(XENLOG_ERR, "#NM: %p [%ps] -> %p\n",
+ _p(regs->rip), _p(regs->rip), _p(fixup));
+ /*
+ * We shouldn't be able to reach here, but for release builds have
+ * the recovery logic in place nevertheless.
+ */
+ ASSERT_UNREACHABLE();
+ BUG_ON(!fixup);
+ regs->rip = fixup;
+ return;
+ }
vcpu_restore_fpu_lazy(curr);