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

Timestamp:

Oct 13, 2016 5:17:20 PM (8 years ago)

Author:

vboxsync

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

111280

Message:

initterm-r0drv-nt.cpp: Reality update on MaximumProcessorCount.

File:

• trunk/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp (modified) (1 diff)

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

@@ -447 +447 @@
                 ProcNum.Reserved = 0;
                 ULONG idxCpu = g_pfnrtKeGetProcessorIndexFromNumber(&ProcNum);
-                MY_CHECK_BREAK(idxCpu != INVALID_PROCESSOR_INDEX,
-                               ("IPRT: Fatal: KeGetProcessorIndexFromNumber(%u/%u) failed\n", idxGroup, idxMember));
-                MY_CHECK_BREAK(idxCpu < g_cRtMpNtMaxCpus && idxCpu < RTCPUSET_MAX_CPUS,
-                               ("IPRT: Fatal: idxCpu=%u >= g_cRtMpNtMaxCpu=%u (RTCPUSET_MAX_CPUS=%u)\n",
-                                idxCpu, g_cRtMpNtMaxCpus, RTCPUSET_MAX_CPUS));
-                MY_CHECK_BREAK(idxCpu == idxCpuExpect, ("IPRT: Fatal: idxCpu=%u != idxCpuExpect=%u\n", idxCpu, idxCpuExpect));
-
-                ProcNum.Group    = UINT16_MAX;
-                ProcNum.Number   = UINT8_MAX;
-                ProcNum.Reserved = UINT8_MAX;
-                NTSTATUS rcNt = g_pfnrtKeGetProcessorNumberFromIndex(idxCpu, &ProcNum);
-                MY_CHECK_BREAK(NT_SUCCESS(rcNt), ("IPRT: Fatal: KeGetProcessorNumberFromIndex(%u,) -> %#x!\n", idxCpu, rcNt));
-                MY_CHECK_BREAK(ProcNum.Group == idxGroup && ProcNum.Number == idxMember,
-                               ("IPRT: Fatal: KeGetProcessorXxxxFromYyyy roundtrip error for %#x! Group: %u vs %u, Number: %u vs %u\n",
-                                idxCpu, ProcNum.Group, idxGroup, ProcNum.Number, idxMember));
-
-                if (pGrpInfo->ActiveProcessorMask & RT_BIT_64(idxMember))
-                    RTCpuSetAddByIndex(&g_rtMpNtCpuSet, idxCpu);
+                if (idxCpu != INVALID_PROCESSOR_INDEX)
+                {
+                    MY_CHECK_BREAK(idxCpu < g_cRtMpNtMaxCpus && idxCpu < RTCPUSET_MAX_CPUS,
+                                   ("IPRT: Fatal: idxCpu=%u >= g_cRtMpNtMaxCpu=%u (RTCPUSET_MAX_CPUS=%u)\n",
+                                    idxCpu, g_cRtMpNtMaxCpus, RTCPUSET_MAX_CPUS));
+                    MY_CHECK_BREAK(idxCpu == idxCpuExpect, ("IPRT: Fatal: idxCpu=%u != idxCpuExpect=%u\n", idxCpu, idxCpuExpect));
+
+                    ProcNum.Group    = UINT16_MAX;
+                    ProcNum.Number   = UINT8_MAX;
+                    ProcNum.Reserved = UINT8_MAX;
+                    NTSTATUS rcNt = g_pfnrtKeGetProcessorNumberFromIndex(idxCpu, &ProcNum);
+                    MY_CHECK_BREAK(NT_SUCCESS(rcNt), ("IPRT: Fatal: KeGetProcessorNumberFromIndex(%u,) -> %#x!\n", idxCpu, rcNt));
+                    MY_CHECK_BREAK(ProcNum.Group == idxGroup && ProcNum.Number == idxMember,
+                                   ("IPRT: Fatal: KeGetProcessorXxxxFromYyyy roundtrip error for %#x! Group: %u vs %u, Number: %u vs %u\n",
+                                    idxCpu, ProcNum.Group, idxGroup, ProcNum.Number, idxMember));
+
+                    if (pGrpInfo->ActiveProcessorMask & RT_BIT_64(idxMember))
+                        RTCpuSetAddByIndex(&g_rtMpNtCpuSet, idxCpu);
+                }
+                else
+                {
+                    /* W2K8 server gives me a max of 64 logical CPUs, even if the system only has 12,
+                       causing failures here.  Not yet sure how this would work with two CPU groups yet... */
+                    MY_CHECK_BREAK(   idxMember >= pGrpInfo->ActiveProcessorCount
+                                   && !(pGrpInfo->ActiveProcessorMask & RT_BIT_64(idxMember)),
+                                   ("IPRT: Fatal: KeGetProcessorIndexFromNumber(%u/%u) failed! cMax=%u cActive=%u\n",
+                                    idxGroup, idxMember, pGrpInfo->MaximumProcessorCount, pGrpInfo->ActiveProcessorCount));
+                }
             }
         }