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

Timestamp:

Sep 14, 2010 3:50:31 PM (15 years ago)

Author:

vboxsync

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

65864

Message:

VMM: More work on the periodic preemption timer (no actual timers yet).

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GVMMR0.cpp (modified) (1 diff)
• HWACCMR0.cpp (modified) (1 diff)
• VMMR0.cpp (modified) (6 diffs)

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

@@ -1888 +1888 @@
 
 /**
+ * Updates the periodic preemption timer for the calling CPU.
+ *
+ * The caller must have disabled preemption!
+ *
+ * @param   pVM         The VM handle.
+ * @param   idHostCpu   The current host CPU id.
+ * @param   uHz         The desired frequency.
+ */
+GVMMR0DECL(void) GVMMR0SchedUpdatePeriodicPreemptionTimer(PVM pVM, RTCPUID idHostCpu, uint32_t uHz)
+{
+
+}
+
+
+/**
  * Retrieves the GVMM statistics visible to the caller.
  *

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

@@ -1435 +1435 @@
 VMMR0DECL(int) HWACCMR0EnterSwitcher(PVM pVM, bool *pfVTxDisabled)
 {
-    Assert(!(ASMGetFlags() & X86_EFL_IF));
+    Assert(!(ASMGetFlags() & X86_EFL_IF) || !RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
     *pfVTxDisabled = false;

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

@@ -530 +530 @@
         case VMMR0_DO_RAW_RUN:
         {
-            /* Safety precaution as hwaccm disables the switcher. */
-            if (RT_LIKELY(!pVM->vmm.s.fSwitcherDisabled))
+            /* Some safety precautions first. */
+#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+            if (RT_LIKELY(   !pVM->vmm.s.fSwitcherDisabled /* hwaccm */
+                          && pVM->cCpus == 1               /* !smp */
+                          && PGMGetHyperCR3(pVCpu)))
+#else
+            if (RT_LIKELY(   !pVM->vmm.s.fSwitcherDisabled
+                          && pVM->cCpus == 1))
+#endif
             {
-                RTCCUINTREG uFlags = ASMIntDisableFlags();
-                int         rc;
-                bool        fVTxDisabled;
-
-                if (RT_UNLIKELY(pVM->cCpus > 1))
+                /* Disable preemption and update the periodic preemption timer. */
+                RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+                RTThreadPreemptDisable(&PreemptState);
+                ASMAtomicWriteU32(&pVCpu->idHostCpu, RTMpCpuId());
+                if (pVM->vmm.s.fUsePeriodicPreemptionTimers)
+                    GVMMR0SchedUpdatePeriodicPreemptionTimer(pVM, pVCpu->idHostCpu, TMCalcHostTimerFrequency(pVM, pVCpu));
+
+                /* We might need to disable VT-x if the active switcher turns off paging. */
+                bool fVTxDisabled;
+                int rc = HWACCMR0EnterSwitcher(pVM, &fVTxDisabled);
+                if (RT_SUCCESS(rc))
                 {
-                    pVCpu->vmm.s.iLastGZRc = VERR_RAW_MODE_INVALID_SMP;
+                    RTCCUINTREG uFlags = ASMIntDisableFlags();
+                    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);
+
+                    TMNotifyStartOfExecution(pVCpu);
+                    rc = pVM->vmm.s.pfnHostToGuestR0(pVM);
+                    pVCpu->vmm.s.iLastGZRc = rc;
+                    TMNotifyEndOfExecution(pVCpu);
+
+                    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
+
+                    /* Re-enable VT-x if previously turned off. */
+                    HWACCMR0LeaveSwitcher(pVM, fVTxDisabled);
+
+                    if (    rc == VINF_EM_RAW_INTERRUPT
+                        ||  rc == VINF_EM_RAW_INTERRUPT_HYPER)
+                        TRPMR0DispatchHostInterrupt(pVM);
+
                     ASMSetFlags(uFlags);
-                    return;
+
+#ifdef VBOX_WITH_STATISTICS
+                    STAM_COUNTER_INC(&pVM->vmm.s.StatRunRC);
+                    vmmR0RecordRC(pVM, pVCpu, rc);
+#endif
                 }
-
-#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-                if (RT_UNLIKELY(!PGMGetHyperCR3(pVCpu)))
-                {
-                    pVCpu->vmm.s.iLastGZRc = VERR_PGM_NO_CR3_SHADOW_ROOT;
-                    ASMSetFlags(uFlags);
-                    return;
-                }
-#endif
-
-                /* We might need to disable VT-x if the active switcher turns off paging. */
-                rc = HWACCMR0EnterSwitcher(pVM, &fVTxDisabled);
-                if (RT_FAILURE(rc))
-                {
+                else
                     pVCpu->vmm.s.iLastGZRc = rc;
-                    ASMSetFlags(uFlags);
-                    return;
-                }
-
-                ASMAtomicWriteU32(&pVCpu->idHostCpu, RTMpCpuId());
-                VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC);
-
-                TMNotifyStartOfExecution(pVCpu);
-                rc = pVM->vmm.s.pfnHostToGuestR0(pVM);
-                pVCpu->vmm.s.iLastGZRc = rc;
-                TMNotifyEndOfExecution(pVCpu);
-
-                VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
                 ASMAtomicWriteU32(&pVCpu->idHostCpu, NIL_RTCPUID);
-
-                /* Re-enable VT-x if previously turned off. */
-                HWACCMR0LeaveSwitcher(pVM, fVTxDisabled);
-
-                if (    rc == VINF_EM_RAW_INTERRUPT
-                    ||  rc == VINF_EM_RAW_INTERRUPT_HYPER)
-                    TRPMR0DispatchHostInterrupt(pVM);
-
-                ASMSetFlags(uFlags);
-
-#ifdef VBOX_WITH_STATISTICS
-                STAM_COUNTER_INC(&pVM->vmm.s.StatRunRC);
-                vmmR0RecordRC(pVM, pVCpu, rc);
-#endif
+                RTThreadPreemptRestore(&PreemptState);
             }
             else
@@ -591 +585 @@
                 Assert(!pVM->vmm.s.fSwitcherDisabled);
                 pVCpu->vmm.s.iLastGZRc = VERR_NOT_SUPPORTED;
+                if (pVM->cCpus != 1)
+                    pVCpu->vmm.s.iLastGZRc = VERR_RAW_MODE_INVALID_SMP;
+#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
+                if (!PGMGetHyperCR3(pVCpu))
+                    pVCpu->vmm.s.iLastGZRc = VERR_PGM_NO_CR3_SHADOW_ROOT;
+#endif
             }
             break;
@@ -604 +604 @@
         case VMMR0_DO_HWACC_RUN:
         {
-            int rc;
-
-            STAM_COUNTER_INC(&pVM->vmm.s.StatRunRC);
-
 #ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
             RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
@@ -615 +611 @@
 #endif
             ASMAtomicWriteU32(&pVCpu->idHostCpu, RTMpCpuId());
+            if (pVM->vmm.s.fUsePeriodicPreemptionTimers)
+                GVMMR0SchedUpdatePeriodicPreemptionTimer(pVM, pVCpu->idHostCpu, TMCalcHostTimerFrequency(pVM, pVCpu));
 
 #ifdef LOG_ENABLED
@@ -629 +627 @@
             }
 #endif
+            int rc;
             if (!HWACCMR0SuspendPending())
             {
@@ -638 +637 @@
                     AssertRC(rc2);
                 }
+                STAM_COUNTER_INC(&pVM->vmm.s.StatRunRC);
             }
             else