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

Timestamp:

Feb 16, 2021 6:05:41 PM (4 years ago)

Author:

vboxsync

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

142825

Message:

VMM/TM: Removed pVMR3, pVMR0 and pVMRC from TMTIMER. bugref:9943

File:

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

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

@@ -57 +57 @@
  * @todo needs reworking later as it uses PDMDEVINSR0::pDevInsR0RemoveMe.  */
 # ifdef IN_RING3
-#  define TMTIMER_GET_CRITSECT(pTimer) ((pTimer)->pCritSect)
+#  define TMTIMER_GET_CRITSECT(a_pVM, a_pTimer) ((a_pTimer)->pCritSect)
 # else
-#  define TMTIMER_GET_CRITSECT(pTimer) tmRZTimerGetCritSect(pTimer)
+#  define TMTIMER_GET_CRITSECT(a_pVM, a_pTimer) tmRZTimerGetCritSect(a_pVM, a_pTimer)
 # endif
 #endif
@@ -67 +67 @@
  * the timer. */
 #ifdef VBOX_STRICT
-# define TMTIMER_ASSERT_CRITSECT(pTimer) \
+# define TMTIMER_ASSERT_CRITSECT(a_pVM, a_pTimer) \
     do { \
-        if ((pTimer)->pCritSect) \
+        if ((a_pTimer)->pCritSect) \
         { \
             VMSTATE      enmState; \
-            PPDMCRITSECT pCritSect = TMTIMER_GET_CRITSECT(pTimer); \
+            PPDMCRITSECT pCritSect = TMTIMER_GET_CRITSECT(a_pVM, a_pTimer); \
             AssertMsg(   pCritSect \
                       && (   PDMCritSectIsOwner(pCritSect) \
-                          || (enmState = (pTimer)->CTX_SUFF(pVM)->enmVMState) == VMSTATE_CREATING \
+                          || (enmState = (a_pVM)->enmVMState) == VMSTATE_CREATING \
                           || enmState == VMSTATE_RESETTING \
                           || enmState == VMSTATE_RESETTING_LS ),\
-                      ("pTimer=%p (%s) pCritSect=%p (%s)\n", pTimer, R3STRING(pTimer->pszDesc), \
-                       (pTimer)->pCritSect, R3STRING(PDMR3CritSectName((pTimer)->pCritSect)) )); \
+                      ("pTimer=%p (%s) pCritSect=%p (%s)\n", a_pTimer, R3STRING(a_pTimer->pszDesc), \
+                       (a_pTimer)->pCritSect, R3STRING(PDMR3CritSectName((a_pTimer)->pCritSect)) )); \
         } \
     } while (0)
 #else
-# define TMTIMER_ASSERT_CRITSECT(pTimer) do { } while (0)
+# define TMTIMER_ASSERT_CRITSECT(pVM, pTimer) do { } while (0)
 #endif
 
@@ -105 +105 @@
         { \
             VMSTATE      enmState; \
-            PPDMCRITSECT pCritSect = TMTIMER_GET_CRITSECT(pTimer); \
+            PPDMCRITSECT pCritSect = TMTIMER_GET_CRITSECT(pVM, pTimer); \
             AssertMsg(   pCritSect \
                       && (   !PDMCritSectIsOwner(pCritSect) \
@@ -126 +126 @@
  * @todo This needs a redo!
  */
-DECLINLINE(PPDMCRITSECT) tmRZTimerGetCritSect(PTMTIMER pTimer)
+DECLINLINE(PPDMCRITSECT) tmRZTimerGetCritSect(PVMCC pVM, PTMTIMER pTimer)
 {
     if (pTimer->enmType == TMTIMERTYPE_DEV)
@@ -140 +140 @@
             return (PPDMCRITSECT)((uintptr_t)pDevInsR0->pvInstanceDataR0 + offCritSect);
     }
-    return (PPDMCRITSECT)MMHyperR3ToCC((pTimer)->CTX_SUFF(pVM), pTimer->pCritSect);
+    return (PPDMCRITSECT)MMHyperR3ToCC(pVM, pTimer->pCritSect);
 }
 #endif /* VBOX_STRICT && IN_RING0 */
@@ -358 +358 @@
  * Schedule the queue which was changed.
  */
-DECLINLINE(void) tmSchedule(PTMTIMER pTimer)
-{
-    PVMCC pVM = pTimer->CTX_SUFF(pVM);
+DECLINLINE(void) tmSchedule(PVMCC pVM, PTMTIMER pTimer)
+{
     if (    VM_IS_EMT(pVM)
         &&  RT_SUCCESS(TM_TRY_LOCK_TIMERS(pVM)))
@@ -432 +431 @@
  *
  * @returns Success indicator.
+ * @param   pVM             The cross context VM structure.
  * @param   pTimer          Timer in question.
  * @param   enmStateNew     The new timer state.
  * @param   enmStateOld     The old timer state.
  */
-DECLINLINE(bool) tmTimerTryWithLink(PTMTIMER pTimer, TMTIMERSTATE enmStateNew, TMTIMERSTATE enmStateOld)
+DECLINLINE(bool) tmTimerTryWithLink(PVMCC pVM, PTMTIMER pTimer, TMTIMERSTATE enmStateNew, TMTIMERSTATE enmStateOld)
 {
     if (tmTimerTry(pTimer, enmStateNew, enmStateOld))
     {
-        tmTimerLinkSchedule(&pTimer->CTX_SUFF(pVM)->tm.s.CTX_SUFF(paTimerQueues)[pTimer->enmClock], pTimer);
+        tmTimerLinkSchedule(&pVM->tm.s.CTX_SUFF(paTimerQueues)[pTimer->enmClock], pTimer);
         return true;
     }
@@ -505 +505 @@
  * Schedules the given timer on the given queue.
  *
+ * @param   pVM         The cross context VM structure.
  * @param   pQueue      The timer queue.
  * @param   pTimer      The timer that needs scheduling.
@@ -510 +511 @@
  * @remarks Called while owning the lock.
  */
-DECLINLINE(void) tmTimerQueueScheduleOne(PTMTIMERQUEUE pQueue, PTMTIMER pTimer)
+DECLINLINE(void) tmTimerQueueScheduleOne(PVMCC pVM, PTMTIMERQUEUE pQueue, PTMTIMER pTimer)
 {
     Assert(pQueue->enmClock != TMCLOCK_VIRTUAL_SYNC);
+    RT_NOREF(pVM);
 
     /*
@@ -573 +575 @@
             case TMTIMERSTATE_PENDING_SCHEDULE_SET_EXPIRE:
                 tmTimerLinkSchedule(pQueue, pTimer);
-                STAM_COUNTER_INC(&pTimer->CTX_SUFF(pVM)->tm.s.CTX_SUFF_Z(StatPostponed));
+                STAM_COUNTER_INC(&pVM->tm.s.CTX_SUFF_Z(StatPostponed));
                 return;
 
@@ -601 +603 @@
  * @remarks Called while owning the lock.
  */
-void tmTimerQueueSchedule(PVM pVM, PTMTIMERQUEUE pQueue)
+void tmTimerQueueSchedule(PVMCC pVM, PTMTIMERQUEUE pQueue)
 {
     TM_ASSERT_TIMER_LOCK_OWNERSHIP(pVM);
@@ -628 +630 @@
         Log2(("tmTimerQueueSchedule: %p:{.enmState=%s, .enmClock=%d, .enmType=%d, .pszDesc=%s}\n",
               pTimer, tmTimerState(pTimer->enmState), pTimer->enmClock, pTimer->enmType, R3STRING(pTimer->pszDesc)));
-        tmTimerQueueScheduleOne(pQueue, pTimer);
+        tmTimerQueueScheduleOne(pVM, pQueue, pTimer);
         Log2(("tmTimerQueueSchedule: %p: new %s\n", pTimer, tmTimerState(pTimer->enmState)));
     } /* foreach timer in current schedule batch. */
@@ -1287 +1289 @@
 
     STAM_PROFILE_START(&pVM->tm.s.CTX_SUFF_Z(StatTimerSet), a);
-    TMTIMER_ASSERT_CRITSECT(pTimer);
+    TMTIMER_ASSERT_CRITSECT(pVM, pTimer);
 
     DBGFTRACE_U64_TAG2(pVM, u64Expire, "TMTimerSet", R3STRING(pTimer->pszDesc));
@@ -1350 +1352 @@
             case TMTIMERSTATE_EXPIRED_DELIVER:
             case TMTIMERSTATE_STOPPED:
-                if (tmTimerTryWithLink(pTimer, TMTIMERSTATE_PENDING_SCHEDULE_SET_EXPIRE, enmState))
+                if (tmTimerTryWithLink(pVM, pTimer, TMTIMERSTATE_PENDING_SCHEDULE_SET_EXPIRE, enmState))
                 {
                     Assert(!pTimer->offPrev);
@@ -1356 +1358 @@
                     pTimer->u64Expire = u64Expire;
                     TM_SET_STATE(pTimer, TMTIMERSTATE_PENDING_SCHEDULE);
-                    tmSchedule(pTimer);
+                    tmSchedule(pVM, pTimer);
                     STAM_PROFILE_STOP(&pVM->tm.s.CTX_SUFF_Z(StatTimerSet), a);
                     return VINF_SUCCESS;
@@ -1368 +1370 @@
                     pTimer->u64Expire = u64Expire;
                     TM_SET_STATE(pTimer, TMTIMERSTATE_PENDING_SCHEDULE);
-                    tmSchedule(pTimer);
+                    tmSchedule(pVM, pTimer);
                     STAM_PROFILE_STOP(&pVM->tm.s.CTX_SUFF_Z(StatTimerSet), a);
                     return VINF_SUCCESS;
@@ -1376 +1378 @@
 
             case TMTIMERSTATE_ACTIVE:
-                if (tmTimerTryWithLink(pTimer, TMTIMERSTATE_PENDING_RESCHEDULE_SET_EXPIRE, enmState))
+                if (tmTimerTryWithLink(pVM, pTimer, TMTIMERSTATE_PENDING_RESCHEDULE_SET_EXPIRE, enmState))
                 {
                     pTimer->u64Expire = u64Expire;
                     TM_SET_STATE(pTimer, TMTIMERSTATE_PENDING_RESCHEDULE);
-                    tmSchedule(pTimer);
+                    tmSchedule(pVM, pTimer);
                     STAM_PROFILE_STOP(&pVM->tm.s.CTX_SUFF_Z(StatTimerSet), a);
                     return VINF_SUCCESS;
@@ -1392 +1394 @@
                     pTimer->u64Expire = u64Expire;
                     TM_SET_STATE(pTimer, TMTIMERSTATE_PENDING_RESCHEDULE);
-                    tmSchedule(pTimer);
+                    tmSchedule(pVM, pTimer);
                     STAM_PROFILE_STOP(&pVM->tm.s.CTX_SUFF_Z(StatTimerSet), a);
                     return VINF_SUCCESS;
@@ -1594 +1596 @@
 
     STAM_PROFILE_START(&pVM->tm.s.CTX_SUFF_Z(StatTimerSetRelative), a);
-    TMTIMER_ASSERT_CRITSECT(pTimer);
+    TMTIMER_ASSERT_CRITSECT(pVM, pTimer);
 
     DBGFTRACE_U64_TAG2(pVM, cTicksToNext, "TMTimerSetRelative", R3STRING(pTimer->pszDesc));
@@ -1641 +1643 @@
         {
             tmTimerSetRelativeOptimizedStart(pVM, pTimer, cTicksToNext, pu64Now);
-            STAM_PROFILE_STOP(&pTimer->CTX_SUFF(pVM)->tm.s.CTX_SUFF_Z(StatTimerSetRelative), a);
+            STAM_PROFILE_STOP(&pVM->tm.s.CTX_SUFF_Z(StatTimerSetRelative), a);
             return VINF_SUCCESS;
         }
@@ -1673 +1675 @@
                 RT_FALL_THRU();
             case TMTIMERSTATE_EXPIRED_DELIVER:
-                if (tmTimerTryWithLink(pTimer, TMTIMERSTATE_PENDING_SCHEDULE_SET_EXPIRE, enmState))
+                if (tmTimerTryWithLink(pVM, pTimer, TMTIMERSTATE_PENDING_SCHEDULE_SET_EXPIRE, enmState))
                 {
                     Assert(!pTimer->offPrev);
@@ -1681 +1683 @@
                           pTimer, tmTimerState(enmState), R3STRING(pTimer->pszDesc), pTimer->u64Expire, cRetries));
                     TM_SET_STATE(pTimer, TMTIMERSTATE_PENDING_SCHEDULE);
-                    tmSchedule(pTimer);
+                    tmSchedule(pVM, pTimer);
                     rc = VINF_SUCCESS;
                     break;
@@ -1696 +1698 @@
                           pTimer, tmTimerState(enmState), R3STRING(pTimer->pszDesc), pTimer->u64Expire, cRetries));
                     TM_SET_STATE(pTimer, TMTIMERSTATE_PENDING_SCHEDULE);
-                    tmSchedule(pTimer);
+                    tmSchedule(pVM, pTimer);
                     rc = VINF_SUCCESS;
                     break;
@@ -1705 +1707 @@
 
             case TMTIMERSTATE_ACTIVE:
-                if (tmTimerTryWithLink(pTimer, TMTIMERSTATE_PENDING_RESCHEDULE_SET_EXPIRE, enmState))
+                if (tmTimerTryWithLink(pVM, pTimer, TMTIMERSTATE_PENDING_RESCHEDULE_SET_EXPIRE, enmState))
                 {
                     pTimer->u64Expire = cTicksToNext + tmTimerSetRelativeNowWorker(pVM, enmClock, pu64Now);
@@ -1711 +1713 @@
                           pTimer, tmTimerState(enmState), R3STRING(pTimer->pszDesc), pTimer->u64Expire, cRetries));
                     TM_SET_STATE(pTimer, TMTIMERSTATE_PENDING_RESCHEDULE);
-                    tmSchedule(pTimer);
+                    tmSchedule(pVM, pTimer);
                     rc = VINF_SUCCESS;
                     break;
@@ -1726 +1728 @@
                           pTimer, tmTimerState(enmState), R3STRING(pTimer->pszDesc), pTimer->u64Expire, cRetries));
                     TM_SET_STATE(pTimer, TMTIMERSTATE_PENDING_RESCHEDULE);
-                    tmSchedule(pTimer);
+                    tmSchedule(pVM, pTimer);
                     rc = VINF_SUCCESS;
                     break;
@@ -1792 +1794 @@
         TM_UNLOCK_TIMERS(pVM);
 
-    STAM_PROFILE_STOP(&pTimer->CTX_SUFF(pVM)->tm.s.CTX_SUFF_Z(StatTimerSetRelative), a);
+    STAM_PROFILE_STOP(&pVM->tm.s.CTX_SUFF_Z(StatTimerSetRelative), a);
     return rc;
 }
@@ -1834 +1836 @@
     PTMTIMER pTimer;
     TMTIMER_HANDLE_TO_PTR_RETURN(pVM, hTimer, pTimer);
-    TMTIMER_ASSERT_CRITSECT(pTimer);
+    TMTIMER_ASSERT_CRITSECT(pVM, pTimer);
 
     uint32_t const uHzOldHint = pTimer->uHzHint;
@@ -1938 +1940 @@
 
     STAM_PROFILE_START(&pVM->tm.s.CTX_SUFF_Z(StatTimerStop), a);
-    TMTIMER_ASSERT_CRITSECT(pTimer);
+    TMTIMER_ASSERT_CRITSECT(pVM, pTimer);
 
     /*
@@ -1975 +1977 @@
                 if (tmTimerTry(pTimer, TMTIMERSTATE_PENDING_STOP_SCHEDULE, enmState))
                 {
-                    tmSchedule(pTimer);
+                    tmSchedule(pVM, pTimer);
                     STAM_PROFILE_STOP(&pVM->tm.s.CTX_SUFF_Z(StatTimerStop), a);
                     return VINF_SUCCESS;
@@ -1984 +1986 @@
                 if (tmTimerTry(pTimer, TMTIMERSTATE_PENDING_STOP, enmState))
                 {
-                    tmSchedule(pTimer);
+                    tmSchedule(pVM, pTimer);
                     STAM_PROFILE_STOP(&pVM->tm.s.CTX_SUFF_Z(StatTimerStop), a);
                     return VINF_SUCCESS;
@@ -1991 +1993 @@
 
             case TMTIMERSTATE_ACTIVE:
-                if (tmTimerTryWithLink(pTimer, TMTIMERSTATE_PENDING_STOP, enmState))
+                if (tmTimerTryWithLink(pVM, pTimer, TMTIMERSTATE_PENDING_STOP, enmState))
                 {
-                    tmSchedule(pTimer);
+                    tmSchedule(pVM, pTimer);
                     STAM_PROFILE_STOP(&pVM->tm.s.CTX_SUFF_Z(StatTimerStop), a);
                     return VINF_SUCCESS;
@@ -2104 +2106 @@
     PTMTIMER pTimer;
     TMTIMER_HANDLE_TO_PTR_RETURN_EX(pVM, hTimer, UINT64_MAX, pTimer);
-    TMTIMER_ASSERT_CRITSECT(pTimer);
+    TMTIMER_ASSERT_CRITSECT(pVM, pTimer);
     int cRetries = 1000;
     do