Changeset 81096 in vbox

Timestamp:

Oct 1, 2019 7:29:03 PM (5 years ago)

Author:

vboxsync

Message:

IPRT,SUP,*: Increased RTCPUSET_MAX_CPUS to 1024 for AMD64, except for darwin, and reduced the OS/2 CPU count to 64. Implies GIP and SUPDrv version bump. bugref:9501

Location:

trunk

Files:

• include/VBox/sup.h (modified) (3 diffs)
• include/VBox/sup.mac (modified) (2 diffs)
• include/VBox/vmm/uvm.h (modified) (1 diff)
• include/iprt/types.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrvGip.cpp (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp (modified) (1 diff)
• src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/win/mp-win.cpp (modified) (3 diffs)

trunk/include/VBox/sup.h

@@ -467 +467 @@
     /** The TSC frequency of the system. */
     uint64_t            u64CpuHz;
-    /** The set of online CPUs. */
-    RTCPUSET            OnlineCpuSet;
-    /** The set of present CPUs. */
-    RTCPUSET            PresentCpuSet;
-    /** The set of possible CPUs. */
-    RTCPUSET            PossibleCpuSet;
     /** The number of CPUs that are online. */
     volatile uint16_t   cOnlineCpus;
@@ -490 +484 @@
     /** GIP flags, see SUPGIP_FLAGS_XXX. */
     volatile uint32_t   fFlags;
+    /** The set of online CPUs. */
+    RTCPUSET            OnlineCpuSet;
+#if RTCPUSET_MAX_CPUS < 1024
+    uint64_t            abOnlineCpuSetPadding[(1024 - RTCPUSET_MAX_CPUS) / 64];
+#endif
+    /** The set of present CPUs. */
+    RTCPUSET            PresentCpuSet;
+#if RTCPUSET_MAX_CPUS < 1024
+    uint64_t            abPresentCpuSetPadding[(1024 - RTCPUSET_MAX_CPUS) / 64];
+#endif
+    /** The set of possible CPUs. */
+    RTCPUSET            PossibleCpuSet;
+#if RTCPUSET_MAX_CPUS < 1024
+    uint64_t            abPossibleCpuSetPadding[(1024 - RTCPUSET_MAX_CPUS) / 64];
+#endif
 
     /** Padding / reserved space for future data. */
-    uint32_t            au32Padding1[24];
+    uint32_t            au32Padding1[48];
 
     /** Table indexed by the CPU APIC ID to get the CPU table index. */
@@ -514 +523 @@
 } SUPGLOBALINFOPAGE;
 AssertCompileMemberAlignment(SUPGLOBALINFOPAGE, u64NanoTSLastUpdateHz, 8);
-#if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+AssertCompileMemberAlignment(SUPGLOBALINFOPAGE, OnlineCpuSet, 64);
+AssertCompileMemberAlignment(SUPGLOBALINFOPAGE, PresentCpuSet, 64);
+AssertCompileMemberAlignment(SUPGLOBALINFOPAGE, PossibleCpuSet, 64);
+#if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64) /* ?? needed ?? */
 AssertCompileMemberAlignment(SUPGLOBALINFOPAGE, aCPUs, 32);
 #else
-AssertCompileMemberAlignment(SUPGLOBALINFOPAGE, aCPUs, 256);
+AssertCompileMemberAlignment(SUPGLOBALINFOPAGE, aCPUs, 128);
 #endif
 

trunk/include/VBox/sup.mac

@@ -76 +76 @@
     .u64NanoTSLastUpdateHz      resq 1
     .u64CpuHz                   resq 1
-    .OnlineCpuSet               resq 4
-    .PresentCpuSet              resq 4
-    .PossibleCpuSet             resq 4
     .cOnlineCpus                resw 1
     .cPresentCpus               resw 1
@@ -87 +84 @@
     .fGetGipCpu                 resd 1
     .fFlags                     resd 1
-    .au32Padding1               resd 24
+    .OnlineCpuSet               resq 16
+    .PresentCpuSet              resq 16
+    .PossibleCpuSet             resq 16
+    .au32Padding1               resd 48
     .aiCpuFromApicId            resw 1024
     .aiCpuFromCpuSetIdx         resw 1024

trunk/include/VBox/vmm/uvm.h

@@ -139 +139 @@
         struct STAMUSERPERVM    s;
 #endif
-        uint8_t                 padding[6880];
+        uint8_t                 padding[25056];
     } stam;
 

trunk/include/iprt/types.h

@@ -2393 +2393 @@
 /** The maximum number of CPUs a set can contain and IPRT is able
  * to reference. (Should be max of support arch/platforms.)
- * @remarks Must be a multiple of 64 (see RTCPUSET).  */
+ * @remarks Must be a power of two and multiple of 64 (see RTCPUSET).  */
 #if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
-# define RTCPUSET_MAX_CPUS      256
+# if defined(RT_OS_OS2)
+#  define RTCPUSET_MAX_CPUS     64
+# elif defined(RT_OS_DARWIN) || defined(RT_ARCH_X86)
+#  define RTCPUSET_MAX_CPUS     256
+# else
+#  define RTCPUSET_MAX_CPUS     1024
+# endif
 #elif defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
 # define RTCPUSET_MAX_CPUS      1024

trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp

@@ -1939 +1939 @@
      */
     cCpus = RTMpGetArraySize();
-    if (   cCpus > RTCPUSET_MAX_CPUS
-#if RTCPUSET_MAX_CPUS != 256
-        || cCpus > 256 /* ApicId is used for the mappings */
-#endif
-        )
-    {
-        SUPR0Printf("VBoxDrv: Too many CPUs (%u) for the GIP (max %u)\n", cCpus, RT_MIN(RTCPUSET_MAX_CPUS, 256));
+    if (cCpus > RT_MIN(RTCPUSET_MAX_CPUS, RT_ELEMENTS(pGip->aiCpuFromApicId)))
+    {
+        SUPR0Printf("VBoxDrv: Too many CPUs (%u) for the GIP (max %u)\n", cCpus, RT_MIN(RTCPUSET_MAX_CPUS, RT_ELEMENTS(pGip->aiCpuFromApicId)));
         return VERR_TOO_MANY_CPUS;
     }

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -223 +223 @@
  *          - Move SUP_IOCTL_FAST_DO_NOP and SUP_VMMR0_DO_NEM_RUN after NEM.
  */
-#define SUPDRV_IOC_VERSION                              0x002b0000
+#define SUPDRV_IOC_VERSION                              0x002c0000
 
 /** SUP_IOCTL_COOKIE. */

trunk/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp

@@ -131 +131 @@
                 SUPR3GipSetFlags(SUPGIP_FLAGS_TESTING_ENABLE, UINT32_MAX);
 
-            RTPrintf("tstGIP-2: u32Mode=%d (%s)  fTestMode=%RTbool  u32Version=%#x  fGetGipCpu=%#RX32\n",
+            RTPrintf("tstGIP-2: u32Mode=%d (%s)  fTestMode=%RTbool  u32Version=%#x  fGetGipCpu=%#RX32  cPages=%#RX32\n",
                      g_pSUPGlobalInfoPage->u32Mode,
                      SUPGetGIPModeName(g_pSUPGlobalInfoPage),
                      fTestMode,
                      g_pSUPGlobalInfoPage->u32Version,
-                     g_pSUPGlobalInfoPage->fGetGipCpu);
+                     g_pSUPGlobalInfoPage->fGetGipCpu,
+                     g_pSUPGlobalInfoPage->cPages);
             RTPrintf("tstGIP-2: cCpus=%d  cPossibleCpus=%d cPossibleCpuGroups=%d cPresentCpus=%d cOnlineCpus=%d idCpuMax=%#x\n",
                      g_pSUPGlobalInfoPage->cCpus,

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

@@ -104 +104 @@
 
 /** Static per group info.
- * @remarks  With RTCPUSET_MAX_CPUS as 256, this takes up 33KB. */
+ * @remarks  With 256 groups this takes up 33KB.  */
 static struct
 {
@@ -113 +113 @@
     /** CPU set indexes for each CPU in the group. */
     int16_t     aidxCpuSetMembers[64];
-}                                       g_aRtMpNtCpuGroups[RTCPUSET_MAX_CPUS];
+}                                       g_aRtMpNtCpuGroups[256];
 /** Maps CPU set indexes to RTCPUID.
  * Inactive CPUs has bit 31 set (RTMPNT_ID_F_INACTIVE) so we can identify them

trunk/src/VBox/Runtime/r3/win/mp-win.cpp

@@ -119 +119 @@
 static uint32_t volatile g_cRtMpWinActiveCpus;
 /** Static per group info.
- * @remarks  With RTCPUSET_MAX_CPUS as 256, this takes up 33KB.
+ * @remarks  With 256 entries this takes up 33KB.
  * @sa g_aRtMpNtCpuGroups */
 static struct
@@ -129 +129 @@
     /** CPU set indexes for each CPU in the group. */
     int16_t     aidxCpuSetMembers[64];
-}                   g_aRtMpWinCpuGroups[RTCPUSET_MAX_CPUS];
+}                   g_aRtMpWinCpuGroups[256];
 /** Maps CPU set indexes to RTCPUID.
  * @sa g_aidRtMpNtByCpuSetIdx  */
@@ -193 +193 @@
         SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX     Info;
         uint8_t                                     abPaddingG[  sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX)
-                                                               + sizeof(PROCESSOR_GROUP_INFO) * RTCPUSET_MAX_CPUS];
+                                                               + sizeof(PROCESSOR_GROUP_INFO) * 256];
         uint8_t                                     abPaddingC[  sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX)
                                                                +   (sizeof(PROCESSOR_RELATIONSHIP) + sizeof(GROUP_AFFINITY))