Changeset 48132 in vbox for trunk/src

Timestamp:

Aug 28, 2013 5:27:43 PM (12 years ago)

Author:

vboxsync

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

88512

Message:

VMM: Ditch VBOX_WITH_VMMR0_DISABLE_PREEMPTION.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/Makefile.kmk (modified) (1 diff)
• HostDrivers/Support/win/SUPDrv-win.cpp (modified) (1 diff)
• VMM/Makefile.kmk (modified) (1 diff)
• VMM/VMMR0/HMR0.cpp (modified) (1 diff)
• VMM/VMMR0/HMSVMR0.cpp (modified) (3 diffs)
• VMM/VMMR0/HMVMXR0.cpp (modified) (4 diffs)
• VMM/VMMR0/VMMR0.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -275 +275 @@
  ifdef VBOX_WITHOUT_NATIVE_R0_LOADER
   VBoxDrv_DEFS.win       += VBOX_WITHOUT_NATIVE_R0_LOADER
- endif
- ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
-  VBoxDrv_DEFS.win       += VBOX_WITH_VMMR0_DISABLE_PREEMPTION
  endif
 

trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp

@@ -452 +452 @@
         && pSession->fUnrestricted == true)
     {
-#ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
         int rc = supdrvIOCtlFast(ulCmd, (unsigned)(uintptr_t)pIrp->UserBuffer /* VMCPU id */, pDevExt, pSession);
-#else
+
+#if 0   /* When preemption was not used i.e. !VBOX_WITH_VMMR0_DISABLE_PREEMPTION. That's no longer required. */
         /* Raise the IRQL to DISPATCH_LEVEL to prevent Windows from rescheduling us to another CPU/core. */
         Assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);

trunk/src/VBox/VMM/Makefile.kmk

@@ -493 +493 @@
         $(VMM_COMMON_DEFS) RTASSERT_HAVE_SHOULD_PANIC
  ## @todo eliminate IN_GVMM_R0 IN_GMM_R0
- ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
-  VMMR0_DEFS    += VBOX_WITH_VMMR0_DISABLE_PREEMPTION
- endif
  ifdef VBOX_WITH_PCI_PASSTHROUGH
   VMMR0_DEFS    += IN_PCIRAW_R0

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

@@ -1285 +1285 @@
     {
         pVM->hm.s.cMaxResumeLoops       = 1024;
-#ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
         if (RTThreadPreemptIsPendingTrusty())
             pVM->hm.s.cMaxResumeLoops   = 8192;
-#endif
     }
 

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

@@ -2740 +2740 @@
         hmR0SvmEvaluatePendingEvent(pVCpu, pCtx);
 
-#ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
     /*
      * We disable interrupts so that we don't miss any interrupts that would flag preemption (IPI/timers etc.)
@@ -2769 +2768 @@
     VMCPU_ASSERT_STATE(pVCpu, VMCPUSTATE_STARTED_HM);
     VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);
-#endif
 
     return VINF_SUCCESS;
@@ -2792 +2790 @@
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
     Assert(VMMR0IsLogFlushDisabled(pVCpu));
-
-#ifndef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
-    /** @todo I don't see the point of this, VMMR0EntryFast() already disables interrupts for the entire period. */
-    /** @todo get rid of this. */
-    pSvmTransient->uEflags = ASMIntDisableFlags();
-    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);
-#endif
 
     hmR0SvmInjectPendingEvent(pVCpu, pCtx);

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

@@ -7359 +7359 @@
         hmR0VmxEvaluatePendingEvent(pVCpu, pMixedCtx);
 
-#ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
     /*
      * We disable interrupts so that we don't miss any interrupts that would flag preemption (IPI/timers etc.)
@@ -7388 +7387 @@
     VMCPU_ASSERT_STATE(pVCpu, VMCPUSTATE_STARTED_HM);
     VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);
-#endif
 
     /*
@@ -7418 +7416 @@
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
     Assert(VMMR0IsLogFlushDisabled(pVCpu));
-#ifndef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
-    /** @todo I don't see the point of this, VMMR0EntryFast() already disables interrupts for the entire period. */
-    /** @todo get rid of this. */
-    pVmxTransient->uEflags = ASMIntDisableFlags();
-    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);
-#endif
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
@@ -8549 +8541 @@
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitExtInt);
     /* 32-bit Windows hosts (4 cores) has trouble with this; causes higher interrupt latency. */
-#if HC_ARCH_BITS == 64 && defined(VBOX_WITH_VMMR0_DISABLE_PREEMPTION)
+#if HC_ARCH_BITS == 64
     Assert(ASMIntAreEnabled());
     if (pVCpu->CTX_SUFF(pVM)->hm.s.vmx.fUsePreemptTimer)

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

@@ -886 +886 @@
         /*
          * Run guest code using the available hardware acceleration technology.
-         *
-         * Disable interrupts before we do anything interesting. On Windows we avoid
-         * this by having the support driver raise the IRQL before calling us, this way
-         * we hope to get away with page faults and later calling into the kernel.
          */
         case VMMR0_DO_HM_RUN:
         {
-#ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
             Assert(!VMMR0ThreadCtxHooksAreRegistered(pVCpu));
             RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
             RTThreadPreemptDisable(&PreemptState);
-#elif !defined(RT_OS_WINDOWS)
-            RTCCUINTREG uFlags = ASMIntDisableFlags();
-#endif
+
             /* Update the VCPU <-> host CPU mapping before doing anything else. */
             ASMAtomicWriteU32(&pVCpu->idHostCpu, RTMpCpuId());
@@ -923 +916 @@
             {
                 /* Register thread-context hooks if required. */
-#ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
                 if (    VMMR0ThreadCtxHooksAreCreated(pVCpu)
                     && !VMMR0ThreadCtxHooksAreRegistered(pVCpu))
@@ -930 +922 @@
                     AssertRC(rc);
                 }
-#endif
 
                 /* Enter HM context. */
@@ -975 +966 @@
             ASMAtomicWriteU32(&pVCpu->idHostCpu, NIL_RTCPUID);
 
-#ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
             if (!fPreemptRestored)
                 RTThreadPreemptRestore(&PreemptState);
-#elif !defined(RT_OS_WINDOWS)
-            ASMSetFlags(uFlags);
-#endif
 
 #ifdef VBOX_WITH_STATISTICS