Changeset 51934 in vbox

Timestamp:

Jul 8, 2014 2:35:49 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

94826

Message:

VMM/EM: Reschedule halted VCPUs if NMI/SMI shows up.

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/EM.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/vm.h

@@ -424 +424 @@
 /** Externally forced VMCPU actions. Used to quit the idle/wait loop. */
 #define VMCPU_FF_EXTERNAL_HALTED_MASK           (  VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC | VMCPU_FF_REQUEST \
-                                                 | VMCPU_FF_TIMER)
+                                                 | VMCPU_FF_INTERRUPT_NMI  | VMCPU_FF_INTERRUPT_SMI | VMCPU_FF_TIMER)
 
 /** High priority VM pre-execution actions. */

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -2551 +2551 @@
                         rc = VMR3WaitHalted(pVM, pVCpu, false /*fIgnoreInterrupts*/);
                         if (   rc == VINF_SUCCESS
-                            && VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))
+                            && VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC
+                                                        | VMCPU_FF_INTERRUPT_NMI  | VMCPU_FF_INTERRUPT_SMI))
                         {
                             Log(("EMR3ExecuteVM: Triggering reschedule on pending IRQ after MWAIT\n"));
@@ -2558 +2559 @@
                     }
                     else
+                    {
                         rc = VMR3WaitHalted(pVM, pVCpu, !(CPUMGetGuestEFlags(pVCpu) & X86_EFL_IF));
+                        if (   rc == VINF_SUCCESS
+                            && VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_NMI | VMCPU_FF_INTERRUPT_SMI))
+                        {
+                            Log(("EMR3ExecuteVM: Triggering reschedule on pending NMI/SMI after HLT\n"));
+                            rc = VINF_EM_RESCHEDULE;
+                        }
+                    }
 
                     STAM_REL_PROFILE_STOP(&pVCpu->em.s.StatHalted, y);