Changeset 27194 in vbox for trunk/src

Timestamp:

Mar 9, 2010 9:13:35 AM (15 years ago)

Author:

vboxsync

Message:

r0drv/linux/timer: adapt to Linux kernels >= 2.6.31 where mod_timer() does not pin the timer to the current CPU core anymore

File:

• trunk/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c (modified) (9 diffs)

trunk/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c

@@ -59 +59 @@
  && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28)
 # error "RT_USE_LINUX_HRTIMER requires 2.6.28 or later, sorry."
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
+# define mod_timer_pinned       mod_timer
 #endif
 
@@ -266 +270 @@
  * @param   u64Now      The current timestamp (RTTimeNanoTS()).
  * @param   u64First    The interval from u64Now to the first time the timer should fire.
- */
-static void rtTimerLnxStartSubTimer(PRTTIMERLNXSUBTIMER pSubTimer, uint64_t u64Now, uint64_t u64First)
+ * @param   fPinned     true = timer pinned to a specific CPU,
+ *                      false = timer can migrate between CPUs
+ */
+static void rtTimerLnxStartSubTimer(PRTTIMERLNXSUBTIMER pSubTimer, uint64_t u64Now, uint64_t u64First, bool fPinned)
 {
     /*
@@ -286 +292 @@
         unsigned long cJiffies = !u64First ? 0 : rtTimerLnxNanoToJiffies(u64First);
         pSubTimer->ulNextJiffies = jiffies + cJiffies;
-        mod_timer(&pSubTimer->LnxTimer, pSubTimer->ulNextJiffies);
+        if (fPinned)
+            mod_timer_pinned(&pSubTimer->LnxTimer, pSubTimer->ulNextJiffies);
+        else
+            mod_timer(&pSubTimer->LnxTimer, pSubTimer->ulNextJiffies);
     }
 #endif
@@ -412 +421 @@
         }
 
-        mod_timer(&pSubTimer->LnxTimer, pSubTimer->ulNextJiffies);
+        if (pTimer->fSpecificCpu || pTimer->fAllCpus)
+            mod_timer_pinned(&pSubTimer->LnxTimer, pSubTimer->ulNextJiffies);
+        else
+            mod_timer(&pSubTimer->LnxTimer, pSubTimer->ulNextJiffies);
 #endif
 
@@ -441 +453 @@
     PRTTIMER pTimer = (PRTTIMER)pvUser1;
     Assert(idCpu < pTimer->cCpus);
-    rtTimerLnxStartSubTimer(&pTimer->aSubTimers[idCpu], pArgs->u64Now, pArgs->u64First);
+    rtTimerLnxStartSubTimer(&pTimer->aSubTimers[idCpu], pArgs->u64Now, pArgs->u64First, true /*fPinned*/);
 }
 
@@ -593 +605 @@
             PRTTIMERLNXSUBTIMER pSubTimer = &pTimer->aSubTimers[idCpu];
             if (rtTimerLnxCmpXchgState(&pSubTimer->enmState, RTTIMERLNXSTATE_MP_STARTING, RTTIMERLNXSTATE_STOPPED))
-                rtTimerLnxStartSubTimer(pSubTimer, pArgs->u64Now, pArgs->u64First);
+                rtTimerLnxStartSubTimer(pSubTimer, pArgs->u64Now, pArgs->u64First, true /*fPinned*/);
         }
 
@@ -646 +658 @@
 
                     if (RTMpCpuId() == idCpu)
-                        rtTimerLnxStartSubTimer(pSubTimer, Args.u64Now, Args.u64First);
+                        rtTimerLnxStartSubTimer(pSubTimer, Args.u64Now, Args.u64First, true /*fPinned*/);
                     else
                     {
@@ -694 +706 @@
     PRTTIMERLINUXSTARTONCPUARGS pArgs = (PRTTIMERLINUXSTARTONCPUARGS)pvUser2;
     PRTTIMER pTimer = (PRTTIMER)pvUser1;
-    rtTimerLnxStartSubTimer(&pTimer->aSubTimers[0], pArgs->u64Now, pArgs->u64First);
+    rtTimerLnxStartSubTimer(&pTimer->aSubTimers[0], pArgs->u64Now, pArgs->u64First, true /*fPinned*/);
 }
 
@@ -728 +740 @@
     ASMAtomicWriteBool(&pTimer->fSuspended, false);
     if (!pTimer->fSpecificCpu)
-        rtTimerLnxStartSubTimer(&pTimer->aSubTimers[0], Args.u64Now, Args.u64First);
+        rtTimerLnxStartSubTimer(&pTimer->aSubTimers[0], Args.u64Now, Args.u64First, false /*fPinned*/);
     else
     {