Changeset 92872 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Dec 11, 2021 12:29:18 AM (3 years ago)

Author:

vboxsync

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

148819

Message:

IPRT/timer-r0drv-nt.cpp: Corrected the CPU parameter for rtMpNtSetTargetProcessorDpc in the fSpecificCpu case, we were passing the idCpu instead of the set index. Skip setting uNtStartTime and uNtDueTime when starting a one-shot timer. Skip dequeuing DPCs when stopping high-res timers that aren't targetting a specific CPU or are omni timers, as we don't be using any DPCs then.

File:

• trunk/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp

@@ -114 +114 @@
     uint64_t volatile       iMasterTick;
 #ifdef RTR0TIMER_NT_MANUAL_RE_ARM
-    /** The desired NT time of the first tick. */
+    /** The desired NT time of the first tick.
+     *  This is not set for one-shot timers, only periodic ones. */
     uint64_t volatile       uNtStartTime;
-    /** The current due time (absolute interrupt time). */
+    /** The current due time (absolute interrupt time).
+     *  This is not set for one-shot timers, only periodic ones.  */
     uint64_t volatile       uNtDueTime;
 #endif
@@ -611 +613 @@
     /* Update timer state: */
 #ifdef RTR0TIMER_NT_MANUAL_RE_ARM
-# ifdef RTR0TIMER_NT_HIGH_RES
-    uint64_t const uNtNow = pTimer->pHighResTimer ? rtTimerNtQueryInterruptTimeHighRes() : rtTimerNtQueryInterruptTime();
+    if (pTimer->u64NanoInterval > 0)
+    {
+#ifdef RTR0TIMER_NT_HIGH_RES
+        uint64_t const uNtNow = pTimer->pHighResTimer ? rtTimerNtQueryInterruptTimeHighRes() : rtTimerNtQueryInterruptTime();
 # else
-    uint64_t const uNtNow = rtTimerNtQueryInterruptTime();
+        uint64_t const uNtNow = rtTimerNtQueryInterruptTime();
 # endif
-    pTimer->uNtStartTime = uNtNow + -DueTime.QuadPart;
-#endif
-    ASMAtomicWriteS32(&pTimer->cOmniSuspendCountDown, 0);
+        pTimer->uNtStartTime  = uNtNow + -DueTime.QuadPart;
+        pTimer->uNtDueTime    = pTimer->uNtStartTime;
+    }
+#endif
+    pTimer->cOmniSuspendCountDown = 0;
     ASMAtomicWriteBool(&pTimer->fSuspended, false);
 
@@ -678 +684 @@
 #ifdef RTR0TIMER_NT_HIGH_RES
         if (pTimer->pHighResTimer)
+        {
             g_pfnrtExCancelTimer(pTimer->pHighResTimer, NULL);
+
+            /* We can skip the DPC stuff, unless this is an omni timer or for a specific CPU. */
+            if (!pTimer->fSpecificCpu && !pTimer->fOmniTimer)
+                return VINF_SUCCESS;
+        }
         else
 #endif
@@ -941 +953 @@
                 g_pfnrtKeSetImportanceDpc(&pTimer->aSubTimers[0].NtDpc, HighImportance);
             if (pTimer->fSpecificCpu)
-                rc = rtMpNtSetTargetProcessorDpc(&pTimer->aSubTimers[0].NtDpc, (int)pTimer->idCpu);
+                rc = rtMpNtSetTargetProcessorDpc(&pTimer->aSubTimers[0].NtDpc, fFlags & RTTIMER_FLAGS_CPU_MASK);
         }
         if (RT_SUCCESS(rc))