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

Timestamp:

Dec 2, 2021 10:41:09 PM (3 years ago)

Author:

vboxsync

Message:

VMM/TM: Driverless adjustments for init complete code. bugref:10138

File:

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

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

@@ -192 +192 @@
 static const char          *tmR3GetTSCModeName(PVM pVM);
 static const char          *tmR3GetTSCModeNameEx(TMTSCMODE enmMode);
+static int                  tmR3TimerQueueGrow(PVM pVM, PTMTIMERQUEUE pQueue, uint32_t cNewTimers);
 
 
@@ -1072 +1073 @@
 
     /*
-     * Resolve symbols.
-     */
-    rc = PDMR3LdrGetSymbolR0(pVM, NULL, "tmVirtualNanoTSBad",           &pVM->tm.s.VirtualGetRawDataR0.pfnBad);
-    AssertRCReturn(rc, rc);
-    rc = PDMR3LdrGetSymbolR0(pVM, NULL, "tmVirtualNanoTSBadCpuIndex",   &pVM->tm.s.VirtualGetRawDataR0.pfnBadCpuIndex);
-    AssertRCReturn(rc, rc);
-    rc = PDMR3LdrGetSymbolR0(pVM, NULL, "tmVirtualNanoTSRediscover",    &pVM->tm.s.VirtualGetRawDataR0.pfnRediscover);
-    AssertRCReturn(rc, rc);
-    pVM->tm.s.pfnVirtualGetRawR0 = pVM->tm.s.VirtualGetRawDataR0.pfnRediscover;
+     * Resolve symbols, unless we're in driverless mode.
+     */
+    if (!SUPR3IsDriverless())
+    {
+        rc = PDMR3LdrGetSymbolR0(pVM, NULL, "tmVirtualNanoTSBad",           &pVM->tm.s.VirtualGetRawDataR0.pfnBad);
+        AssertRCReturn(rc, rc);
+        rc = PDMR3LdrGetSymbolR0(pVM, NULL, "tmVirtualNanoTSBadCpuIndex",   &pVM->tm.s.VirtualGetRawDataR0.pfnBadCpuIndex);
+        AssertRCReturn(rc, rc);
+        rc = PDMR3LdrGetSymbolR0(pVM, NULL, "tmVirtualNanoTSRediscover",    &pVM->tm.s.VirtualGetRawDataR0.pfnRediscover);
+        AssertRCReturn(rc, rc);
+        pVM->tm.s.pfnVirtualGetRawR0 = pVM->tm.s.VirtualGetRawDataR0.pfnRediscover;
+    }
 
 #ifndef VBOX_WITHOUT_NS_ACCOUNTING
@@ -1107 +1111 @@
     {
         PTMTIMERQUEUE pQueue = &pVM->tm.s.aTimerQueues[s_aExtra[i].idxQueue];
+        PDMCritSectRwEnterExcl(pVM, &pQueue->AllocLock, VERR_IGNORED);
         if (s_aExtra[i].cExtra > pQueue->cTimersFree)
         {
-            PDMCritSectRwEnterExcl(pVM, &pQueue->AllocLock, VERR_IGNORED);
             uint32_t cTimersAlloc = pQueue->cTimersAlloc + s_aExtra[i].cExtra - pQueue->cTimersFree;
-            rc = VMMR3CallR0Emt(pVM, VMMGetCpu(pVM), VMMR0_DO_TM_GROW_TIMER_QUEUE,
-                                RT_MAKE_U64(cTimersAlloc, s_aExtra[i].idxQueue), NULL);
+            rc = tmR3TimerQueueGrow(pVM, pQueue, cTimersAlloc);
             AssertLogRelMsgReturn(RT_SUCCESS(rc), ("rc=%Rrc cTimersAlloc=%u %s\n", rc, cTimersAlloc, pQueue->szName), rc);
-            PDMCritSectRwLeaveExcl(pVM, &pQueue->AllocLock);
         }
+        PDMCritSectRwLeaveExcl(pVM, &pQueue->AllocLock);
     }
 
@@ -1530 +1533 @@
  * @param   pVM         The cross context VM structure.
  * @param   pQueue      The timer queue to grow.
+ * @param   cNewTimers  The minimum number of timers after growing.
  * @note    Caller owns the queue's allocation lock.
  */
-static int tmR3TimerQueueGrow(PVM pVM, PTMTIMERQUEUE pQueue)
+static int tmR3TimerQueueGrow(PVM pVM, PTMTIMERQUEUE pQueue, uint32_t cNewTimers)
 {
     /*
@@ -1541 +1545 @@
     AssertReturn(!pQueue->fCannotGrow, VERR_TM_TIMER_QUEUE_CANNOT_GROW);
 
+    uint32_t const cOldEntries = pQueue->cTimersAlloc;
+    AssertReturn(cNewTimers > cOldEntries, VERR_TM_IPE_1);
+    AssertReturn(cNewTimers < _32K, VERR_TM_IPE_1);
+
     /*
      * Do the growing.
      */
     int rc;
-    uint32_t const cOldEntries = pQueue->cTimersAlloc;
-    uint32_t       cNewTimers  = cOldEntries + 64;
-    Assert(cNewTimers < _32K);
     if (!SUPR3IsDriverless())
     {
@@ -1638 +1643 @@
     if (!pQueue->cTimersFree)
     {
-        rc = tmR3TimerQueueGrow(pVM, pQueue);
+        rc = tmR3TimerQueueGrow(pVM, pQueue, pQueue->cTimersAlloc + 64);
         AssertRCReturnStmt(rc, PDMCritSectRwLeaveExcl(pVM, &pQueue->AllocLock), rc);
     }
@@ -3842 +3847 @@
     PSUPGLOBALINFOPAGE pGip;
     return tmR3HasFixedTSC(pVM)                             /* Host has fixed-rate TSC. */
-        && (   (pGip = g_pSUPGlobalInfoPage) != NULL        /* Can be NULL in driverless mode. */
+        && (   (pGip = g_pSUPGlobalInfoPage) == NULL        /* Can be NULL in driverless mode. */
             || (pGip->u32Mode != SUPGIPMODE_ASYNC_TSC));    /* GIP thinks it's monotonic. */
 }