Changeset 1869 in vbox for trunk/src/VBox/HostDrivers/Support/linux

Timestamp:

Apr 2, 2007 11:12:09 PM (18 years ago)

Author:

vboxsync

Message:

Fixed wrong u64LastMonotime usage (the cause of all the trouble). Disable interrupts while updating GIP like on NT.

File:

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

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

@@ -1321 +1321 @@
     for (i = 0; i < RT_ELEMENTS(pDevExt->aCPUs); i++) 
     {
+        pDevExt->aCPUs[i].u64LastMonotime = pDevExt->u64LastMonotime;
+        pDevExt->aCPUs[i].ulLastJiffies   = pDevExt->ulLastJiffies;
+        pDevExt->aCPUs[i].iSmpProcessorId = -512;
         init_timer(&pDevExt->aCPUs[i].Timer);
-        pDevExt->aCPUs[i].Timer.data = (unsigned long)pDevExt;
-        pDevExt->aCPUs[i].Timer.function = VBoxSupGipTimerPerCpu;
-        pDevExt->aCPUs[i].Timer.expires = jiffies;
+        pDevExt->aCPUs[i].Timer.data      = i;
+        pDevExt->aCPUs[i].Timer.function  = VBoxSupGipTimerPerCpu;
+        pDevExt->aCPUs[i].Timer.expires   = jiffies;
     }
 #endif 
@@ -1390 +1393 @@
 static void     VBoxSupGipTimer(unsigned long ulUser)
 {
-    PSUPDRVDEVEXT pDevExt  = (PSUPDRVDEVEXT)ulUser;
-    PSUPGLOBALINFOPAGE pGip = pDevExt->pGip;
-    unsigned long ulNow    = jiffies;
-    unsigned long ulDiff   = ulNow - pDevExt->ulLastJiffies;
-    uint64_t u64Monotime;
+    PSUPDRVDEVEXT       pDevExt;
+    PSUPGLOBALINFOPAGE  pGip;
+    unsigned long       ulNow;
+    unsigned long       ulDiff;
+    uint64_t            u64Monotime;
+    unsigned long       SavedFlags;
+
+    local_irq_save(SavedFlags);
+
+    pDevExt = (PSUPDRVDEVEXT)ulUser;
+    pGip    = pDevExt->pGip;
+    ulNow   = jiffies;
+    ulDiff  = ulNow - pDevExt->ulLastJiffies;
+
     pDevExt->ulLastJiffies = ulNow;
 #ifdef TICK_NSEC
@@ -1405 +1417 @@
         supdrvGipUpdate(pDevExt->pGip, u64Monotime);
     mod_timer(&g_GipTimer, jiffies + (HZ <= 1000 ? 0 : ONE_MSEC_IN_JIFFIES));
+
+    local_irq_restore(SavedFlags);
 }
 
@@ -1412 +1426 @@
  * Timer callback function for the other CPUs.
  * 
- * @param   ulUser  The device extension pointer.
- */
-static void VBoxSupGipTimerPerCpu(unsigned long ulUser)
-{
-    PSUPDRVDEVEXT       pDevExt = (PSUPDRVDEVEXT)ulUser;
-    PSUPGLOBALINFOPAGE  pGip    = pDevExt->pGip;
-    unsigned long       ulNow   = jiffies;
-    unsigned long       ulDiff  = ulNow - pDevExt->ulLastJiffies;
+ * @param   iLnxCPU     The APIC ID of this timer.
+ */
+static void VBoxSupGipTimerPerCpu(unsigned long iLnxCPU)
+{
+    PSUPDRVDEVEXT       pDevExt;
+    PSUPGLOBALINFOPAGE  pGip;
+    uint8_t             iCPU;
     uint64_t            u64Monotime;
-    uint8_t             iCPU = ASMGetApicId();
-
-    if (RT_UNLIKELY(iCPU >= RT_ELEMENTS(pGip->aCPUs)))
-    {
-        printk("vboxdrv: error: apicid=%d max=%d cpuid=%d\n", 
+    unsigned long       SavedFlags;
+
+    local_irq_save(SavedFlags);
+
+    pDevExt = &g_DevExt;
+    pGip    = pDevExt->pGip;
+    iCPU    = ASMGetApicId();
+    
+    if (RT_LIKELY(iCPU < RT_ELEMENTS(pGip->aCPUs)))
+    {
+        if (RT_LIKELY(iCPU == iLnxCPU)) 
+        {
+            unsigned long   ulNow  = jiffies;
+            unsigned long   ulDiff = ulNow - pDevExt->aCPUs[iLnxCPU].ulLastJiffies;
+
+            pDevExt->aCPUs[iLnxCPU].ulLastJiffies = ulNow;
+#ifdef TICK_NSEC
+            u64Monotime = pDevExt->aCPUs[iCPU].u64LastMonotime + ulDiff * TICK_NSEC;
+#else
+            u64Monotime = pDevExt->aCPUs[iCPU].u64LastMonotime + ulDiff * (1000000 / HZ);
+#endif
+            ASMAtomicXchgU64(&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));
+        }
+        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);
+    }
+    else
+        printk("vboxdrv: error: APIC ID is bogus (GIP CPU update): apicid=%d max=%d cpuid=%d\n", 
                iCPU, RT_ELEMENTS(pGip->aCPUs), smp_processor_id());
-        return;
-    }
-
-    pDevExt->aCPUs[iCPU].ulLastJiffies = ulNow;
-#ifdef TICK_NSEC
-    u64Monotime = pDevExt->aCPUs[iCPU].u64LastMonotime + ulDiff * TICK_NSEC;
-#else
-    u64Monotime = pDevExt->aCPUs[iCPU].u64LastMonotime + ulDiff * (1000000 / HZ);
-#endif
-    ASMAtomicXchgU64(&pDevExt->aCPUs[iCPU].u64LastMonotime, u64Monotime);
-    if (RT_LIKELY(pGip))
-        supdrvGipUpdatePerCpu(pGip, pDevExt->aCPUs[iCPU].u64LastMonotime, iCPU);
-    mod_timer(&pDevExt->aCPUs[iCPU].Timer, jiffies + (HZ <= 1000 ? 0 : ONE_MSEC_IN_JIFFIES));
+
+    local_irq_restore(SavedFlags);
 }
 #endif  /* CONFIG_SMP */
@@ -1576 +1605 @@
     uint8_t iCPU = ASMGetApicId();
 
-
     if (RT_UNLIKELY(iCPU >= RT_ELEMENTS(pDevExt->pGip->aCPUs)))
     {
@@ -1584 +1612 @@
     }
 
+    pDevExt->aCPUs[iCPU].iSmpProcessorId = smp_processor_id();
     mod_timer(&pDevExt->aCPUs[iCPU].Timer, jiffies);
 }