Changeset 87822 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Feb 20, 2021 10:34:06 AM (4 years ago)

Author:

vboxsync

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

142883

Message:

VMM/TM: Let non-EMTs schedule timers too. Take care when translating idTimerCpu to a pVCpu. bugref:9943

File:

• trunk/src/VBox/VMM/VMMAll/TMAll.cpp (modified) (4 diffs)

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

@@ -342 +342 @@
 DECLINLINE(void) tmScheduleNotify(PVMCC pVM)
 {
-    PVMCPUCC pVCpuDst = VMCC_GET_CPU(pVM, pVM->tm.s.idTimerCpu);
+    VMCPUID idCpu = pVM->tm.s.idTimerCpu;
+    AssertReturnVoid(idCpu < pVM->cCpus);
+    PVMCPUCC pVCpuDst = VMCC_GET_CPU(pVM, idCpu);
+
     if (!VMCPU_FF_IS_SET(pVCpuDst, VMCPU_FF_TIMER))
     {
@@ -360 +363 @@
 DECLINLINE(void) tmSchedule(PVMCC pVM, PTMTIMERQUEUECC pQueueCC, PTMTIMERQUEUE pQueue, PTMTIMER pTimer)
 {
-    if (VM_IS_EMT(pVM)) /** @todo drop EMT requirement here. */
-    {
-        int rc = PDMCritSectTryEnter(&pQueue->TimerLock);
-        if (RT_SUCCESS_NP(rc))
-        {
-            STAM_PROFILE_START(&pVM->tm.s.CTX_SUFF_Z(StatScheduleOne), a);
-            Log3(("tmSchedule: tmTimerQueueSchedule\n"));
-            tmTimerQueueSchedule(pVM, pQueueCC, pQueue);
+    int rc = PDMCritSectTryEnter(&pQueue->TimerLock);
+    if (RT_SUCCESS_NP(rc))
+    {
+        STAM_PROFILE_START(&pVM->tm.s.CTX_SUFF_Z(StatScheduleOne), a);
+        Log3(("tmSchedule: tmTimerQueueSchedule\n"));
+        tmTimerQueueSchedule(pVM, pQueueCC, pQueue);
 #ifdef VBOX_STRICT
-            tmTimerQueuesSanityChecks(pVM, "tmSchedule");
+        tmTimerQueuesSanityChecks(pVM, "tmSchedule");
 #endif
-            STAM_PROFILE_STOP(&pVM->tm.s.CTX_SUFF_Z(StatScheduleOne), a);
-            PDMCritSectLeave(&pQueue->TimerLock);
-            return;
-        }
+        STAM_PROFILE_STOP(&pVM->tm.s.CTX_SUFF_Z(StatScheduleOne), a);
+        PDMCritSectLeave(&pQueue->TimerLock);
+        return;
     }
 
@@ -864 +864 @@
 }
 
+
 /**
  * Common worker for TMTimerPollGIP and TMTimerPoll.
@@ -882 +883 @@
 DECL_FORCE_INLINE(uint64_t) tmTimerPollInternal(PVMCC pVM, PVMCPUCC pVCpu, uint64_t *pu64Delta)
 {
-    PVMCPU                  pVCpuDst      = VMCC_GET_CPU(pVM, pVM->tm.s.idTimerCpu);
-    const uint64_t          u64Now        = TMVirtualGetNoCheck(pVM);
+    VMCPUID idCpu = pVM->tm.s.idTimerCpu;
+    AssertReturn(idCpu < pVM->cCpus, 0);
+    PVMCPUCC pVCpuDst = VMCC_GET_CPU(pVM, idCpu);
+
+    const uint64_t u64Now = TMVirtualGetNoCheck(pVM);
     STAM_COUNTER_INC(&pVM->tm.s.StatPoll);