Changeset 20608 in vbox for trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

Timestamp:

Jun 16, 2009 8:00:54 AM (15 years ago)

Author:

vboxsync

Message:

Backed out 48516. Caused interrupt loss.

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (4 diffs)

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

@@ -1726 +1726 @@
     {
         Assert(uInterruptState <= 2);    /* only sti & mov ss */
-        Log(("uInterruptState %x eip=%RGv\n", uInterruptState, pCtx->rip));
+        Log(("uInterruptState %x eip=%RGv\n", (uint32_t)uInterruptState, pCtx->rip));
         EMSetInhibitInterruptsPC(pVCpu, pCtx->rip);
     }
@@ -2180 +2180 @@
     }
 
+#ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
+    /*
+     * Exit to ring-3 preemption/work is pending.
+     *
+     * Interrupts are disabled before the call to make sure we don't miss any interrupt
+     * that would flag preemption (IPI, timer tick, ++). (Would've been nice to do this
+     * further down, but VMXR0CheckPendingInterrupt makes that impossible.)
+     *
+     * Note! Interrupts must be disabled done *before* we check for TLB flushes; TLB
+     *       shootdowns rely on this.
+     */
+    uOldEFlags = ASMIntDisableFlags();
+    if (RTThreadPreemptIsPending(NIL_RTTHREAD))
+    {
+        STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitPreemptPending);
+        rc = VINF_EM_RAW_INTERRUPT;
+        goto end;
+    }
+    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);
+#endif
+
     /* When external interrupts are pending, we should exit the VM when IF is set. */
     /* Note! *After* VM_FF_INHIBIT_INTERRUPTS check!!! */
@@ -2264 +2285 @@
         goto end;
 
-#ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
-    /*
-     * Exit to ring-3 preemption/work is pending.
-     *
-     * Interrupts are disabled before the call to make sure we don't miss any interrupt
-     * that would flag preemption (IPI, timer tick, ++). 
-     *
-     * Note! Interrupts must be disabled done *before* we check for TLB flushes; TLB
-     *       shootdowns rely on this.
-     */
-    uOldEFlags = ASMIntDisableFlags();
-    if (RTThreadPreemptIsPending(NIL_RTTHREAD))
-    {
-        STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitPreemptPending);
-        rc = VINF_EM_RAW_INTERRUPT;
-        goto end;
-    }
-    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);
-#else
+#ifndef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
     /* Disable interrupts to make sure a poke will interrupt execution.
      * This must be done *before* we check for TLB flushes; TLB shootdowns rely on this.
@@ -2385 +2388 @@
         /* Ignore 'int xx' as they'll be restarted anyway. */
         &&  VMX_EXIT_INTERRUPTION_INFO_TYPE(pVCpu->hwaccm.s.Event.intInfo) != VMX_EXIT_INTERRUPTION_INFO_TYPE_SW
-        /* Ignore software exceptions (such as int3) as they're reoccur when we restart the instruction anyway. */
+        /* Ignore software exceptions (such as int3) as they'll reoccur when we restart the instruction anyway. */
         &&  VMX_EXIT_INTERRUPTION_INFO_TYPE(pVCpu->hwaccm.s.Event.intInfo) != VMX_EXIT_INTERRUPTION_INFO_TYPE_SWEXCPT)
     {