Changeset 2373 in vbox for trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

Timestamp:

Apr 26, 2007 10:13:38 PM (18 years ago)

Author:

vboxsync

Message:

When in async mode we must update the aCPUs data everywhere since we don't know which CPU the operation will be resumed on.

File:

• trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (modified) (6 diffs)

trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c

@@ -1404 +1404 @@
     pGip    = pDevExt->pGip;
     ulNow   = jiffies;
-    ulDiff  = ulNow - pDevExt->ulLastJiffies;
-
-    pDevExt->ulLastJiffies = ulNow;
+
+#ifdef CONFIG_SMP
+    if (pGip && pGip->u32Mode == SUPGIPMODE_ASYNC_TSC) 
+    {
+        uint8_t iCPU = ASMGetApicId();
+        ulDiff = ulNow - pDevExt->aCPUs[iCPU].ulLastJiffies;
+        pDevExt->aCPUs[iCPU].ulLastJiffies = ulNow;
 #ifdef TICK_NSEC
-    u64Monotime = pDevExt->u64LastMonotime + ulDiff * TICK_NSEC;
+        u64Monotime = pDevExt->aCPUs[iCPU].u64LastMonotime + ulDiff * TICK_NSEC;
 #else
-    u64Monotime = pDevExt->u64LastMonotime + ulDiff * (1000000 / HZ);
-#endif
-    ASMAtomicXchgU64(&pDevExt->u64LastMonotime, u64Monotime);
+        u64Monotime = pDevExt->aCPUs[iCPU].u64LastMonotime + ulDiff * (1000000 / HZ);
+#endif
+        pDevExt->aCPUs[iCPU].u64LastMonotime = u64Monotime;
+    }
+    else
+#endif /* CONFIG_SMP */
+    {
+        ulDiff = ulNow - pDevExt->ulLastJiffies;
+        pDevExt->ulLastJiffies = ulNow;
+#ifdef TICK_NSEC
+        u64Monotime = pDevExt->u64LastMonotime + ulDiff * TICK_NSEC;
+#else
+        u64Monotime = pDevExt->u64LastMonotime + ulDiff * (1000000 / HZ);
+#endif
+        pDevExt->u64LastMonotime = u64Monotime;
+    }
     if (RT_LIKELY(pGip))
         supdrvGipUpdate(pDevExt->pGip, u64Monotime);
-    mod_timer(&g_GipTimer, jiffies + (HZ <= 1000 ? 0 : ONE_MSEC_IN_JIFFIES));
+    if (RT_LIKELY(!pDevExt->fGIPSuspended))
+        mod_timer(&g_GipTimer, ulNow + (HZ <= 1000 ? 0 : ONE_MSEC_IN_JIFFIES));
 
     local_irq_restore(SavedFlags);
@@ -1425 +1443 @@
  * Timer callback function for the other CPUs.
  * 
- * @param   iLnxCPU     The APIC ID of this timer.
- */
-static void VBoxSupGipTimerPerCpu(unsigned long iLnxCPU)
+ * @param   iTimerCPU     The APIC ID of this timer.
+ */
+static void VBoxSupGipTimerPerCpu(unsigned long iTimerCPU)
 {
     PSUPDRVDEVEXT       pDevExt;
@@ -1443 +1461 @@
     if (RT_LIKELY(iCPU < RT_ELEMENTS(pGip->aCPUs)))
     {
-        if (RT_LIKELY(iCPU == iLnxCPU)) 
+        if (RT_LIKELY(iTimerCPU == iCPU)) 
         {
             unsigned long   ulNow  = jiffies;
-            unsigned long   ulDiff = ulNow - pDevExt->aCPUs[iLnxCPU].ulLastJiffies;
-
-            pDevExt->aCPUs[iLnxCPU].ulLastJiffies = ulNow;
+            unsigned long   ulDiff = ulNow - pDevExt->aCPUs[iCPU].ulLastJiffies;
+            pDevExt->aCPUs[iCPU].ulLastJiffies = ulNow;
 #ifdef TICK_NSEC
             u64Monotime = pDevExt->aCPUs[iCPU].u64LastMonotime + ulDiff * TICK_NSEC;
@@ -1454 +1471 @@
             u64Monotime = pDevExt->aCPUs[iCPU].u64LastMonotime + ulDiff * (1000000 / HZ);
 #endif
-            ASMAtomicXchgU64(&pDevExt->aCPUs[iCPU].u64LastMonotime, u64Monotime);
+            pDevExt->aCPUs[iCPU].u64LastMonotime = u64Monotime;
             if (RT_LIKELY(pGip))
                 supdrvGipUpdatePerCpu(pGip, u64Monotime, iCPU);
-            mod_timer(&pDevExt->aCPUs[iCPU].Timer, jiffies + (HZ <= 1000 ? 0 : ONE_MSEC_IN_JIFFIES));
+            if (RT_LIKELY(!pDevExt->fGIPSuspended))
+                mod_timer(&pDevExt->aCPUs[iCPU].Timer, ulNow + (HZ <= 1000 ? 0 : ONE_MSEC_IN_JIFFIES));
         }
         else
-            printk("vboxdrv: error: GIP CPU update timer executing on the wrong CPU: apicid=%d != timer-apicid=%ld (cpuid=%d != timer-cpuid=%d)\n",
-                   iCPU, iLnxCPU, smp_processor_id(), pDevExt->aCPUs[iLnxCPU].iSmpProcessorId);
+            printk("vboxdrv: error: GIP CPU update timer executing on the wrong CPU: apicid=%d != timer-apicid=%ld (cpuid=%d !=? timer-cpuid=%d)\n",
+                   iCPU, iTimerCPU, smp_processor_id(), pDevExt->aCPUs[iTimerCPU].iSmpProcessorId);
     }
     else
@@ -1577 +1595 @@
 {
     dprintf2(("supdrvOSGipResume:\n"));
+    ASMAtomicXchgU8(&pDevExt->fGIPSuspended, false);
 #ifdef CONFIG_SMP
     if (pDevExt->pGip->u32Mode != SUPGIPMODE_ASYNC_TSC) 
@@ -1628 +1647 @@
 #endif 
     dprintf2(("supdrvOSGipSuspend:\n"));
+    ASMAtomicXchgU8(&pDevExt->fGIPSuspended, true);
 
     if (timer_pending(&g_GipTimer))