Changeset 92709 in vbox for trunk/src/VBox/VMM/VMMAll/TMAllCpu.cpp

Timestamp:

Dec 2, 2021 1:56:44 PM (3 years ago)

Author:

vboxsync

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

148608

Message:

VMM/TM,SUP: Made it thru TM init in driverless mode... bugref:10138

File:

• trunk/src/VBox/VMM/VMMAll/TMAllCpu.cpp (modified) (6 diffs)

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

@@ -310 +310 @@
          *        exact opposite of what the hardware implements. */
 # ifdef IN_RING3
-        *poffRealTsc = (uint64_t)0 - pVCpu->tm.s.offTSCRawSrc - (uint64_t)SUPGetTscDelta();
+        *poffRealTsc = (uint64_t)0 - pVCpu->tm.s.offTSCRawSrc - (uint64_t)SUPGetTscDelta(g_pSUPGlobalInfoPage);
 # else
         *poffRealTsc = (uint64_t)0 - pVCpu->tm.s.offTSCRawSrc - (uint64_t)SUPGetTscDeltaByCpuSetIndex(pVCpu->iHostCpuSet);
@@ -342 +342 @@
         {
 # ifdef IN_RING3
-            *poffRealTsc = u64Now - (uTscNow + (uint64_t)SUPGetTscDelta();
+            *poffRealTsc = u64Now - (uTscNow + (uint64_t)SUPGetTscDelta(g_pSUPGlobalInfoPage);
 # else
             *poffRealTsc = u64Now - (uTscNow + (uint64_t)SUPGetTscDeltaByCpuSetIndex(pVCpu->iHostCpuSet));
@@ -373 +373 @@
 # ifdef IN_RING3
     RT_NOREF_PV(pVCpu);
-    uint64_t uCpuHz = SUPGetCpuHzFromGip(g_pSUPGlobalInfoPage);
+    PSUPGIP const pGip = g_pSUPGlobalInfoPage;
+    uint64_t uCpuHz = pGip ? SUPGetCpuHzFromGip(pGip) : pVCpu->pVMR3->tm.s.cTSCTicksPerSecondHost;
 # else
     uint64_t uCpuHz = SUPGetCpuHzFromGipBySetIndex(g_pSUPGlobalInfoPage, pVCpu->iHostCpuSet);
@@ -427 +428 @@
          *        exact opposite of what the hardware implements. */
 # ifdef IN_RING3
-        *poffRealTsc     = (uint64_t)0 - pVCpu->tm.s.offTSCRawSrc - (uint64_t)SUPGetTscDelta();
+        *poffRealTsc     = (uint64_t)0 - pVCpu->tm.s.offTSCRawSrc - (uint64_t)SUPGetTscDelta(g_pSUPGlobalInfoPage);
 # else
         *poffRealTsc     = (uint64_t)0 - pVCpu->tm.s.offTSCRawSrc - (uint64_t)SUPGetTscDeltaByCpuSetIndex(pVCpu->iHostCpuSet);
@@ -450 +451 @@
 
 # ifdef IN_RING3
-        *poffRealTsc     = u64Now - (*puTscNow + (uint64_t)SUPGetTscDelta()); /* undoing delta */
+        *poffRealTsc     = u64Now - (*puTscNow + (uint64_t)SUPGetTscDelta(g_pSUPGlobalInfoPage)); /* undoing delta */
 # else
         *poffRealTsc     = u64Now - (*puTscNow + (uint64_t)SUPGetTscDeltaByCpuSetIndex(pVCpu->iHostCpuSet)); /* undoing delta */
@@ -618 +619 @@
 VMMDECL(uint64_t) TMCpuTicksPerSecond(PVMCC pVM)
 {
-    if (   pVM->tm.s.enmTSCMode == TMTSCMODE_REAL_TSC_OFFSET
-        && g_pSUPGlobalInfoPage->u32Mode != SUPGIPMODE_INVARIANT_TSC)
-    {
+    if (pVM->tm.s.enmTSCMode == TMTSCMODE_REAL_TSC_OFFSET)
+    {
+        PSUPGLOBALINFOPAGE const pGip = g_pSUPGlobalInfoPage;
+        if (pGip && pGip->u32Mode != SUPGIPMODE_INVARIANT_TSC)
+        {
 #ifdef IN_RING3
-        uint64_t cTSCTicksPerSecond = SUPGetCpuHzFromGip(g_pSUPGlobalInfoPage);
+            uint64_t cTSCTicksPerSecond = SUPGetCpuHzFromGip(pGip);
 #elif defined(IN_RING0)
-        uint64_t cTSCTicksPerSecond = SUPGetCpuHzFromGipBySetIndex(g_pSUPGlobalInfoPage, (uint32_t)RTMpCpuIdToSetIndex(RTMpCpuId()));
+            uint64_t cTSCTicksPerSecond = SUPGetCpuHzFromGipBySetIndex(pGip, (uint32_t)RTMpCpuIdToSetIndex(RTMpCpuId()));
 #else
-        uint64_t cTSCTicksPerSecond = SUPGetCpuHzFromGipBySetIndex(g_pSUPGlobalInfoPage, VMMGetCpu(pVM)->iHostCpuSet);
+            uint64_t cTSCTicksPerSecond = SUPGetCpuHzFromGipBySetIndex(pGip, VMMGetCpu(pVM)->iHostCpuSet);
 #endif
-        if (RT_LIKELY(cTSCTicksPerSecond != ~(uint64_t)0))
-            return cTSCTicksPerSecond;
+            if (RT_LIKELY(cTSCTicksPerSecond != ~(uint64_t)0))
+                return cTSCTicksPerSecond;
+        }
     }
     return pVM->tm.s.cTSCTicksPerSecond;