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

Timestamp:

Jun 11, 2008 12:51:04 AM (17 years ago)

Author:

vboxsync

Message:

USE_NEW_OS_INTERFACE_FOR_GIP for NT (disabled).

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• Makefile.kmk (modified) (1 diff)
• SUPDRVShared.c (modified) (5 diffs)
• win/SUPDrv-win.cpp (modified) (11 diffs)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -130 +130 @@
 endif
 VBoxDrv_DEFS          = IN_RT_R0 IN_SUP_R0 USE_NEW_OS_INTERFACE_FOR_MM
+#USE_NEW_OS_INTERFACE_FOR_GIP
 ifdef VBOX_WITH_IDT_PATCHING
 VBoxDrv_DEFS         += VBOX_WITH_IDT_PATCHING

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

@@ -4009 +4009 @@
      * can be relied upon to have somewhat uniform TSC between the cpus.
      */
-# ifdef RT_OS_WINDOWS /** @todo fix RTMpGetCount() wrt to IRQL. */
-    if (supdrvOSGetCPUCount(pDevExt) > 1)
-# else
     if (RTMpGetCount() > 1)
-# endif
     {
         uint32_t uEAX, uEBX, uECX, uEDX;
@@ -4313 +4309 @@
         for (iCpu = 0; iCpu < cCpus; iCpu++)
         {
-            while (!RTCpuSetIsMember(&OnlineCpus, iCpuSet))
+            while (!RTCpuSetIsMemberByIndex(&OnlineCpus, iCpuSet))
+            {
                 iCpuSet++; /* skip offline CPU */
+                dprintf2(("skipping %d\n", iCpuSet));
+            }
             rc = RTMpOnSpecific(RTMpCpuIdFromSetIndex(iCpuSet), supdrvDetermineAsyncTscWorker, &s_aTsc[iSlot][iCpu], NULL);
             if (rc == VERR_NOT_SUPPORTED)
@@ -4325 +4324 @@
      * Check that the TSC reads are strictly ascending.
      */
+    /** @todo this doesn't work if a CPU is offline for some reason. */
     fBackwards = false;
     u64DiffMin = (uint64_t)~0;
@@ -4333 +4333 @@
         u64DiffMax = 0;
         if (u64Tsc0 <= u64TscLast)
+        {
+            dprintf2(("iSlot=%d u64Tsc0=%#x%#08x u64TscLast=%#x%#08x\n", iSlot,
+                      (long)(u64Tsc0 >> 32), (long)u64Tsc0, (long)(u64TscLast >> 32), (long)u64TscLast));
             fBackwards = true;
+        }
         u64TscLast = u64Tsc0;
         for (iCpu = 1; iCpu < cCpus; iCpu++)
@@ -4339 +4343 @@
             uint64_t u64TscN = s_aTsc[iSlot][iCpu];
             if (u64TscN <= u64TscLast)
+            {
+                dprintf2(("iSlot=%d iCpu=%d u64TscN=%#x%#08x u64TscLast=%#x%#08x\n", iSlot, iCpu,
+                          (long)(u64TscN >> 32), (long)u64TscN, (long)(u64TscLast >> 32), (long)u64TscLast));
                 fBackwards = true;
+            }
             u64TscLast = u64TscN;
 

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

@@ -79 +79 @@
 static NTSTATUS _stdcall   VBoxDrvNtNotSupportedStub(PDEVICE_OBJECT pDevObj, PIRP pIrp);
 static NTSTATUS            VBoxDrvNtErr2NtStatus(int rc);
+#ifndef USE_NEW_OS_INTERFACE_FOR_GIP
 static NTSTATUS            VBoxDrvNtGipInit(PSUPDRVDEVEXT pDevExt);
 static void                VBoxDrvNtGipTerm(PSUPDRVDEVEXT pDevExt);
 static void     _stdcall   VBoxDrvNtGipTimer(IN PKDPC pDpc, IN PVOID pvUser, IN PVOID SystemArgument1, IN PVOID SystemArgument2);
 static void     _stdcall   VBoxDrvNtGipPerCpuDpc(IN PKDPC pDpc, IN PVOID pvUser, IN PVOID SystemArgument1, IN PVOID SystemArgument2);
+#endif
 
 
@@ -129 +131 @@
                 PSUPDRVDEVEXT pDevExt = (PSUPDRVDEVEXT)pDevObj->DeviceExtension;
                 memset(pDevExt, 0, sizeof(*pDevExt));
-    
+
                 vrc = supdrvInitDevExt(pDevExt);
                 if (!vrc)
                 {
+#ifndef USE_NEW_OS_INTERFACE_FOR_GIP
                     /* Make sure the tsc is consistent across cpus/cores. */
                     uint64_t    u64DiffCores;
                     pDevExt->fForceAsyncTsc = supdrvDetermineAsyncTsc(&u64DiffCores);
                     dprintf(("supdrvDetermineAsyncTsc: fAsync=%d u64DiffCores=%u.\n", pDevExt->fForceAsyncTsc, (uint32_t)u64DiffCores));
-    
+
                     /*
                      * Inititalize the GIP.
@@ -143 +146 @@
                     rc = VBoxDrvNtGipInit(pDevExt);
                     if (NT_SUCCESS(rc))
+#endif
                     {
                         /*
@@ -157 +161 @@
                         return STATUS_SUCCESS;
                     }
+#ifndef USE_NEW_OS_INTERFACE_FOR_GIP
                     dprintf(("VBoxDrvNtGipInit failed with rc=%#x!\n", rc));
-    
+
                     supdrvDeleteDevExt(pDevExt);
+#endif
                 }
                 else
@@ -166 +172 @@
                     rc = VBoxDrvNtErr2NtStatus(vrc);
                 }
-    
+
                 IoDeleteSymbolicLink(&DosName);
                 RTR0Term();
             }
             else
-            {    
+            {
                 dprintf(("RTR0Init failed with vrc=%d!\n", vrc));
                 rc = VBoxDrvNtErr2NtStatus(vrc);
@@ -213 +219 @@
      * Terminate the GIP page and delete the device extension.
      */
+#ifndef USE_NEW_OS_INTERFACE_FOR_GIP
     VBoxDrvNtGipTerm(pDevExt);
+#endif
     supdrvDeleteDevExt(pDevExt);
     RTR0Term();
@@ -315 +323 @@
         int   rc;
 
-                /* Raise the IRQL to DISPATCH_LEVEl to prevent Windows from rescheduling us to another CPU/core. */ 
+                /* Raise the IRQL to DISPATCH_LEVEl to prevent Windows from rescheduling us to another CPU/core. */
         Assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
-        KeRaiseIrql(DISPATCH_LEVEL, &oldIrql);        
+        KeRaiseIrql(DISPATCH_LEVEL, &oldIrql);
         rc = supdrvIOCtlFast(ulCmd, pDevExt, pSession);
         KeLowerIrql(oldIrql);
@@ -478 +486 @@
 }
 
+#ifndef USE_NEW_OS_INTERFACE_FOR_GIP
+
 /**
  * Gets the monotone timestamp (nano seconds).
@@ -761 +771 @@
     KeCancelTimer(&pDevExt->GipTimer);
 #ifdef RT_ARCH_AMD64
-    ExSetTimerResolution(0, FALSE);
+    ExSetTimerResolution(0, FALSE); /* why did we (I?) do this? */
 #endif
 }
@@ -784 +794 @@
     return cCpus;
 }
+#endif /* ! USE_NEW_OS_INTERFACE_FOR_GIP */
 
 
@@ -791 +802 @@
 bool VBOXCALL  supdrvOSGetForcedAsyncTscMode(PSUPDRVDEVEXT pDevExt)
 {
+#ifdef USE_NEW_OS_INTERFACE_FOR_GIP
+    return false;
+#else
     return pDevExt->fForceAsyncTsc != 0;
+#endif
 }