Changeset 81106 in vbox for trunk/src/VBox/HostDrivers/Support/win

Timestamp:

Oct 3, 2019 9:23:00 PM (5 years ago)

Author:

vboxsync

Message:

IPRT,SUP,*: Some GIP related fixes for supporting APIC IDs over 256 and more than 256 CPUs. bugref:9501

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp

@@ -1762 +1762 @@
     for (uint32_t idxGroup = 0; idxGroup < cGroups; idxGroup++)
     {
-        uint32_t cActive  = 0;
-        uint32_t cMax     = RTMpGetCpuGroupCounts(idxGroup, &cActive);
-        uint32_t cbNeeded = RT_UOFFSETOF_DYN(SUPGIPCPUGROUP, aiCpuSetIdxs[cMax]);
+        uint32_t        cActive  = 0;
+        uint32_t  const cMax     = RTMpGetCpuGroupCounts(idxGroup, &cActive);
+        uint32_t  const cbNeeded = RT_UOFFSETOF_DYN(SUPGIPCPUGROUP, aiCpuSetIdxs[cMax]);
+        uintptr_t const offGroup = (uintptr_t)pGroup - (uintptr_t)pGip;
         AssertReturn(cbNeeded <= cbGipCpuGroups, VERR_INTERNAL_ERROR_3);
         AssertReturn(cActive <= cMax, VERR_INTERNAL_ERROR_4);
-
-        pGip->aoffCpuGroup[idxGroup] = (uint16_t)((uintptr_t)pGroup - (uintptr_t)pGip);
+        AssertReturn(offGroup == (uint32_t)offGroup, VERR_INTERNAL_ERROR_5);
+
+        pGip->aoffCpuGroup[idxGroup] = offGroup;
         pGroup->cMembers    = cActive;
         pGroup->cMaxMembers = cMax;
@@ -1813 +1815 @@
      */
     for (uint32_t idxGroup = 0; idxGroup < pGip->cPossibleCpuGroups; idxGroup++)
-        if (pGip->aoffCpuGroup[idxGroup] != UINT16_MAX)
-        {
-            PSUPGIPCPUGROUP pGroup = (PSUPGIPCPUGROUP)((uintptr_t)pGip + pGip->aoffCpuGroup[idxGroup]);
-
-            uint32_t cActive  = 0;
-            uint32_t cMax     = RTMpGetCpuGroupCounts(idxGroup, &cActive);
+    {
+        uint32_t offGroup = pGip->aoffCpuGroup[idxGroup];
+        if (offGroup != UINT32_MAX)
+        {
+            PSUPGIPCPUGROUP pGroup   = (PSUPGIPCPUGROUP)((uintptr_t)pGip + offGroup);
+            uint32_t        cActive  = 0;
+            uint32_t        cMax     = RTMpGetCpuGroupCounts(idxGroup, &cActive);
+
             AssertStmt(cMax == pGroup->cMaxMembers, cMax = pGroup->cMaxMembers);
             AssertStmt(cActive <= cMax, cActive = cMax);
             if (pGroup->cMembers != cActive)
-                pGroup->cMembers = cActive;
+                ASMAtomicWriteU16(&pGroup->cMembers, cActive);
 
             for (uint32_t idxMember = 0; idxMember < cMax; idxMember++)
@@ -1831 +1835 @@
 
                 if (pGroup->aiCpuSetIdxs[idxMember] != idxCpuSet)
-                    pGroup->aiCpuSetIdxs[idxMember] = idxCpuSet;
-            }
-        }
+                    ASMAtomicWriteS16(&pGroup->aiCpuSetIdxs[idxMember], idxCpuSet);
+            }
+        }
+    }
 }