Changeset 51852 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jul 3, 2014 3:09:01 PM (11 years ago)

Author:

vboxsync

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

94703

Message:

TM: Add the same TSC offset to each VCPU when pausing/resuming (not yet enabled).

File:

• trunk/src/VBox/VMM/VMMR3/TM.cpp (modified) (7 diffs)

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

@@ -163 +163 @@
 
 
+//#define SYNC_TSC_PAUSE
 /*******************************************************************************
 *   Internal Functions                                                         *
@@ -698 +699 @@
     STAM_REG(pVM, &pVM->tm.s.StatTSCSet,                              STAMTYPE_COUNTER, "/TM/TSC/Sets",                        STAMUNIT_OCCURENCES, "Calls to TMCpuTickSet.");
     STAM_REG(pVM, &pVM->tm.s.StatTSCUnderflow,                        STAMTYPE_COUNTER, "/TM/TSC/Underflow",                   STAMUNIT_OCCURENCES, "TSC underflow; corrected with last seen value .");
+    STAM_REG(pVM, &pVM->tm.s.StatVirtualPause,                        STAMTYPE_COUNTER, "/TM/TSC/Pause",                       STAMUNIT_OCCURENCES, "The number of times the TSC was paused.");
+    STAM_REG(pVM, &pVM->tm.s.StatVirtualResume,                       STAMTYPE_COUNTER, "/TM/TSC/Resume",                      STAMUNIT_OCCURENCES, "The number of times the TSC was resumed.");
 #endif /* VBOX_WITH_STATISTICS */
 
@@ -1154 +1157 @@
     Assert(!pVM->tm.s.cVirtualTicking);
     Assert(!pVM->tm.s.fVirtualSyncTicking);
+    Assert(!pVM->tm.s.cTSCsTicking);
 #endif
 
@@ -1205 +1209 @@
     Assert(!pVM->tm.s.cVirtualTicking);
     Assert(!pVM->tm.s.fVirtualSyncTicking);
+    Assert(!pVM->tm.s.cTSCsTicking);
 #endif
 
@@ -1220 +1225 @@
      */
     pVM->tm.s.cVirtualTicking = 0;
+    pVM->tm.s.cTSCsTicking    = 0;
     /* the virtual clock. */
     uint64_t u64Hz;
@@ -2676 +2682 @@
     /*
      * Pause the TSC last since it is normally linked to the virtual
-     * sync clock, so the above code may actually stop both clock.
-     */
-    rc = tmCpuTickPause(pVCpu);
-    if (RT_FAILURE(rc))
-        return rc;
+     * sync clock, so the above code may actually stop both clocks.
+     */
+    if (!pVM->tm.s.fTSCTiedToExecution)
+    {
+#ifdef SYNC_TSC_PAUSE
+        TM_LOCK_TIMERS(pVM);    /* Paranoia: Exploiting the timer lock here. */
+        rc = tmCpuTickPauseLocked(pVM, pVCpu);
+        TM_UNLOCK_TIMERS(pVM);
+#else
+        rc = tmCpuTickPause(pVCpu);
+#endif
+        if (RT_FAILURE(rc))
+            return rc;
+    }
 
 #ifndef VBOX_WITHOUT_NS_ACCOUNTING
@@ -2724 +2739 @@
     if (!pVM->tm.s.fTSCTiedToExecution)
     {
+#ifdef SYNC_TSC_PAUSE
+        TM_LOCK_TIMERS(pVM);                    /* Paranoia: Exploiting the timer lock here. */
+        rc = tmCpuTickResumeLocked(pVM, pVCpu);
+        TM_UNLOCK_TIMERS(pVM);
+#else
         rc = tmCpuTickResume(pVM, pVCpu);
+#endif
         if (RT_FAILURE(rc))
             return rc;