vbox的更動 60771 路徑 trunk/src/VBox/Runtime

時間撮記:

2016-4-29 下午08:49:59 (9 年 以前)

作者:

vboxsync

訊息:

RTMpPoke/nt: Removed all the HalSendSoftwareInterrupt code, don't want to spend time trying to figure out why it doesn't work. Just use HalRequestIpi, then no 32/64 differences either.

位置:

trunk/src/VBox/Runtime/r0drv/nt

檔案:

• initterm-r0drv-nt.cpp (修改) (5 筆差異)
• internal-r0drv-nt.h (修改) (1 筆差異)
• mp-r0drv-nt.cpp (修改) (2 筆差異)

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

@@ -61 +61 @@
 /** HalRequestIpi, version valid up to windows vista?? */
 PFNHALREQUESTIPI_PRE_W7             g_pfnrtHalRequestIpiPreW7;
-/** HalSendSoftwareInterrupt, introduced in AMD64 version of W2K3. */
-PFNHALSENDSOFTWAREINTERRUPT         g_pfnrtNtHalSendSoftwareInterrupt;
 /** Worker for RTMpPokeCpu. */
 PFNRTSENDIPI                        g_pfnrtMpPokeCpuWorker;
@@ -227 +225 @@
     g_pfnrtHalRequestIpiW7Plus = NULL;
     g_pfnrtHalRequestIpiPreW7 = NULL;
-    g_pfnrtNtHalSendSoftwareInterrupt = NULL;
     g_pfnrtKeIpiGenericCall = NULL;
     g_pfnrtKeInitializeAffinityEx = NULL;
@@ -248 +245 @@
     g_pfnrtHalRequestIpiW7Plus = (PFNHALREQUESTIPI_W7PLUS)MmGetSystemRoutineAddress(&RoutineName);
     g_pfnrtHalRequestIpiPreW7 = (PFNHALREQUESTIPI_PRE_W7)g_pfnrtHalRequestIpiW7Plus;
-
-    RtlInitUnicodeString(&RoutineName, L"HalSendSoftwareInterrupt");
-    g_pfnrtNtHalSendSoftwareInterrupt = (PFNHALSENDSOFTWAREINTERRUPT)MmGetSystemRoutineAddress(&RoutineName);
 
     RtlInitUnicodeString(&RoutineName, L"KeIpiGenericCall");
@@ -412 +406 @@
      *
      * 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 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.
+     * so we have to use alternative methods.
+     *
+     * On AMD64 We used to use the HalSendSoftwareInterrupt API (also x86 on
+     * W10+), it looks faster and more convenient to use, however we're either
+     * using it wrong or it doesn't reliably do what we want (see @bugref{8343}).
+     *
+     * The HalRequestIpip API is thus far the only alternative to KeInsertQueueDpc
+     * for doing targetted IPIs.  Trouble with this API is that it changed
+     * fundamentally in Window 7 when they added support for lots of processors.
+     *
+     * If we really think we cannot use KeInsertQueueDpc, we use the broadcast IPI
+     * API KeIpiGenericCall.
      */
     if (   OsVerInfo.uMajorVer > 6
@@ -426 +427 @@
     g_pfnrtMpPokeCpuWorker = rtMpPokeCpuUsingDpc;
 #ifndef IPRT_TARGET_NT4
-# if 0 /* Currently disabled as we're checking whether it's responsible for @bugref{8343} (smp windows performance issue). */
-    if (g_pfnrtNtHalSendSoftwareInterrupt && true /* don't do this, SMP performance regression. */)
-    {
-        DbgPrint("IPRT: RTMpPoke => rtMpPokeCpuUsingHalSendSoftwareInterrupt\n");
-        g_pfnrtMpPokeCpuWorker = rtMpPokeCpuUsingHalSendSoftwareInterrupt;
-    }
-    else
-#endif
-         if (   g_pfnrtHalRequestIpiW7Plus
-             && g_pfnrtKeInitializeAffinityEx
-             && g_pfnrtKeAddProcessorAffinityEx
-             && g_pfnrtKeGetProcessorIndexFromNumber)
+    if (   g_pfnrtHalRequestIpiW7Plus
+        && g_pfnrtKeInitializeAffinityEx
+        && g_pfnrtKeAddProcessorAffinityEx
+        && g_pfnrtKeGetProcessorIndexFromNumber)
     {
         DbgPrint("IPRT: RTMpPoke => rtMpPokeCpuUsingHalReqestIpiW7Plus\n");

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

@@ -79 +79 @@
 int __stdcall rtMpPokeCpuUsingDpc(RTCPUID idCpu);
 int __stdcall rtMpPokeCpuUsingBroadcastIpi(RTCPUID idCpu);
-int __stdcall rtMpPokeCpuUsingHalSendSoftwareInterrupt(RTCPUID idCpu);
 int __stdcall rtMpPokeCpuUsingHalReqestIpiW7Plus(RTCPUID idCpu);
 int __stdcall rtMpPokeCpuUsingHalReqestIpiPreW7(RTCPUID idCpu);

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

@@ -738 +738 @@
 #ifndef IPRT_TARGET_NT4
             if (   !pArgs->fExecuting
-                && (   g_pfnrtMpPokeCpuWorker == rtMpPokeCpuUsingHalSendSoftwareInterrupt
-                    || g_pfnrtMpPokeCpuWorker == rtMpPokeCpuUsingHalReqestIpiW7Plus
+                && (   g_pfnrtMpPokeCpuWorker == rtMpPokeCpuUsingHalReqestIpiW7Plus
                     || g_pfnrtMpPokeCpuWorker == rtMpPokeCpuUsingHalReqestIpiPreW7))
                 RTMpPokeCpu(idCpu);
@@ -820 +819 @@
 
 /**
- * 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)
-{
-    g_pfnrtNtHalSendSoftwareInterrupt(idCpu, DISPATCH_LEVEL);
-    return VINF_SUCCESS;
-}
-
-
-/**
  * RTMpPokeCpu worker that uses the Windows 7 and later version of
  * HalRequestIpip to get the job done.