Changeset 19032 in vbox for trunk/src/VBox/VMM/TM.cpp

Timestamp:

Apr 20, 2009 3:03:08 PM (16 years ago)

Author:

vboxsync

Message:

Split TM for SMP guests.

File:

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

trunk/src/VBox/VMM/TM.cpp

@@ -91 +91 @@
  * Each clock has its own scheduling facility, or timer queue if you like.
  * There are a few factors which makes it a bit complex.  First, there is the
- * usual R0 vs R3 vs. RC thing.  Then there is multiple threads, and then there
+ * usual R0 vs R3 vs. RC thing.  Then there are multiple threads, and then there
  * is the timer thread that periodically checks whether any timers has expired
  * without EMT noticing.  On the API level, all but the create and save APIs
@@ -98 +98 @@
  * The design is using a doubly linked list of active timers which is ordered
  * by expire date.  This list is only modified by the EMT thread.  Updates to
- * the list are batched in a singly linked list, which is then process by the
+ * the list are batched in a singly linked list, which is then processed by the
  * EMT thread at the first opportunity (immediately, next time EMT modifies a
  * timer on that clock, or next timer timeout).  Both lists are offset based and
@@ -310 +310 @@
     {
         if (!pVM->tm.s.fTSCUseRealTSC)
-            pVM->tm.s.fMaybeUseOffsettedHostTSC = tmR3HasFixedTSC(pVM);
+        {
+            /* @todo simple case for guest SMP; always emulate RDTSC */
+            if (pVM->cCPUs == 1)
+                pVM->tm.s.fMaybeUseOffsettedHostTSC = tmR3HasFixedTSC(pVM);
+        }
         else
             pVM->tm.s.fMaybeUseOffsettedHostTSC = true;
@@ -346 +350 @@
     /** @cfgm{TM/TSCTiedToExecution, bool, false}
      * Whether the TSC should be tied to execution. This will exclude most of the
-     * virtualization overhead, but will by default include the time spend in the
+     * virtualization overhead, but will by default include the time spent in the
      * halt state (see TM/TSCNotTiedToHalt). This setting will override all other
      * TSC settings except for TSCTicksPerSecond and TSCNotTiedToHalt, which should
@@ -984 +988 @@
 static DECLCALLBACK(int) tmR3Save(PVM pVM, PSSMHANDLE pSSM)
 {
+    unsigned i;
+
     LogFlow(("tmR3Save:\n"));
-    Assert(!pVM->tm.s.fTSCTicking);
+#ifdef VBOX_STRICT
+    for (i=0;i<pVM->cCPUs;i++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[i];
+        Assert(!pVCpu->tm.s.fTSCTicking);
+    }
     Assert(!pVM->tm.s.fVirtualTicking);
     Assert(!pVM->tm.s.fVirtualSyncTicking);
+#endif
 
     /*
@@ -1006 +1018 @@
     SSMR3PutU64(pSSM, TMCLOCK_FREQ_REAL);
 
-    /* the cpu tick clock. */
-    SSMR3PutU64(pSSM, TMCpuTickGet(pVM));
+    for (i=0;i<pVM->cCPUs;i++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[i];
+
+        /* the cpu tick clock. */
+        SSMR3PutU64(pSSM, TMCpuTickGet(pVCpu));
+    }
     return SSMR3PutU64(pSSM, pVM->tm.s.cTSCTicksPerSecond);
 }
@@ -1022 +1039 @@
 static DECLCALLBACK(int) tmR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t u32Version)
 {
+    unsigned i;
     LogFlow(("tmR3Load:\n"));
-    Assert(!pVM->tm.s.fTSCTicking);
+
+#ifdef VBOX_STRICT
+    for (i=0;i<pVM->cCPUs;i++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[i];
+        Assert(!pVCpu->tm.s.fTSCTicking);
+    }
     Assert(!pVM->tm.s.fVirtualTicking);
     Assert(!pVM->tm.s.fVirtualSyncTicking);
+#endif
 
     /*
@@ -1081 +1106 @@
 
     /* the cpu tick clock. */
-    pVM->tm.s.fTSCTicking = false;
-    SSMR3GetU64(pSSM, &pVM->tm.s.u64TSC);
+    for (i=0;i<pVM->cCPUs;i++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[i];
+
+        pVCpu->tm.s.fTSCTicking = false;
+        SSMR3GetU64(pSSM, &pVCpu->tm.s.u64TSC);
+
+        if (pVM->tm.s.fTSCUseRealTSC)
+            pVCpu->tm.s.u64TSCOffset = 0; /** @todo TSC restore stuff and HWACC. */
+    }
+
     rc = SSMR3GetU64(pSSM, &u64Hz);
     if (RT_FAILURE(rc))
         return rc;
-    if (pVM->tm.s.fTSCUseRealTSC)
-        pVM->tm.s.u64TSCOffset = 0; /** @todo TSC restore stuff and HWACC. */
-    else
+    if (!pVM->tm.s.fTSCUseRealTSC)
         pVM->tm.s.cTSCTicksPerSecond = u64Hz;
+
     LogRel(("TM: cTSCTicksPerSecond=%#RX64 (%RU64) fTSCVirtualized=%RTbool fTSCUseRealTSC=%RTbool (state load)\n",
             pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.fTSCVirtualized, pVM->tm.s.fTSCUseRealTSC));
@@ -1360 +1393 @@
         case TMCLOCK_VIRTUAL_SYNC:  return TMVirtualSyncGet(pVM);
         case TMCLOCK_REAL:          return TMRealGet(pVM);
-        case TMCLOCK_TSC:           return TMCpuTickGet(pVM);
+        case TMCLOCK_TSC:           return TMCpuTickGet(&pVM->aCpus[0] /* just take VCPU 0 */);
         default:
             AssertMsgFailed(("enmClock=%d\n", enmClock));
@@ -2083 +2116 @@
      * Read the times first to avoid more than necessary time variation.
      */
-    const uint64_t u64TSC = TMCpuTickGet(pVM);
     const uint64_t u64Virtual = TMVirtualGet(pVM);
     const uint64_t u64VirtualSync = TMVirtualSyncGet(pVM);
     const uint64_t u64Real = TMRealGet(pVM);
 
-    /*
-     * TSC
-     */
-    pHlp->pfnPrintf(pHlp,
-                    "Cpu Tick: %18RU64 (%#016RX64) %RU64Hz %s%s",
-                    u64TSC, u64TSC, TMCpuTicksPerSecond(pVM),
-                    pVM->tm.s.fTSCTicking ? "ticking" : "paused",
-                    pVM->tm.s.fTSCVirtualized ? " - virtualized" : "");
-    if (pVM->tm.s.fTSCUseRealTSC)
-    {
-        pHlp->pfnPrintf(pHlp, " - real tsc");
-        if (pVM->tm.s.u64TSCOffset)
-            pHlp->pfnPrintf(pHlp, "\n          offset %RU64", pVM->tm.s.u64TSCOffset);
-    }
-    else
-        pHlp->pfnPrintf(pHlp, " - virtual clock");
-    pHlp->pfnPrintf(pHlp, "\n");
+    for (unsigned i=0;i<pVM->cCPUs;i++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[i];
+
+        uint64_t u64TSC = TMCpuTickGet(pVCpu);
+        /*
+         * TSC
+         */
+        pHlp->pfnPrintf(pHlp,
+                        "Cpu Tick: %18RU64 (%#016RX64) %RU64Hz %s%s",
+                        u64TSC, u64TSC, TMCpuTicksPerSecond(pVM),
+                        pVCpu->tm.s.fTSCTicking ? "ticking" : "paused",
+                        pVM->tm.s.fTSCVirtualized ? " - virtualized" : "");
+        if (pVM->tm.s.fTSCUseRealTSC)
+        {
+            pHlp->pfnPrintf(pHlp, " - real tsc");
+            if (pVCpu->tm.s.u64TSCOffset)
+                pHlp->pfnPrintf(pHlp, "\n          offset %RU64", pVCpu->tm.s.u64TSCOffset);
+        }
+        else
+            pHlp->pfnPrintf(pHlp, " - virtual clock");
+        pHlp->pfnPrintf(pHlp, "\n");
+    }
 
     /*