Changeset 8837 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

May 15, 2008 9:35:01 AM (17 years ago)

Author:

vboxsync

Message:

We are not allowed to execute KeQueryActiveProcessors at DPC_LEVEL, so we now assume it doesn't change during runtime.
Only Win2k8 appears to support hot-adding of CPUs.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDRV.h (modified) (2 diffs)
• SUPDRVShared.c (modified) (1 diff)
• linux/SUPDrv-linux.c (modified) (1 diff)
• win/SUPDrv-win.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDRV.h

@@ -711 +711 @@
     /** Flag to force async GIP timer mode. */
     BOOLEAN                 fForceAsyncTsc;
+    /** Current CPU affinity mask. */
+    KAFFINITY               uAffinityMask;
 #endif
 #ifdef RT_OS_LINUX
@@ -760 +762 @@
 void  VBOXCALL  supdrvOSGipResume(PSUPDRVDEVEXT pDevExt);
 void  VBOXCALL  supdrvOSGipSuspend(PSUPDRVDEVEXT pDevExt);
-unsigned VBOXCALL supdrvOSGetCPUCount(void);
+unsigned VBOXCALL supdrvOSGetCPUCount(PSUPDRVDEVEXT pDevExt);
 bool VBOXCALL   supdrvOSGetForcedAsyncTscMode(PSUPDRVDEVEXT pDevExt);
 #endif

trunk/src/VBox/HostDrivers/Support/SUPDRVShared.c

@@ -3916 +3916 @@
      * can be relied upon to have somewhat uniform TSC between the cpus.
      */
-    if (supdrvOSGetCPUCount() > 1)
+    if (supdrvOSGetCPUCount(pDevExt) > 1)
     {
         uint32_t uEAX, uEBX, uECX, uEDX;

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

@@ -1386 +1386 @@
  * @returns Number of cpus.
  */
-unsigned VBOXCALL supdrvOSGetCPUCount(void)
+unsigned VBOXCALL supdrvOSGetCPUCount(PSUPDRVDEVEXT pDevExt)
 {
 #ifdef CONFIG_SMP

trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp

@@ -537 +537 @@
                 }
 
+                /* Note: We need to register a callback handler for added cpus (only available in win2k8: KeRegisterProcessorChangeCallback) */
+                /* Note: We are not allowed to call KeQueryActiveProcessors at DPC_LEVEL, so we now assume cpu affinity mask does NOT change. */
+                pDevExt->uAffinityMask = KeQueryActiveProcessors();
+
                 dprintf(("VBoxDrvNtGipInit: ulClockFreq=%ld ulClockInterval=%ld ulClockIntervalActual=%ld Phys=%x%08x\n",
                          ulClockFreq, ulClockInterval, ulClockIntervalActual, Phys.HighPart, Phys.LowPart));
@@ -626 +630 @@
             KIRQL oldIrql;
 
-            /* KeQueryActiveProcessors must be executed at IRQL < DISPATCH_LEVEL */
-            Assert(KeGetCurrentIrql() < DISPATCH_LEVEL);
-            KAFFINITY Mask = KeQueryActiveProcessors();
+            KAFFINITY Mask = pDevExt->uAffinityMask;
 
             /* Raise the IRQL to DISPATCH_LEVEL so we can't be rescheduled to another cpu */
@@ -756 +758 @@
  * Get the current CPU count.
  * @returns Number of cpus.
- */
-unsigned VBOXCALL supdrvOSGetCPUCount(void)
-{
-    /* KeQueryActiveProcessors must be executed at IRQL < DISPATCH_LEVEL */
-    Assert(KeGetCurrentIrql() < DISPATCH_LEVEL);
-    KAFFINITY Mask = KeQueryActiveProcessors();
+ *
+ * @param   pDevExt     Instance data.
+ */
+unsigned VBOXCALL supdrvOSGetCPUCount(PSUPDRVDEVEXT pDevExt)
+{
+    KAFFINITY Mask = pDevExt->uAffinityMask;
     unsigned cCpus = 0;
     unsigned iBit;