Changeset 104131 in vbox

Timestamp:

Apr 3, 2024 8:02:36 AM (8 months ago)

Author:

vboxsync

Message:

VMM/TM: Allow linear scaling of the guest TSC; primarily required for scaling up a 24MHz tickrate on ARM64 hosts.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/TMAllCpu.cpp (modified) (4 diffs)
• VMMR3/TM.cpp (modified) (8 diffs)
• include/TMInternal.h (modified) (1 diff)

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

@@ -116 +116 @@
         {
             case TMTSCMODE_REAL_TSC_OFFSET:
-                pVCpu->tm.s.offTSCRawSrc = SUPReadTsc() - pVCpu->tm.s.u64TSC;
+                pVCpu->tm.s.offTSCRawSrc = SUPReadTsc() * pVM->tm.s.u8TSCMultiplier - pVCpu->tm.s.u64TSC;
                 break;
             case TMTSCMODE_VIRT_TSC_EMULATED:
@@ -163 +163 @@
             {
                 case TMTSCMODE_REAL_TSC_OFFSET:
-                    pVCpu->tm.s.offTSCRawSrc = SUPReadTsc() - pVM->tm.s.u64LastPausedTSC;
+                    pVCpu->tm.s.offTSCRawSrc = SUPReadTsc() * pVM->tm.s.u8TSCMultiplier - pVM->tm.s.u64LastPausedTSC;
                     break;
                 case TMTSCMODE_VIRT_TSC_EMULATED:
@@ -496 +496 @@
         {
             case TMTSCMODE_REAL_TSC_OFFSET:
-                u64 = SUPReadTsc();
+                u64 = SUPReadTsc() * pVM->tm.s.u8TSCMultiplier;
                 break;
             case TMTSCMODE_VIRT_TSC_EMULATED:
@@ -642 +642 @@
 #endif
             if (RT_LIKELY(cTSCTicksPerSecond != ~(uint64_t)0))
-                return cTSCTicksPerSecond;
+                return cTSCTicksPerSecond * pVM->tm.s.u8TSCMultiplier;
         }
     }

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

@@ -335 +335 @@
                               "TSCTiedToExecution|"
                               "TSCNotTiedToHalt|"
+                              "TSCMultiplier|"
                               "ScheduleSlack|"
                               "CatchUpStopThreshold|"
@@ -420 +421 @@
     }
 
+    /** @cfgm{/TM/TSCMultiplier, uint8_t}
+     * This is a multiplier to apply to the host TSC while calculating the guest
+     * TSC.  It's recommended to avoid using a power-of-two value to reduce number
+     * of zeros in least-significant-bits of the scaled TSC.  Defaults to 43 on
+     * ARM64 and 1 on all other hosts. */
+#ifdef RT_ARCH_ARM64
+    pVM->tm.s.u8TSCMultiplier = 43; /* 125/3 + some fudge to get us >= 1GHz from 24MHz */
+#else
+    pVM->tm.s.u8TSCMultiplier = 1;
+#endif
+    rc = CFGMR3QueryU8Def(pCfgHandle, "TSCMultiplier", &pVM->tm.s.u8TSCMultiplier, pVM->tm.s.u8TSCMultiplier);
+    if (RT_FAILURE(rc))
+        return VMSetError(pVM, rc, RT_SRC_POS,
+                          N_("Configuration error: Failed to query 8-bit value \"TSCMultiplier\""));
+    if (pVM->tm.s.u8TSCMultiplier == 0)
+        return VMSetError(pVM, rc, RT_SRC_POS, N_("Configuration error: \"TSCMultiplier\" must not be zero!"));
+
     /** @cfgm{/TM/TSCTicksPerSecond, uint32_t, Current TSC frequency from GIP}
      * The number of TSC ticks per second (i.e. the TSC frequency). This will
@@ -428 +446 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
     {
-        pVM->tm.s.cTSCTicksPerSecond = pVM->tm.s.cTSCTicksPerSecondHost;
+        pVM->tm.s.cTSCTicksPerSecond = pVM->tm.s.cTSCTicksPerSecondHost * pVM->tm.s.u8TSCMultiplier;
         if (   (   pVM->tm.s.enmTSCMode == TMTSCMODE_DYNAMIC
                 || pVM->tm.s.enmTSCMode == TMTSCMODE_VIRT_TSC_EMULATED)
@@ -450 +468 @@
     {
         LogRel(("TM: NEM overrides the /TM/TSCTicksPerSecond=%RU64 setting.\n", pVM->tm.s.cTSCTicksPerSecond));
-        pVM->tm.s.cTSCTicksPerSecond = pVM->tm.s.cTSCTicksPerSecondHost;
+        pVM->tm.s.cTSCTicksPerSecond = pVM->tm.s.cTSCTicksPerSecondHost * pVM->tm.s.u8TSCMultiplier;
     }
 
@@ -641 +659 @@
     CPUMR3SetCR4Feature(pVM, X86_CR4_TSD, ~X86_CR4_TSD);
 #endif
-    LogRel(("TM:     cTSCTicksPerSecond=%'RU64 (%#RX64) enmTSCMode=%d (%s)\n"
+    LogRel(("TM:     cTSCTicksPerSecond=%'RU64 (%#RX64) enmTSCMode=%d (%s) TSCMultiplier=%u\n"
             "TM: cTSCTicksPerSecondHost=%'RU64 (%#RX64)\n"
             "TM: TSCTiedToExecution=%RTbool TSCNotTiedToHalt=%RTbool\n",
-            pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.enmTSCMode, tmR3GetTSCModeName(pVM),
+            pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.enmTSCMode, tmR3GetTSCModeName(pVM), pVM->tm.s.u8TSCMultiplier,
             pVM->tm.s.cTSCTicksPerSecondHost, pVM->tm.s.cTSCTicksPerSecondHost,
             pVM->tm.s.fTSCTiedToExecution, pVM->tm.s.fTSCNotTiedToHalt));
@@ -1250 +1268 @@
     {
         case TMTSCMODE_REAL_TSC_OFFSET:
-            offTscRawSrc = SUPReadTsc();
+            offTscRawSrc = SUPReadTsc() * pVM->tm.s.u8TSCMultiplier;
             break;
         case TMTSCMODE_DYNAMIC:
@@ -3742 +3760 @@
          */
         uint64_t uRawOldTsc = tmR3CpuTickGetRawVirtualNoCheck(pVM);
-        uint64_t uRawNewTsc = SUPReadTsc();
+        uint64_t uRawNewTsc = SUPReadTsc() * pVM->tm.s.u8TSCMultiplier;
         uint32_t cCpus = pVM->cCpus;
         for (uint32_t i = 0; i < cCpus; i++)
@@ -3796 +3814 @@
          * See tmR3CpuTickParavirtEnable for an explanation of the conversion math.
          */
-        uint64_t uRawOldTsc = SUPReadTsc();
+        uint64_t uRawOldTsc = SUPReadTsc() * pVM->tm.s.u8TSCMultiplier;
         uint64_t uRawNewTsc = tmR3CpuTickGetRawVirtualNoCheck(pVM);
         uint32_t cCpus = pVM->cCpus;

trunk/src/VBox/VMM/include/TMInternal.h

@@ -478 +478 @@
     /** Virtual timer synchronous time catch-up active. */
     bool volatile               fVirtualSyncCatchUp;
-    /** Alignment padding. */
-    bool                        afAlignment1[1];
+    /** The multiplier for TSC. */
+    uint8_t                     u8TSCMultiplier;
     /** WarpDrive percentage.
      * 100% is normal (fVirtualSyncNormal == true). When other than 100% we apply