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

Timestamp:

Jan 3, 2015 5:57:05 AM (10 years ago)

Author:

vboxsync

Message:

IPRT/r0drv/nt: More RTMpPokeCpu work, this time for 32-bit windows 7 and later.

Location:

trunk/src/VBox/Runtime/r0drv/nt

Files:

• initterm-r0drv-nt.cpp (modified) (6 diffs)
• internal-r0drv-nt.h (modified) (4 diffs)
• mp-r0drv-nt.cpp (modified) (4 diffs)
• the-nt-kernel.h (modified) (2 diffs)

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

@@ -56 +56 @@
 /** KeFlushQueuedDpcs, introduced in XP. */
 PFNMYKEFLUSHQUEUEDDPCS              g_pfnrtNtKeFlushQueuedDpcs;
-/** HalRequestIpi, introduced in ??. */
-PFNHALREQUESTIPI                    g_pfnrtNtHalRequestIpi;
+/** HalRequestIpi, version introduced with windows 7. */
+PFNHALREQUESTIPI_W7PLUS             g_pfnrtHalRequestIpiW7Plus;
+/** HalRequestIpi, version valid up to windows vista?? */
+PFNHALREQUESTIPI_PRE_W7             g_pfnrtHalRequestIpiPreW7;
 /** HalSendSoftwareInterrupt, introduced in AMD64 version of W2K3. */
 PFNHALSENDSOFTWAREINTERRUPT         g_pfnrtNtHalSendSoftwareInterrupt;
@@ -64 +66 @@
 /** KeIpiGenericCall - Introduced in Windows Server 2003. */
 PFNRTKEIPIGENERICCALL               g_pfnrtKeIpiGenericCall;
+/** KeInitializeAffinityEx - Introducted in Windows 7. */
+PFNKEINITIALIZEAFFINITYEX           g_pfnrtKeInitializeAffinityEx;
+/** KeAddProcessorAffinityEx - Introducted in Windows 7. */
+PFNKEADDPROCESSORAFFINITYEX         g_pfnrtKeAddProcessorAffinityEx;
+/** KeGetProcessorIndexFromNumber - Introducted in Windows  7. */
+PFNKEGETPROCESSORINDEXFROMNUMBER    g_pfnrtKeGetProcessorIndexFromNumber;
 /** RtlGetVersion, introduced in ??. */
 PFNRTRTLGETVERSION                  g_pfnrtRtlGetVersion;
@@ -216 +224 @@
     g_pfnrtNtExSetTimerResolution = NULL;
     g_pfnrtNtKeFlushQueuedDpcs = NULL;
-    g_pfnrtNtHalRequestIpi = NULL;
+    g_pfnrtHalRequestIpiW7Plus = NULL;
+    g_pfnrtHalRequestIpiPreW7 = NULL;
     g_pfnrtNtHalSendSoftwareInterrupt = NULL;
     g_pfnrtKeIpiGenericCall = NULL;
+    g_pfnrtKeInitializeAffinityEx = NULL;
+    g_pfnrtKeAddProcessorAffinityEx = NULL;
+    g_pfnrtKeGetProcessorIndexFromNumber = NULL;
     g_pfnrtRtlGetVersion = NULL;
     g_pfnrtKeQueryInterruptTime = NULL;
@@ -233 +245 @@
 
     RtlInitUnicodeString(&RoutineName, L"HalRequestIpi");
-    g_pfnrtNtHalRequestIpi = (PFNHALREQUESTIPI)MmGetSystemRoutineAddress(&RoutineName);
+    g_pfnrtHalRequestIpiW7Plus = (PFNHALREQUESTIPI_W7PLUS)MmGetSystemRoutineAddress(&RoutineName);
+    g_pfnrtHalRequestIpiPreW7 = (PFNHALREQUESTIPI_PRE_W7)g_pfnrtHalRequestIpiW7Plus;
 
     RtlInitUnicodeString(&RoutineName, L"HalSendSoftwareInterrupt");
@@ -240 +253 @@
     RtlInitUnicodeString(&RoutineName, L"KeIpiGenericCall");
     g_pfnrtKeIpiGenericCall = (PFNRTKEIPIGENERICCALL)MmGetSystemRoutineAddress(&RoutineName);
+
+    RtlInitUnicodeString(&RoutineName, L"KeInitializeAffinityEx");
+    g_pfnrtKeInitializeAffinityEx = (PFNKEINITIALIZEAFFINITYEX)MmGetSystemRoutineAddress(&RoutineName);
+
+    RtlInitUnicodeString(&RoutineName, L"KeAddProcessorAffinityEx");
+    g_pfnrtKeAddProcessorAffinityEx = (PFNKEADDPROCESSORAFFINITYEX)MmGetSystemRoutineAddress(&RoutineName);
+
+    RtlInitUnicodeString(&RoutineName, L"KeGetProcessorIndexFromNumber");
+    g_pfnrtKeGetProcessorIndexFromNumber = (PFNKEGETPROCESSORINDEXFROMNUMBER)MmGetSystemRoutineAddress(&RoutineName);
 
     RtlInitUnicodeString(&RoutineName, L"RtlGetVersion");
@@ -388 +410 @@
      * Special IPI fun for RTMpPokeCpu.
      *
-     * On Vista and later the DPC fallback doesn't seem to reliably send IPIs,
+     * On Vista and later the DPC method doesn't seem to reliably send IPIs,
      * so we have to use alternative methods.  The NtHalSendSoftwareInterrupt
-     * is preferrable, but if that's not available we'll settle for broadcast
-     * IPIs.
-     */
+     * is preferrable, but it's AMD64 only.  The NalRequestIpip method changed
+     * in Windows 7 with the lots-of-processors-support, but it's the only
+     * targeted IPI game in town if we cannot use KeInsertQueueDpc.  Worst case
+     * we use broadcast IPIs.
+     */
+    if (   OsVerInfo.uMajorVer > 6
+        || (OsVerInfo.uMajorVer == 6 && OsVerInfo.uMinorVer > 0))
+        g_pfnrtHalRequestIpiPreW7 = NULL;
+    else
+        g_pfnrtHalRequestIpiW7Plus = NULL;
+
     g_pfnrtMpPokeCpuWorker = rtMpPokeCpuUsingDpc;
 #ifndef IPRT_TARGET_NT4
     if (g_pfnrtNtHalSendSoftwareInterrupt)
         g_pfnrtMpPokeCpuWorker = rtMpPokeCpuUsingHalSendSoftwareInterrupt;
+    else if (   g_pfnrtHalRequestIpiW7Plus
+             && g_pfnrtKeInitializeAffinityEx
+             && g_pfnrtKeAddProcessorAffinityEx
+             && g_pfnrtKeGetProcessorIndexFromNumber)
+        g_pfnrtMpPokeCpuWorker = rtMpPokeCpuUsingHalReqestIpiW7Plus;
     else if (OsVerInfo.uMajorVer >= 6 && g_pfnrtKeIpiGenericCall)
         g_pfnrtMpPokeCpuWorker = rtMpPokeCpuUsingBroadcastIpi;

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

@@ -29 +29 @@
 
 #include <iprt/cpuset.h>
+#include <iprt/nt/nt.h>
 
 RT_C_DECLS_BEGIN
@@ -37 +38 @@
 typedef ULONG (__stdcall *PFNMYEXSETTIMERRESOLUTION)(ULONG, BOOLEAN);
 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);
@@ -56 +56 @@
 extern PFNMYEXSETTIMERRESOLUTION        g_pfnrtNtExSetTimerResolution;
 extern PFNMYKEFLUSHQUEUEDDPCS           g_pfnrtNtKeFlushQueuedDpcs;
-extern PFNHALREQUESTIPI                 g_pfnrtNtHalRequestIpi;
+extern PFNHALREQUESTIPI_W7PLUS          g_pfnrtHalRequestIpiW7Plus;
+extern PFNHALREQUESTIPI_PRE_W7          g_pfnrtHalRequestIpiPreW7;
 extern PFNHALSENDSOFTWAREINTERRUPT      g_pfnrtNtHalSendSoftwareInterrupt;
 extern PFNRTSENDIPI                     g_pfnrtMpPokeCpuWorker;
 extern PFNRTKEIPIGENERICCALL            g_pfnrtKeIpiGenericCall;
+extern PFNKEINITIALIZEAFFINITYEX        g_pfnrtKeInitializeAffinityEx;
+extern PFNKEADDPROCESSORAFFINITYEX      g_pfnrtKeAddProcessorAffinityEx;
+extern PFNKEGETPROCESSORINDEXFROMNUMBER g_pfnrtKeGetProcessorIndexFromNumber;
+
 extern PFNRTRTLGETVERSION               g_pfnrtRtlGetVersion;
 #ifndef RT_ARCH_AMD64
@@ -75 +80 @@
 int rtMpPokeCpuUsingBroadcastIpi(RTCPUID idCpu);
 int rtMpPokeCpuUsingHalSendSoftwareInterrupt(RTCPUID idCpu);
+int rtMpPokeCpuUsingHalReqestIpiW7Plus(RTCPUID idCpu);
+int rtMpPokeCpuUsingHalReqestIpiPreW7(RTCPUID idCpu);
 
 RT_C_DECLS_END

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

@@ -454 +454 @@
 #ifndef IPRT_TARGET_NT4
 
+/** Callback used by rtMpPokeCpuUsingBroadcastIpi. */
 static ULONG_PTR __stdcall rtMpIpiGenericCall(ULONG_PTR Argument)
 {
@@ -461 +462 @@
 
 
+/**
+ * RTMpPokeCpu worker that uses broadcast IPIs for doing the work.
+ *
+ * @returns VINF_SUCCESS
+ * @param   idCpu           The CPU identifier.
+ */
 int rtMpPokeCpuUsingBroadcastIpi(RTCPUID idCpu)
 {
@@ -467 +474 @@
 }
 
-# if 0
-int rtMpSendIpiVista(RTCPUID idCpu)
-{
-    /* If we start care about Vista, we should investigate a non-broadcast API. */
-    g_pfnrtKeIpiGenericCall(rtMpIpiGenericCall, 0);
-////    g_pfnrtNtHalRequestIpi(1 << idCpu);
-    return VINF_SUCCESS;
-}
-# endif
-
-
+
+/**
+ * RTMpPokeCpu worker that uses HalSendSoftwareInterrupt to get the job done.
+ *
+ * This is only really available on AMD64, at least at the time of writing.
+ *
+ * @returns VINF_SUCCESS
+ * @param   idCpu           The CPU identifier.
+ */
 int rtMpPokeCpuUsingHalSendSoftwareInterrupt(RTCPUID idCpu)
 {
@@ -484 +489 @@
 }
 
-#endif /* IPRT_TARGET_NT4 */
+
+/**
+ * RTMpPokeCpu worker that uses the Windows 7 and later version of
+ * HalRequestIpip to get the job done.
+ *
+ * @returns VINF_SUCCESS
+ * @param   idCpu           The CPU identifier.
+ */
+int rtMpPokeCpuUsingHalReqestIpiW7Plus(RTCPUID idCpu)
+{
+    /*
+     * I think we'll let idCpu be an NT processor number and not a HAL processor
+     * index.  KeAddProcessorAffinityEx is for HAL and uses HAL processor
+     * indexes as input from what I can tell.
+     */
+    PROCESSOR_NUMBER ProcNumber = { /*Group=*/ idCpu / 64, /*Number=*/ idCpu % 64, /* Reserved=*/ 0};
+    KAFFINITY_EX     Target;
+    g_pfnrtKeInitializeAffinityEx(&Target);
+    g_pfnrtKeAddProcessorAffinityEx(&Target, g_pfnrtKeGetProcessorIndexFromNumber(&ProcNumber));
+
+    g_pfnrtHalRequestIpiW7Plus(0, &Target);
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * RTMpPokeCpu worker that uses the Vista and earlier version of HalRequestIpip
+ * to get the job done.
+ *
+ * @returns VINF_SUCCESS
+ * @param   idCpu           The CPU identifier.
+ */
+int rtMpPokeCpuUsingHalReqestIpiPreW7(RTCPUID idCpu)
+{
+    __debugbreak(); /** @todo this code needs testing!!  */
+    KAFFINITY Target = 1;
+    Target <<= idCpu;
+    g_pfnrtHalRequestIpiPreW7(Target);
+    return VINF_SUCCESS;
+}
+
+#endif /* !IPRT_TARGET_NT4 */
 
 

trunk/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h

@@ -41 +41 @@
 # pragma warning(disable : 4163)
 RT_C_DECLS_BEGIN
-# include <ntddk.h>
+# include <iprt/nt/nt.h>
 RT_C_DECLS_END
 # pragma warning(default : 4163)
@@ -50 +50 @@
 #else
 RT_C_DECLS_BEGIN
-# include <ntddk.h>
+# include <iprt/nt/nt.h>
 RT_C_DECLS_END
 #endif