Changeset 23506 in vbox for trunk/src/VBox/Runtime/r0drv/nt

Timestamp:

Oct 2, 2009 11:12:21 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

53145

Message:

Use HalSendSoftwareInterrupt in Windows 7 (not exported in Vista)

Location:

trunk/src/VBox/Runtime/r0drv/nt

Files:

• initterm-r0drv-nt.cpp (modified) (4 diffs)
• internal-r0drv-nt.h (modified) (2 diffs)
• mp-r0drv-nt.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp

@@ -59 +59 @@
 /** HalRequestIpi, introduced in ??. */
 PFNHALREQUESTIPI            g_pfnrtNtHalRequestIpi;
+/** HalSendSoftwareInterrupt */
+PFNHALSENDSOFTWAREINTERRUPT g_pfnrtNtHalSendSoftwareInterrupt;
 /** SendIpi handler based on Windows version */
 PFNRTSENDIPI                g_pfnrtSendIpi;
@@ -88 +90 @@
     g_pfnrtNtKeFlushQueuedDpcs = NULL;
     g_pfnrtNtHalRequestIpi = NULL;
+    g_pfnrtNtHalSendSoftwareInterrupt = NULL;
 #else
     /*
@@ -101 +104 @@
     RtlInitUnicodeString(&RoutineName, L"HalRequestIpi");
     g_pfnrtNtHalRequestIpi = (PFNHALREQUESTIPI)MmGetSystemRoutineAddress(&RoutineName);
+
+    RtlInitUnicodeString(&RoutineName, L"HalSendSoftwareInterrupt");
+    g_pfnrtNtHalSendSoftwareInterrupt = (PFNHALSENDSOFTWAREINTERRUPT)MmGetSystemRoutineAddress(&RoutineName);
 #endif
 
@@ -113 +119 @@
     g_pfnrtSendIpi = rtMpSendIpiDummy;
 #ifndef IPRT_TARGET_NT4
-    if (g_pfnrtNtHalRequestIpi)
-    {
-        if (    MajorVersion == 6
-            &&  MinorVersion == 0)
-        {
-            /* Vista or Windows Server 2008 */
-            g_pfnrtSendIpi = rtMpSendIpiVista;
-        }
-        else
-        if (    MajorVersion == 6
-            &&  MinorVersion == 1)
-        {
-            /* Windows 7 or Windows Server 2008 R2 */
-            g_pfnrtSendIpi = rtMpSendIpiWin7;
-        }
-        /* Windows XP should send always send an IPI -> VERIFY */
-    }
+    if (    g_pfnrtNtHalRequestIpi
+        &&  MajorVersion == 6
+        &&  MinorVersion == 0)
+    {
+        /* Vista or Windows Server 2008 */
+        g_pfnrtSendIpi = rtMpSendIpiVista;
+    }
+    else
+    if (    g_pfnrtNtHalSendSoftwareInterrupt
+        &&  MajorVersion == 6
+        &&  MinorVersion == 1)
+    {
+        /* Windows 7 or Windows Server 2008 R2 */
+        g_pfnrtSendIpi = rtMpSendIpiWin7;
+    }
+    /* Windows XP should send always send an IPI -> VERIFY */
 #endif
     KIRQL OldIrql;

trunk/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h

@@ -42 +42 @@
 typedef VOID (__stdcall *PFNMYKEFLUSHQUEUEDDPCS)(VOID);
 typedef VOID (__stdcall *PFNHALREQUESTIPI)(KAFFINITY TargetSet);
+typedef VOID (__stdcall *PFNHALSENDSOFTWAREINTERRUPT)(ULONG ProcessorNumber, KIRQL Irql);
 typedef int (__stdcall *PFNRTSENDIPI)(RTCPUID idCpu);
 
@@ -52 +53 @@
 extern PFNMYKEFLUSHQUEUEDDPCS       g_pfnrtNtKeFlushQueuedDpcs;
 extern PFNHALREQUESTIPI             g_pfnrtNtHalRequestIpi;
+extern PFNHALSENDSOFTWAREINTERRUPT  g_pfnrtNtHalSendSoftwareInterrupt;
 extern PFNRTSENDIPI                 g_pfnrtSendIpi;
 extern uint32_t                     g_offrtNtPbQuantumEnd;

trunk/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp

@@ -357 +357 @@
 int rtMpSendIpiWin7(RTCPUID idCpu)
 {
-    return VERR_NOT_IMPLEMENTED;
-    /* bsod */
-    VOID (__stdcall *pfRequestIpi)(KAFFINITY Zero, KAFFINITY TargetSet) = (VOID (__stdcall *)(KAFFINITY, KAFFINITY))g_pfnrtNtHalRequestIpi;
-
-    pfRequestIpi(0, 1 << idCpu);
+    g_pfnrtNtHalSendSoftwareInterrupt(idCpu, DISPATCH_LEVEL);
     return VINF_SUCCESS;
 }