Changeset 20846 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jun 23, 2009 2:57:46 PM (16 years ago)

Author:

vboxsync

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

48985

Message:

If an active trap is already pending, then we must forward it first!

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (1 diff)
• HWVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -426 +426 @@
     }
 
-    if (VMCPU_FF_TESTANDCLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI_BIT))
-    {
-        SVM_EVENT Event;
-
-        Log(("CPU%d: injecting #NMI\n", pVCpu->idCpu));
-        Event.n.u8Vector     = X86_XCPT_NMI;
-        Event.n.u1Valid      = 1;
-        Event.n.u32ErrorCode = 0;
-        Event.n.u3Type       = SVM_EVENT_NMI;
-
-        SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
-        return VINF_SUCCESS;
-    }
-
-    /* @todo SMI interrupts. */
-
-    /* When external interrupts are pending, we should exit the VM when IF is set. */
-    if (    !TRPMHasTrap(pVCpu)
-        &&  VMCPU_FF_ISPENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC|VMCPU_FF_INTERRUPT_PIC)))
-    {
-        if (    !(pCtx->eflags.u32 & X86_EFL_IF)
-            ||  VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
-        {
-            if (!pVMCB->ctrl.IntCtrl.n.u1VIrqValid)
+    /* If an active trap is already pending, then we must forward it first! */
+    if (!TRPMHasTrap(pVCpu))
+    {
+        if (VMCPU_FF_TESTANDCLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI_BIT))
+        {
+            SVM_EVENT Event;
+
+            Log(("CPU%d: injecting #NMI\n", pVCpu->idCpu));
+            Event.n.u8Vector     = X86_XCPT_NMI;
+            Event.n.u1Valid      = 1;
+            Event.n.u32ErrorCode = 0;
+            Event.n.u3Type       = SVM_EVENT_NMI;
+
+            SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
+            return VINF_SUCCESS;
+        }
+
+        /* @todo SMI interrupts. */
+
+        /* When external interrupts are pending, we should exit the VM when IF is set. */
+        if (VMCPU_FF_ISPENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC|VMCPU_FF_INTERRUPT_PIC)))
+        {
+            if (    !(pCtx->eflags.u32 & X86_EFL_IF)
+                ||  VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
             {
-                if (!VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
-                    LogFlow(("Enable irq window exit!\n"));
-                else
-                    Log(("Pending interrupt blocked at %RGv by VM_FF_INHIBIT_INTERRUPTS -> irq window exit\n", (RTGCPTR)pCtx->rip));
-
-                /** @todo use virtual interrupt method to inject a pending irq; dispatched as soon as guest.IF is set. */
-                pVMCB->ctrl.u32InterceptCtrl1 |= SVM_CTRL1_INTERCEPT_VINTR;
-                pVMCB->ctrl.IntCtrl.n.u1VIrqValid    = 1;
-                pVMCB->ctrl.IntCtrl.n.u8VIrqVector   = 0; /* don't care */
-            }
-        }
-        else
-        {
-            uint8_t u8Interrupt;
-
-            rc = PDMGetInterrupt(pVCpu, &u8Interrupt);
-            Log(("Dispatch interrupt: u8Interrupt=%x (%d) rc=%Rrc\n", u8Interrupt, u8Interrupt, rc));
-            if (RT_SUCCESS(rc))
-            {
-                rc = TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
-                AssertRC(rc);
+                if (!pVMCB->ctrl.IntCtrl.n.u1VIrqValid)
+                {
+                    if (!VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
+                        LogFlow(("Enable irq window exit!\n"));
+                    else
+                        Log(("Pending interrupt blocked at %RGv by VM_FF_INHIBIT_INTERRUPTS -> irq window exit\n", (RTGCPTR)pCtx->rip));
+
+                    /** @todo use virtual interrupt method to inject a pending irq; dispatched as soon as guest.IF is set. */
+                    pVMCB->ctrl.u32InterceptCtrl1 |= SVM_CTRL1_INTERCEPT_VINTR;
+                    pVMCB->ctrl.IntCtrl.n.u1VIrqValid    = 1;
+                    pVMCB->ctrl.IntCtrl.n.u8VIrqVector   = 0; /* don't care */
+                }
             }
             else
             {
-                /* Can only happen in rare cases where a pending interrupt is cleared behind our back */
-                Assert(!VMCPU_FF_ISPENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC|VMCPU_FF_INTERRUPT_PIC)));
-                STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatSwitchGuestIrq);
-                /* Just continue */
+                uint8_t u8Interrupt;
+
+                rc = PDMGetInterrupt(pVCpu, &u8Interrupt);
+                Log(("Dispatch interrupt: u8Interrupt=%x (%d) rc=%Rrc\n", u8Interrupt, u8Interrupt, rc));
+                if (RT_SUCCESS(rc))
+                {
+                    rc = TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
+                    AssertRC(rc);
+                }
+                else
+                {
+                    /* Can only happen in rare cases where a pending interrupt is cleared behind our back */
+                    Assert(!VMCPU_FF_ISPENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC|VMCPU_FF_INTERRUPT_PIC)));
+                    STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatSwitchGuestIrq);
+                    /* Just continue */
+                }
             }
         }

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -754 +754 @@
     }
 
-    if (VMCPU_FF_TESTANDCLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI_BIT))
-    {
-        RTGCUINTPTR intInfo;
-
-        Log(("CPU%d: injecting #NMI\n", pVCpu->idCpu));
-
-        intInfo  = X86_XCPT_NMI;
-        intInfo |= (1 << VMX_EXIT_INTERRUPTION_INFO_VALID_SHIFT);
-        intInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_NMI << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
-
-        rc = VMXR0InjectEvent(pVM, pVCpu, pCtx, intInfo, 0, 0);
-        AssertRC(rc);
-
-        return VINF_SUCCESS;
-    }
-
-    /* @todo SMI interrupts. */
-
-    /* When external interrupts are pending, we should exit the VM when IF is set. */
-    if (    !TRPMHasTrap(pVCpu)
-        &&  VMCPU_FF_ISPENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC|VMCPU_FF_INTERRUPT_PIC)))
-    {
-        if (!(pCtx->eflags.u32 & X86_EFL_IF))
-        {
-            if (!(pVCpu->hwaccm.s.vmx.proc_ctls & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_IRQ_WINDOW_EXIT))
+    /* If an active trap is already pending, then we must forward it first! */
+    if (!TRPMHasTrap(pVCpu))
+    {
+        if (VMCPU_FF_TESTANDCLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI_BIT))
+        {
+            RTGCUINTPTR intInfo;
+
+            Log(("CPU%d: injecting #NMI\n", pVCpu->idCpu));
+
+            intInfo  = X86_XCPT_NMI;
+            intInfo |= (1 << VMX_EXIT_INTERRUPTION_INFO_VALID_SHIFT);
+            intInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_NMI << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
+
+            rc = VMXR0InjectEvent(pVM, pVCpu, pCtx, intInfo, 0, 0);
+            AssertRC(rc);
+
+            return VINF_SUCCESS;
+        }
+
+        /* @todo SMI interrupts. */
+
+        /* When external interrupts are pending, we should exit the VM when IF is set. */
+        if (VMCPU_FF_ISPENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC|VMCPU_FF_INTERRUPT_PIC)))
+        {
+            if (!(pCtx->eflags.u32 & X86_EFL_IF))
             {
-                LogFlow(("Enable irq window exit!\n"));
-                pVCpu->hwaccm.s.vmx.proc_ctls |= VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_IRQ_WINDOW_EXIT;
-                rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVCpu->hwaccm.s.vmx.proc_ctls);
-                AssertRC(rc);
-            }
-            /* else nothing to do but wait */
-        }
-        else
-        if (!VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
-        {
-            uint8_t u8Interrupt;
-
-            rc = PDMGetInterrupt(pVCpu, &u8Interrupt);
-            Log(("CPU%d: Dispatch interrupt: u8Interrupt=%x (%d) rc=%Rrc cs:rip=%04X:%RGv\n", pVCpu->idCpu, u8Interrupt, u8Interrupt, rc, pCtx->cs, (RTGCPTR)pCtx->rip));
-            if (RT_SUCCESS(rc))
-            {
-                rc = TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
-                AssertRC(rc);
+                if (!(pVCpu->hwaccm.s.vmx.proc_ctls & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_IRQ_WINDOW_EXIT))
+                {
+                    LogFlow(("Enable irq window exit!\n"));
+                    pVCpu->hwaccm.s.vmx.proc_ctls |= VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_IRQ_WINDOW_EXIT;
+                    rc = VMXWriteVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, pVCpu->hwaccm.s.vmx.proc_ctls);
+                    AssertRC(rc);
+                }
+                /* else nothing to do but wait */
             }
             else
+            if (!VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
             {
-                /* Can only happen in rare cases where a pending interrupt is cleared behind our back */
-                Assert(!VMCPU_FF_ISPENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC|VMCPU_FF_INTERRUPT_PIC)));
-                STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatSwitchGuestIrq);
-                /* Just continue */
+                uint8_t u8Interrupt;
+
+                rc = PDMGetInterrupt(pVCpu, &u8Interrupt);
+                Log(("CPU%d: Dispatch interrupt: u8Interrupt=%x (%d) rc=%Rrc cs:rip=%04X:%RGv\n", pVCpu->idCpu, u8Interrupt, u8Interrupt, rc, pCtx->cs, (RTGCPTR)pCtx->rip));
+                if (RT_SUCCESS(rc))
+                {
+                    rc = TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
+                    AssertRC(rc);
+                }
+                else
+                {
+                    /* Can only happen in rare cases where a pending interrupt is cleared behind our back */
+                    Assert(!VMCPU_FF_ISPENDING(pVCpu, (VMCPU_FF_INTERRUPT_APIC|VMCPU_FF_INTERRUPT_PIC)));
+                    STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatSwitchGuestIrq);
+                    /* Just continue */
+                }
             }
-        }
-        else
-            Log(("Pending interrupt blocked at %RGv by VM_FF_INHIBIT_INTERRUPTS!!\n", (RTGCPTR)pCtx->rip));
+            else
+                Log(("Pending interrupt blocked at %RGv by VM_FF_INHIBIT_INTERRUPTS!!\n", (RTGCPTR)pCtx->rip));
+        }
     }