Changeset 1956 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 5, 2007 3:26:03 PM (18 years ago)

Author:

vboxsync

Message:

Fixed a couple of issues with virtualized TSC related to pausing and state loading. Also implemented support for TSC frequencies up to 4GHz and changed the default to the host CPU (virtualized TSC again).

Location:

trunk/src/VBox/VMM

Files:

• TM.cpp (modified) (3 diffs)
• VMMAll/TMAllCpu.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/TM.cpp

@@ -217 +217 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
     {
-#if 0  /* when tmCpuTickGetRawVirtual is done */
         pVM->tm.s.cTSCTicksPerSecond = tmR3Calibrate();
-#else
-        if (pVM->tm.s.fTSCUseRealTSC)
-            pVM->tm.s.cTSCTicksPerSecond = tmR3Calibrate();
-        else
-            pVM->tm.s.cTSCTicksPerSecond = TMCLOCK_FREQ_VIRTUAL;/* same as the virtual clock. */
-#endif 
+        if (    !pVM->tm.s.fTSCUseRealTSC
+            &&  pVM->tm.s.cTSCTicksPerSecond >= _4G)
+            pVM->tm.s.cTSCTicksPerSecond = _4G - 1; /* (A limitation of our math code) */
     }
     else if (VBOX_FAILURE(rc))
         return VMSetError(pVM, rc, RT_SRC_POS, 
                           N_("Configuration error: Failed to querying uint64_t value \"TSCTicksPerSecond\". (%Vrc)"), rc); 
-#if 0 /* when tmCpuTickGetRawVirtual is done */
     else if (   pVM->tm.s.cTSCTicksPerSecond < _1M
-             || pVM->tm.s.cTSCTicksPerSecond > _1E)
+             || pVM->tm.s.cTSCTicksPerSecond >= _4G)
         return VMSetError(pVM, VERR_INVALID_PARAMETER, RT_SRC_POS, 
-                          N_("Configuration error: \"TSCTicksPerSecond\" = %RI64 is not in the range 1MHz..1EHz!"),
+                          N_("Configuration error: \"TSCTicksPerSecond\" = %RI64 is not in the range 1MHz..4GHz-1!"),
                           pVM->tm.s.cTSCTicksPerSecond);
-#else
-    else if (pVM->tm.s.cTSCTicksPerSecond != TMCLOCK_FREQ_VIRTUAL)
-        return VMSetError(pVM, VERR_INVALID_PARAMETER, RT_SRC_POS, 
-                          N_("Configuration error: \"TSCTicksPerSecond\" = %RI64 is not 1GHz! (temporary restriction)"),
-                          pVM->tm.s.cTSCTicksPerSecond);
-#endif
     else
     {
@@ -636 +625 @@
     /* the cpu tick clock. */
     pVM->tm.s.fTSCTicking = false;
+    SSMR3GetU64(pSSM, &pVM->tm.s.u64TSC);
     rc = SSMR3GetU64(pSSM, &u64Hz);
     if (VBOX_FAILURE(rc))
         return rc;
-    SSMR3GetU64(pSSM, &pVM->tm.s.u64TSC);
-    /** @todo check TSC frequency and virtualize the TSC properly! */
-    pVM->tm.s.u64TSCOffset = 0;
+    if (pVM->tm.s.fTSCUseRealTSC)
+        pVM->tm.s.u64TSCOffset = 0; /** @todo TSC restore stuff and HWACC. */
+    else
+        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));
 
     /*
@@ -1286 +1279 @@
     if (pVM->tm.s.fTSCUseRealTSC)
     {
-        pHlp->pfnPrintf(pHlp, "- real tsc");
+        pHlp->pfnPrintf(pHlp, " - real tsc");
         if (pVM->tm.s.u64TSCOffset)
             pHlp->pfnPrintf(pHlp, "\n          offset %#RX64", pVM->tm.s.u64TSCOffset);
     }
     else
-        pHlp->pfnPrintf(pHlp, "- virtual clock");
+        pHlp->pfnPrintf(pHlp, " - virtual clock");
     pHlp->pfnPrintf(pHlp, "\n");
 

trunk/src/VBox/VMM/VMMAll/TMAllCpu.cpp

@@ -42 +42 @@
 {
     uint64_t u64 = TMVirtualGet(pVM);
-    /** @todo calc tsc from virtual time. */
+    if (u64 != TMCLOCK_FREQ_VIRTUAL)
+        u64 = ASMMultU64ByU32DivByU32(u64, pVM->tm.s.cTSCTicksPerSecond, TMCLOCK_FREQ_VIRTUAL);
     return u64;
 }
@@ -82 +83 @@
     if (pVM->tm.s.fTSCTicking)
     {
-        if (!pVM->tm.s.fTSCVirtualized)
-        {
-            if (pVM->tm.s.fTSCUseRealTSC)
-                pVM->tm.s.u64TSC = ASMReadTSC() - pVM->tm.s.u64TSCOffset;
-            else
-                pVM->tm.s.u64TSC = tmCpuTickGetRawVirtual(pVM) - pVM->tm.s.u64TSCOffset;
-        }
+        pVM->tm.s.u64TSC = TMCpuTickGet(pVM);
         pVM->tm.s.fTSCTicking = false;
         return VINF_SUCCESS;
@@ -107 +102 @@
 {
     uint64_t u64;
-    if (pVM->tm.s.fTSCUseRealTSC)
-        u64 = ASMReadTSC();
-    else
+    if (RT_LIKELY(pVM->tm.s.fTSCTicking))
     {
-        if (pVM->tm.s.fTSCTicking)
+        if (pVM->tm.s.fTSCVirtualized)
         {
             if (pVM->tm.s.fTSCUseRealTSC)
-                u64 = ASMReadTSC() - pVM->tm.s.u64TSCOffset;
+                u64 = ASMReadTSC();
             else
-                u64 = tmCpuTickGetRawVirtual(pVM) - pVM->tm.s.u64TSCOffset;
+                u64 = tmCpuTickGetRawVirtual(pVM);
+            u64 -= pVM->tm.s.u64TSCOffset;
         }
         else
-            u64 = pVM->tm.s.u64TSC;
+            u64 = ASMReadTSC();
     }
+    else
+        u64 = pVM->tm.s.u64TSC;
     return u64;
 }