Changeset 36262 in vbox for trunk/include/VBox

Timestamp:

Mar 11, 2011 2:50:45 PM (14 years ago)

Author:

vboxsync

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

70526

Message:

SUPDrv,IPRT,++: Enabled the code for supporting up to 256 host CPUs/cores/threads.

Location:

trunk/include/VBox

Files:

• sup.h (modified) (10 diffs)
• sup.mac (modified) (4 diffs)

trunk/include/VBox/sup.h

@@ -88 +88 @@
 } SUPPAGINGMODE;
 
-#ifdef SUP_WITH_LOTS_OF_CPUS
-# ifndef RT_WITH_LOTS_OF_CPUS
-#  error "RT_WITH_LOTS_OF_CPUS must be defined with SUP_WITH_LOTS_OF_CPUS"
-# endif
-#endif
 
 /**
@@ -147 +142 @@
 
     /** Reserved for future per processor data. */
-#ifdef SUP_WITH_LOTS_OF_CPUS
     volatile uint32_t   au32Reserved[5+5];
-#else
-    volatile uint32_t   au32Reserved[5];
-#endif
 
     /** @todo Add topology/NUMA info. */
-#ifdef SUP_WITH_LOTS_OF_CPUS
     /** The CPU state. */
     SUPGIPCPUSTATE volatile enmState;
@@ -163 +153 @@
     /** The APIC ID of this CPU. */
     uint16_t                idApic;
-#endif
 } SUPGIPCPU;
-#ifdef SUP_WITH_LOTS_OF_CPUS
 AssertCompileSize(RTCPUID, 4);
 AssertCompileSize(SUPGIPCPU, 128);
-#else
-AssertCompileSize(SUPGIPCPU, 96);
-#endif
 AssertCompileMemberAlignment(SUPGIPCPU, u64NanoTS, 8);
 AssertCompileMemberAlignment(SUPGIPCPU, u64TSC, 8);
@@ -179 +164 @@
 
 
-
-#ifndef SUP_WITH_LOTS_OF_CPUS
-/** The number of CPUs covered by the GIP.
- * @remarks Must be a power of two! */
-# define SUPGLOBALINFOPAGE_CPUS     32
-#endif
 
 /**
@@ -202 +181 @@
     /** The GIP update mode, see SUPGIPMODE. */
     uint32_t            u32Mode;
-#ifdef SUP_WITH_LOTS_OF_CPUS
     /** The number of entries in the CPU table.
      * (This can work as RTMpGetArraySize().)  */
@@ -208 +186 @@
     /** The size of the GIP in pages. */
     uint16_t            cPages;
-#else
-    /** Reserved / padding. */
-    uint32_t            u32Padding0;
-#endif
     /** The update frequency of the of the NanoTS. */
     volatile uint32_t   u32UpdateHz;
@@ -218 +192 @@
     /** The timestamp of the last time we update the update frequency. */
     volatile uint64_t   u64NanoTSLastUpdateHz;
-#ifdef SUP_WITH_LOTS_OF_CPUS
     /** The set of online CPUs. */
     RTCPUSET            OnlineCpuSet;
-    /** The number of CPUs that are online. */
-    volatile uint32_t   cOnlineCpus;
-    /** The number of CPUs present in the system. */
-    volatile uint32_t   cPresentCpus;
     /** 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;
+    /** The number of CPUs present in the system. */
+    volatile uint16_t   cPresentCpus;
     /** The highest number of CPUs possible. */
-    uint32_t            cPossibleCpus;
+    uint16_t            cPossibleCpus;
+    /** The highest number of CPUs possible. */
+    uint16_t            u16Padding0;
     /** The max CPU ID (RTMpGetMaxCpuId). */
     RTCPUID             idCpuMax;
-#endif
 
     /** Padding / reserved space for future data. */
-#ifdef SUP_WITH_LOTS_OF_CPUS
-    uint32_t            au32Padding1[28];
-#else
-    uint32_t            au32Padding1[56];
-#endif
-
-#ifdef SUP_WITH_LOTS_OF_CPUS
+    uint32_t            au32Padding1[29];
+
     /** Table indexed by the CPU APIC ID to get the CPU table index. */
-    uint16_t             aiCpuFromApicId[256];
+    uint16_t            aiCpuFromApicId[256];
     /** CPU set index to CPU table index. */
-    uint16_t             aiCpuFromCpuSetIdx[RTCPUSET_MAX_CPUS];
-#endif
-
-#ifdef SUP_WITH_LOTS_OF_CPUS
+    uint16_t            aiCpuFromCpuSetIdx[RTCPUSET_MAX_CPUS];
+
     /** Array of per-cpu data.
      * This is index by ApicId via the aiCpuFromApicId table.
@@ -257 +224 @@
      * entry is updated. */
     SUPGIPCPU           aCPUs[1];
-#else
-    /** Array of per-cpu data.
-     * If u32Mode == SUPGIPMODE_SYNC_TSC then only the first entry is used.
-     * If u32Mode == SUPGIPMODE_ASYNC_TSC then the CPU ACPI ID is used as an
-     * index into the array. */
-    SUPGIPCPU           aCPUs[SUPGLOBALINFOPAGE_CPUS];
-#endif
 } SUPGLOBALINFOPAGE;
-#ifndef SUP_WITH_LOTS_OF_CPUS
-AssertCompile(sizeof(SUPGLOBALINFOPAGE) <= 0x1000);
-#endif
-#ifdef SUP_WITH_LOTS_OF_CPUS
 AssertCompileMemberAlignment(SUPGLOBALINFOPAGE, u64NanoTSLastUpdateHz, 8);
 AssertCompileMemberAlignment(SUPGLOBALINFOPAGE, aCPUs[0], 256);
 AssertCompileMemberAlignment(SUPGLOBALINFOPAGE, aCPUs[1], 128);
-#endif
 
 /** Pointer to the global info page.
@@ -284 +239 @@
  * Upper 16 bits is the major version. Major version is only changed with
  * incompatible changes in the GIP. */
-#ifdef SUP_WITH_LOTS_OF_CPUS
-# define SUPGLOBALINFOPAGE_VERSION   0x00030000
-#else
-# define SUPGLOBALINFOPAGE_VERSION   0x00020000
-#endif
+#define SUPGLOBALINFOPAGE_VERSION   0x00030000
 
 /**
@@ -369 +320 @@
     else
     {
-# ifdef SUP_WITH_LOTS_OF_CPUS
         iCpu = pGip->aiCpuFromApicId[ASMGetApicId()];
         if (iCpu >= pGip->cCpus)
             return UINT64_MAX;
-# else
-        iCpu = ASMGetApicId();
-        if (RT_UNLIKELY(iCpu >= RT_ELEMENTS(pGip->aCPUs)))
-            return UINT64_MAX;
-# endif
     }
 

trunk/include/VBox/sup.mac

@@ -28 +28 @@
 %define ___VBox_sup_mac
 
-%ifndef SUP_WITH_LOTS_OF_CPUS
- %define SUPGLOBALINFOPAGE_CPUS 32
-%endif
-
 struc SUPGIPCPU
     .u32TransactionId           resd 1
@@ -42 +38 @@
     .au32TSCHistory             resd 8
     .u32PrevUpdateIntervalNS    resd 1
-%ifdef SUP_WITH_LOTS_OF_CPUS
     .au32Reserved               resd (5+5)
     .enmState                   resd 1
@@ -48 +43 @@
     .iCpuSet                    resw 1
     .idApic                     resw 1
-%else
-    .au32Reserved               resd 5
-%endif
 endstruc
 
@@ -58 +50 @@
     .u32Version                 resd 1
     .u32Mode                    resd 1
-%ifdef SUP_WITH_LOTS_OF_CPUS
     .cCpus                      resw 1
     .cPages                     resw 1
-%else
-    .u32Padding0                resd 1
-%endif
     .u32UpdateHz                resd 1
     .u32UpdateIntervalNS        resd 1
     .u64NanoTSLastUpdateHz      resq 1
-%ifdef SUP_WITH_LOTS_OF_CPUS
     .OnlineCpuSet               resq 4
-    .cOnlineCpus                resd 1
-    .cPresentCpus               resd 1
     .PresentCpuSet              resq 4
     .PossibleCpuSet             resq 4
-    .cPossibleCpus              resd 1
+    .cOnlineCpus                resw 1
+    .cPresentCpus               resw 1
+    .cPossibleCpus              resw 1
+    .u16Padding0                resw 1
     .idCpuMax                   resd 1
-    .au32Padding1               resd 28
+    .au32Padding1               resd 29
     .aiCpuFromApicId            resw 256
     .aiCpuFromCpuSetIdx         resw 256
     .aCPUs                      resb SUPGIPCPU_size
-%else
-    .au32Padding1               resd 56
-    .aCPUs                      resb (SUPGIPCPU_size*SUPGLOBALINFOPAGE_CPUS)
-%endif
 endstruc