Changeset 3627 in kBuild for trunk

Timestamp:

Oct 22, 2024 11:33:19 PM (6 months ago)

Author:

bird

Message:

kmk/winchildren.c: Skip the g_pfnSetThreadGroupAffinity stuff on windows 11 and later, just reset the g_pfnSetProcessDefaultCpuSetMasks and g_pfnSetThreadSelectedCpuSetMasks upon startup so the system is free to schedule things in whichever groups it thinks makes sense.

File:

• trunk/src/kmk/w32/winchildren.c (modified) (5 diffs)

trunk/src/kmk/w32/winchildren.c

@@ -357 +357 @@
 /** Kernel32!SetThreadGroupAffinity */
 static BOOL (WINAPI        *g_pfnSetThreadGroupAffinity)(HANDLE, CONST GROUP_AFFINITY *, GROUP_AFFINITY *);
+/** Kernel32!SetThreadSelectedCpuSetMasks (windows 11+).   */
+static BOOL (WINAPI        *g_pfnSetThreadSelectedCpuSetMasks)(HANDLE, PGROUP_AFFINITY, USHORT);
+/** Kernel32!SetProcessDefaultCpuSetMasks (windows 11+).   */
+static BOOL (WINAPI        *g_pfnSetProcessDefaultCpuSetMasks)(HANDLE, PGROUP_AFFINITY, USHORT);
 /** NTDLL!NtQueryInformationProcess */
 static NTSTATUS (NTAPI     *g_pfnNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG);
+
 /** Set if the windows host is 64-bit. */
 static BOOL                 g_f64BitHost = (K_ARCH_BITS == 64);
@@ -470 +475 @@
         *(FARPROC *)&g_pfnSetThreadGroupAffinity           = GetProcAddress(hmod, "SetThreadGroupAffinity");
         *(FARPROC *)&g_pfnGetLogicalProcessorInformationEx = GetProcAddress(hmod, "GetLogicalProcessorInformationEx");
-        /*(FARPROC *)&g_pfnGetSystemCpuSetInformation       = GetProcAddress(hmod, "GetSystemCpuSetInformation"); / * W10 */
-        /*(FARPROC *)&g_pfnSetThreadSelectedCpuSetMasks     = GetProcAddress(hmod, "SetThreadSelectedCpuSetMasks"); / * W11 */
+        *(FARPROC *)&g_pfnSetThreadSelectedCpuSetMasks      = GetProcAddress(hmod, "SetThreadSelectedCpuSetMasks"); /* W11 */
+        *(FARPROC *)&g_pfnSetProcessDefaultCpuSetMasks      = GetProcAddress(hmod, "SetProcessDefaultCpuSetMasks"); /* W11 */
         if (   g_pfnSetThreadGroupAffinity
             && g_pfnGetActiveProcessorCount
@@ -511 +516 @@
                     free(pInfo);
             }
+
+            /* Iff this is windows 11 or later, the default policy should be that
+               threads can be scheduled in any CPU group, so reset any prior crap
+               to make sure this remains the case for us and our children.
+
+               This means we can skip g_pfnSetThreadGroupAffinity the calls later. */
+            if (g_pfnSetProcessDefaultCpuSetMasks)
+                g_pfnSetProcessDefaultCpuSetMasks(GetCurrentProcess(), NULL, 0);
+            if (g_pfnSetThreadSelectedCpuSetMasks)
+                g_pfnSetThreadSelectedCpuSetMasks(GetCurrentThread(), NULL, 0);
 
             MkWinChildInitCpuGroupAllocator(&g_ProcessorGroupAllocator);
@@ -1376 +1391 @@
          */
 #ifdef MKWINCHILD_DO_SET_PROCESSOR_GROUP
-        if (g_cProcessorGroups > 1)
+        if (g_cProcessorGroups > 1 && !g_pfnSetProcessDefaultCpuSetMasks)
         {
             GROUP_AFFINITY Affinity = { 0, pWorker->iProcessorGroup, { 0, 0, 0 } };
@@ -2596 +2611 @@
      *       the correct active processor mask.
      */
-    if (g_cProcessorGroups > 1)
+    if (g_cProcessorGroups > 1 && !g_pfnSetProcessDefaultCpuSetMasks)
     {
         BOOL           fRet;