Changeset 87626 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Feb 5, 2021 12:58:54 PM (4 years ago)

Author:

vboxsync

Message:

IPRT/time,VMM/TM: Added extra parameter to the RTTimeNanoTS GIP workers for returning the TSC value.

Location:

trunk/src/VBox/Runtime/common/time

Files:

• timesup.cpp (modified) (7 diffs)
• timesupref.h (modified) (4 diffs)

trunk/src/VBox/Runtime/common/time/timesup.cpp

@@ -50 +50 @@
 #if !defined(IN_GUEST) && !defined(RT_NO_GIP)
 static DECLCALLBACK(void)     rtTimeNanoTSInternalBitch(PRTTIMENANOTSDATA pData, uint64_t u64NanoTS, uint64_t u64DeltaPrev, uint64_t u64PrevNanoTS);
-static DECLCALLBACK(uint64_t) rtTimeNanoTSInternalFallback(PRTTIMENANOTSDATA pData);
-static DECLCALLBACK(uint64_t) rtTimeNanoTSInternalRediscover(PRTTIMENANOTSDATA pData);
-static DECLCALLBACK(uint64_t) rtTimeNanoTSInternalBadCpuIndex(PRTTIMENANOTSDATA pData, uint16_t idApic, uint16_t iCpuSet, uint16_t iGipCpu);
+static DECLCALLBACK(uint64_t) rtTimeNanoTSInternalFallback(PRTTIMENANOTSDATA pData, PRTITMENANOTSEXTRA pExtra);
+static DECLCALLBACK(uint64_t) rtTimeNanoTSInternalRediscover(PRTTIMENANOTSDATA pData, PRTITMENANOTSEXTRA pExtra);
+static DECLCALLBACK(uint64_t) rtTimeNanoTSInternalBadCpuIndex(PRTTIMENANOTSDATA pData, PRTITMENANOTSEXTRA pExtra,
+                                                              uint16_t idApic, uint16_t iCpuSet, uint16_t iGipCpu);
 #endif
 
@@ -129 +130 @@
  * @interface_method_impl{RTTIMENANOTSDATA,pfnBadCpuIndex}
  */
-static DECLCALLBACK(uint64_t) rtTimeNanoTSInternalBadCpuIndex(PRTTIMENANOTSDATA pData, uint16_t idApic,
-                                                              uint16_t iCpuSet, uint16_t iGipCpu)
+static DECLCALLBACK(uint64_t) rtTimeNanoTSInternalBadCpuIndex(PRTTIMENANOTSDATA pData, PRTITMENANOTSEXTRA pExtra,
+                                                              uint16_t idApic, uint16_t iCpuSet, uint16_t iGipCpu)
 {
     RT_NOREF_PV(pData); RT_NOREF_PV(idApic); RT_NOREF_PV(iCpuSet); RT_NOREF_PV(iGipCpu);
 # ifndef IN_RC
     AssertMsgFailed(("idApic=%#x iCpuSet=%#x iGipCpu=%#x\n", idApic, iCpuSet, iGipCpu));
+    if (pExtra)
+        pExtra->uTSCValue = ASMReadTSC();
     return RTTimeSystemNanoTS();
 # else
@@ -146 +149 @@
  * Fallback function.
  */
-static DECLCALLBACK(uint64_t) rtTimeNanoTSInternalFallback(PRTTIMENANOTSDATA pData)
+static DECLCALLBACK(uint64_t) rtTimeNanoTSInternalFallback(PRTTIMENANOTSDATA pData, PRTITMENANOTSEXTRA pExtra)
 {
     PSUPGLOBALINFOPAGE pGip = g_pSUPGlobalInfoPage;
@@ -154 +157 @@
              || pGip->u32Mode == SUPGIPMODE_SYNC_TSC
              || pGip->u32Mode == SUPGIPMODE_ASYNC_TSC))
-        return rtTimeNanoTSInternalRediscover(pData);
+        return rtTimeNanoTSInternalRediscover(pData, pExtra);
     NOREF(pData);
 # ifndef IN_RC
+    if (pExtra)
+        pExtra->uTSCValue = ASMReadTSC();
     return RTTimeSystemNanoTS();
 # else
@@ -169 +174 @@
  * is mapped/unmapped.
  */
-static DECLCALLBACK(uint64_t) rtTimeNanoTSInternalRediscover(PRTTIMENANOTSDATA pData)
+static DECLCALLBACK(uint64_t) rtTimeNanoTSInternalRediscover(PRTTIMENANOTSDATA pData, PRTITMENANOTSEXTRA pExtra)
 {
     PSUPGLOBALINFOPAGE      pGip = g_pSUPGlobalInfoPage;
@@ -298 +303 @@
 # ifdef IN_RC
     ASMAtomicWriteU32((uint32_t volatile *)&g_iWorker, iWorker);
-    return g_apfnWorkers[iWorker](pData);
+    return g_apfnWorkers[iWorker](pData, pExtra);
 # else
     ASMAtomicWritePtr((void * volatile *)&g_pfnWorker, (void *)(uintptr_t)pfnWorker);
-    return pfnWorker(pData);
+    return pfnWorker(pData, pExtra);
 # endif
 }
@@ -315 +320 @@
 #if !defined(IN_GUEST) && !defined(RT_NO_GIP)
 # ifdef IN_RC
-    return g_apfnWorkers[g_iWorker](&g_TimeNanoTSData);
-# else
-    return g_pfnWorker(&g_TimeNanoTSData);
+    return g_apfnWorkers[g_iWorker](&g_TimeNanoTSData, NULL /*pExtra*/);
+# else
+    return g_pfnWorker(&g_TimeNanoTSData, NULL /*pExtra*/);
 # endif
 #else

trunk/src/VBox/Runtime/common/time/timesupref.h

@@ -41 +41 @@
  * @returns Nanosecond timestamp.
  * @param   pData       Pointer to the data structure.
+ * @param   pExtra      Where to return extra time info. Optional.
  */
-RTDECL(uint64_t) rtTimeNanoTSInternalRef(PRTTIMENANOTSDATA pData)
+RTDECL(uint64_t) rtTimeNanoTSInternalRef(PRTTIMENANOTSDATA pData, PRTITMENANOTSEXTRA pExtra)
 {
 #if TMPL_MODE == TMPL_MODE_SYNC_INVAR_WITH_DELTA && defined(IN_RING3)
@@ -246 +247 @@
 #endif
 
+                            if (pExtra)
+                                pExtra->uTSCValue = u64Delta;
+
                             /*
                              * Calc NanoTS delta.
@@ -374 +378 @@
       && TMPL_GET_CPU_METHOD != SUPGIPGETCPU_APIC_ID_EXT_0B /*?*/ \
       && TMPL_GET_CPU_METHOD != SUPGIPGETCPU_APIC_ID_EXT_8000001E /*?*/)
-                return pData->pfnBadCpuIndex(pData, UINT16_MAX-1, iCpuSet, iGipCpu);
+                return pData->pfnBadCpuIndex(pData, pExtra, UINT16_MAX-1, iCpuSet, iGipCpu);
 # else
-                return pData->pfnBadCpuIndex(pData, idApic, UINT16_MAX-1, iGipCpu);
+                return pData->pfnBadCpuIndex(pData, pExtra, idApic, UINT16_MAX-1, iGipCpu);
 # endif
             }
@@ -389 +393 @@
         ASMSetFlags(uFlags);
 #endif
-        return pData->pfnRediscover(pData);
+        return pData->pfnRediscover(pData, pExtra);
     }
 }