Changeset 19709 in vbox for trunk/src/VBox/VMM/VMMAll/TMAll.cpp

Timestamp:

May 14, 2009 5:59:34 PM (16 years ago)

Author:

vboxsync

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

47324

Message:

TM,EM: More TM/SMP work, still stuff in progress.

File:

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

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

@@ -80 +80 @@
 
 /**
- * Release EMT/TM lock.
+ * Release the EMT/TM lock.
  *
  * @param   pVM         The VM handle.
@@ -87 +87 @@
 {
     PDMCritSectLeave(&pVM->tm.s.EmtLock);
+}
+
+
+/**
+ * Try take the VirtualSync lock, wait in ring-3 return VERR_SEM_BUSY in R0/RC.
+ *
+ * @retval  VINF_SUCCESS on success (always in ring-3).
+ * @retval  VERR_SEM_BUSY in RC and R0 if the semaphore is busy.
+ *
+ * @param   pVM         The VM handle.
+ */
+int tmVirtualSyncLock(PVM pVM)
+{
+    VM_ASSERT_EMT(pVM);
+    int rc = PDMCritSectEnter(&pVM->tm.s.VirtualSyncLock, VERR_SEM_BUSY);
+    return rc;
+}
+
+
+/**
+ * Try take the VirtualSync lock, no waiting.
+ *
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_SEM_BUSY if busy.
+ *
+ * @param   pVM         The VM handle.
+ */
+int tmVirtualSyncTryLock(PVM pVM)
+{
+    VM_ASSERT_EMT(pVM);
+    int rc = PDMCritSectTryEnter(&pVM->tm.s.VirtualSyncLock);
+    return rc;
+}
+
+
+/**
+ * Release the VirtualSync lock.
+ *
+ * @param   pVM         The VM handle.
+ */
+void tmVirtualSyncUnlock(PVM pVM)
+{
+    PDMCritSectLeave(&pVM->tm.s.VirtualSyncLock);
 }
 
@@ -170 +213 @@
 
 /**
+ * Raise the timer force action flag and notify the dedicated timer EMT.
+ *
+ * @param   pVM         The VM handle.
+ */
+DECLINLINE(void) tmScheduleNotify(PVM pVM)
+{
+    PVMCPU pVCpuDst = &pVM->aCpus[pVM->tm.s.idTimerCpu];
+    if (!VMCPU_FF_ISSET(pVCpuDst, VMCPU_FF_TIMER))
+    {
+        Log5(("TMAll(%u): FF: 0 -> 1\n", __LINE__));
+        VMCPU_FF_SET(pVCpuDst, VMCPU_FF_TIMER);
+#ifdef IN_RING3
+        REMR3NotifyTimerPending(pVM, pVCpuDst);
+        VMR3NotifyCpuFFU(pVCpuDst->pUVCpu, VMNOTIFYFF_FLAGS_DONE_REM);
+#endif
+        STAM_COUNTER_INC(&pVM->tm.s.StatScheduleSetFF);
+    }
+}
+
+
+/**
  * Schedule the queue which was changed.
  */
@@ -178 +242 @@
         &&  RT_SUCCESS(tmTryLock(pVM)))
     {
-        STAM_PROFILE_START(&pVM->tm.s.CTXALLSUFF(StatScheduleOne), a);
-        PTMTIMERQUEUE pQueue = &pVM->tm.s.CTX_SUFF(paTimerQueues)[pTimer->enmClock];
+        STAM_PROFILE_START(&pVM->tm.s.CTX_SUFF_Z(StatScheduleOne), a);
         Log3(("tmSchedule: tmTimerQueueSchedule\n"));
-        tmTimerQueueSchedule(pVM, pQueue);
+        tmTimerQueueSchedule(pVM, &pVM->tm.s.CTX_SUFF(paTimerQueues)[pTimer->enmClock]);
 #ifdef VBOX_STRICT
         tmTimerQueuesSanityChecks(pVM, "tmSchedule");
@@ -190 +253 @@
     else
     {
-        /** @todo FIXME: don't use FF for scheduling! */
-        PVMCPU pVCpuDst = &pVM->aCpus[pVM->tm.s.idTimerCpu];
-        if (!VMCPU_FF_ISSET(pVCpuDst, VMCPU_FF_TIMER))  /**@todo only do this when arming the timer. */
-        {
-            Log5(("TMAll(%u): FF: 0 -> 1\n", __LINE__));
-            VMCPU_FF_SET(pVCpuDst, VMCPU_FF_TIMER);
-#ifdef IN_RING3
-            REMR3NotifyTimerPending(pVM, pVCpuDst);
-            VMR3NotifyCpuFFU(pVCpuDst->pUVCpu, VMNOTIFYFF_FLAGS_DONE_REM);
-#endif
-            STAM_COUNTER_INC(&pVM->tm.s.StatScheduleSetFF);
-        }
+        TMTIMERSTATE enmState = pTimer->enmState;
+        if (TMTIMERSTATE_IS_PENDING_SCHEDULING(enmState))
+            tmScheduleNotify(pVM);
     }
 }
@@ -231 +285 @@
  * @param   pQueue  The timer queue the timer belongs to.
  * @param   pTimer  The timer.
+ *
+ * @todo    FIXME: Look into potential race with the thread running the queues
+ *          and stuff.
  */
 DECLINLINE(void) tmTimerLink(PTMTIMERQUEUE pQueue, PTMTIMER pTimer)
@@ -307 +364 @@
      * Get current time and check the expire times of the two relevant queues.
      */
-    int             rc     = tmLock(pVM); /** @todo FIXME: Stop playing safe here... */
     const uint64_t  u64Now = TMVirtualGetNoCheck(pVM);
 
@@ -319 +375 @@
         STAM_COUNTER_INC(&pVM->tm.s.StatPollVirtual);
         LogFlow(("TMTimerPoll: expire1=%RU64 <= now=%RU64\n", u64Expire1, u64Now));
-#ifndef IN_RING3
-        if (RT_SUCCESS(rc))
-#endif
-            tmUnlock(pVM);
         Log5(("TMAll(%u): FF: %d -> 1\n", __LINE__, VMCPU_FF_ISPENDING(pVCpuDst, VMCPU_FF_TIMER)));
         VMCPU_FF_SET(pVCpuDst, VMCPU_FF_TIMER);
@@ -336 +388 @@
      * we have to adjust the 'now' but when have to adjust the delta as well.
      */
+    int            rc         = tmVirtualSyncLock(pVM); /** @todo FIXME: Stop playing safe here... */
     const uint64_t u64Expire2 = pVM->tm.s.CTX_SUFF(paTimerQueues)[TMCLOCK_VIRTUAL_SYNC].u64Expire;
     uint64_t u64VirtualSyncNow;
@@ -375 +428 @@
         if (RT_SUCCESS(rc))
 #endif
-            tmUnlock(pVM);
+            tmVirtualSyncUnlock(pVM);
         LogFlow(("TMTimerPoll: expire2=%RU64 <= now=%RU64\n", u64Expire2, u64Now));
         return pVCpu == pVCpuDst ? 0 : s_u64OtherRet;
@@ -389 +442 @@
     if (RT_SUCCESS(rc))
 #endif
-        tmUnlock(pVM);
+        tmVirtualSyncUnlock(pVM);
     return RT_MIN(i64Delta1, i64Delta2);
 }
@@ -438 +491 @@
     }
 
-    int rc = tmLock(pVM); /** @todo FIXME: Stop playin safe... */
-
     /*
      * Check for TMCLOCK_VIRTUAL expiration.
@@ -453 +504 @@
         REMR3NotifyTimerPending(pVM, pVCpuDst);
 #endif
-#ifndef IN_RING3
-        if (RT_SUCCESS(rc))
-#endif
-            tmUnlock(pVM);
         LogFlow(("TMTimerPoll: expire1=%RU64 <= now=%RU64\n", u64Expire1, u64Now));
         if (pVCpuDst == pVCpu)
@@ -472 +519 @@
      * we have to adjust the 'now' but when have to adjust the delta as well.
      */
+    int rc = tmVirtualSyncLock(pVM); /** @todo FIXME: Stop playin safe... */
+
     const uint64_t  u64Expire2 = pVM->tm.s.CTX_SUFF(paTimerQueues)[TMCLOCK_VIRTUAL_SYNC].u64Expire;
     uint64_t        u64VirtualSyncNow;
@@ -512 +561 @@
         if (RT_SUCCESS(rc))
 #endif
-            tmUnlock(pVM);
+            tmVirtualSyncUnlock(pVM);
         LogFlow(("TMTimerPoll: expire2=%RU64 <= now=%RU64\n", u64Expire2, u64Now));
         if (pVCpuDst == pVCpu)
@@ -552 +601 @@
     if (RT_SUCCESS(rc))
 #endif
-        tmUnlock(pVM);
+        tmVirtualSyncUnlock(pVM);
     return u64GipTime;
 }