Changeset 36262 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (14 diffs)
• SUPDrvIOC.h (modified) (1 diff)
• SUPLib.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -3216 +3216 @@
 {
     PSUPGLOBALINFOPAGE  pGip = (PSUPGLOBALINFOPAGE)pvUser1;
-#ifdef SUP_WITH_LOTS_OF_CPUS
     unsigned            iCpu = pGip->aiCpuFromApicId[ASMGetApicId()];
-#else
-    unsigned            iCpu = ASMGetApicId();
-#endif
-
-#ifdef SUP_WITH_LOTS_OF_CPUS
+
     if (RT_LIKELY(iCpu < pGip->cCpus && pGip->aCPUs[iCpu].idCpu == idCpu))
-#else
-    if (RT_LIKELY(iCpu < RT_ELEMENTS(pGip->aCPUs)))
-#endif
         supdrvGipReInitCpu(&pGip->aCPUs[iCpu], *(uint64_t *)pvUser2);
 
@@ -4837 +4829 @@
      */
     cCpus = RTMpGetArraySize();
-#ifdef SUP_WITH_LOTS_OF_CPUS
     if (   cCpus > RTCPUSET_MAX_CPUS
-        || cCpus > 256 /*uint8_t is used for the mappings*/)
-#else
-    if (cCpus > RT_ELEMENTS(pGip->aCPUs))
-#endif
-    {
-#ifdef SUP_WITH_LOTS_OF_CPUS
+        || cCpus > 256 /*ApicId is used for the mappings*/)
+    {
         SUPR0Printf("VBoxDrv: Too many CPUs (%u) for the GIP (max %u)\n", cCpus, RT_MIN(RTCPUSET_MAX_CPUS, 256));
-#else
-        SUPR0Printf("VBoxDrv: Too many CPUs (%u) for the GIP (max %u)\n", cCpus, RT_MIN(RT_ELEMENTS(pGip->aCPUs), 256));
-#endif
         return VERR_TOO_MANY_CPUS;
     }
@@ -4855 +4839 @@
      * Allocate a contiguous set of pages with a default kernel mapping.
      */
-#ifdef SUP_WITH_LOTS_OF_CPUS
     rc = RTR0MemObjAllocCont(&pDevExt->GipMemObj, RT_UOFFSETOF(SUPGLOBALINFOPAGE, aCPUs[cCpus]), false /*fExecutable*/);
-#else
-    cCpus = RT_ELEMENTS(pGip->aCPUs);
-    rc = RTR0MemObjAllocLow(&pDevExt->GipMemObj, PAGE_SIZE, false /*fExecutable*/);
-#endif
     if (RT_FAILURE(rc))
     {
@@ -5028 +5007 @@
 static void supdrvGipMpEventOnline(PSUPGLOBALINFOPAGE pGip, RTCPUID idCpu)
 {
-#ifdef SUP_WITH_LOTS_OF_CPUS
     int         iCpuSet;
     uint8_t     idApic;
@@ -5039 +5017 @@
      * Update the globals.
      */
-    ASMAtomicWriteU32(&pGip->cPresentCpus,  RTMpGetPresentCount());
-    ASMAtomicWriteU32(&pGip->cOnlineCpus,   RTMpGetOnlineCount());
+    ASMAtomicWriteU16(&pGip->cPresentCpus,  RTMpGetPresentCount());
+    ASMAtomicWriteU16(&pGip->cOnlineCpus,   RTMpGetOnlineCount());
     iCpuSet = RTMpCpuIdToSetIndex(idCpu);
     if (iCpuSet >= 0)
@@ -5082 +5060 @@
     ASMAtomicWriteU16(&pGip->aiCpuFromApicId[idApic],     i);
     ASMAtomicWriteU16(&pGip->aiCpuFromCpuSetIdx[iCpuSet], i);
-#endif
 }
 
@@ -5096 +5073 @@
 static void supdrvGipMpEventOffline(PSUPGLOBALINFOPAGE pGip, RTCPUID idCpu)
 {
-#ifdef SUP_WITH_LOTS_OF_CPUS
     int         iCpuSet;
     unsigned    i;
@@ -5110 +5086 @@
     ASMAtomicWriteSize(&pGip->aCPUs[i].enmState, SUPGIPCPUSTATE_OFFLINE);
     RTCpuSetDelByIndex(&pGip->OnlineCpuSet, iCpuSet);
-#endif
 }
 
@@ -5366 +5341 @@
     pGip->u32Version            = SUPGLOBALINFOPAGE_VERSION;
     pGip->u32Mode               = supdrvGipDeterminTscMode(pDevExt);
-#ifdef SUP_WITH_LOTS_OF_CPUS
     pGip->cCpus                 = (uint16_t)cCpus;
     pGip->cPages                = (uint16_t)(cbGip / PAGE_SIZE);
-#endif
     pGip->u32UpdateHz           = uUpdateHz;
     pGip->u32UpdateIntervalNS   = 1000000000 / uUpdateHz;
     pGip->u64NanoTSLastUpdateHz = u64NanoTS;
-#ifdef SUP_WITH_LOTS_OF_CPUS
     RTCpuSetEmpty(&pGip->OnlineCpuSet);
+    RTCpuSetEmpty(&pGip->PresentCpuSet);
+    RTMpGetSet(&pGip->PossibleCpuSet);
     pGip->cOnlineCpus           = RTMpGetOnlineCount();
     pGip->cPresentCpus          = RTMpGetPresentCount();
-    RTCpuSetEmpty(&pGip->PresentCpuSet);
-    RTMpGetSet(&pGip->PossibleCpuSet);
     pGip->cPossibleCpus         = RTMpGetCount();
     pGip->idCpuMax              = RTMpGetMaxCpuId();
@@ -5385 +5357 @@
     for (i = 0; i < RT_ELEMENTS(pGip->aiCpuFromCpuSetIdx); i++)
         pGip->aiCpuFromCpuSetIdx[i] = UINT16_MAX;
-#endif
 
     for (i = 0; i < cCpus; i++)
@@ -5393 +5364 @@
         pGip->aCPUs[i].u64TSC            = ASMReadTSC();
 
-#ifdef SUP_WITH_LOTS_OF_CPUS
         pGip->aCPUs[i].enmState          = SUPGIPCPUSTATE_INVALID;
         pGip->aCPUs[i].idCpu             = NIL_RTCPUID;
         pGip->aCPUs[i].iCpuSet           = -1;
         pGip->aCPUs[i].idApic            = UINT8_MAX;
-#endif
 
         /*
@@ -5592 +5561 @@
     else
     {
-#ifdef SUP_WITH_LOTS_OF_CPUS
         unsigned iCpu = pGip->aiCpuFromApicId[ASMGetApicId()];
         if (RT_UNLIKELY(iCpu >= pGip->cCpus))
@@ -5599 +5567 @@
         if (RT_UNLIKELY(pGipCpu->idCpu != idCpu))
             return;
-#else
-        unsigned iCpu = ASMGetApicId();
-        if (RT_UNLIKELY(iCpu >= RT_ELEMENTS(pGip->aCPUs)))
-            return;
-        pGipCpu = &pGip->aCPUs[iCpu];
-#endif
     }
 
@@ -5664 +5626 @@
                                   RTCPUID idCpu, uint8_t idApic, uint64_t iTick)
 {
-#ifdef SUP_WITH_LOTS_OF_CPUS
     unsigned iCpu = pGip->aiCpuFromApicId[idApic];
 
     if (RT_LIKELY(iCpu < pGip->cCpus))
-#else
-    unsigned iCpu = idApic;
-
-    if (RT_LIKELY(iCpu < RT_ELEMENTS(pGip->aCPUs)))
-#endif
     {
         PSUPGIPCPU pGipCpu = &pGip->aCPUs[iCpu];
-#ifdef SUP_WITH_LOTS_OF_CPUS
         if (pGipCpu->idCpu == idCpu)
-#endif
         {
 

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

@@ -190 +190 @@
  *  -# When increment the major number, execute all pending work.
  *
+ * Skip versions:
+ *  - 0x0018XXXX - Used by 4.0 for the >= 32/64 CPUs support.
+ *
  * @todo Pending work on next major version change:
  *          - None.
  */
-#define SUPDRV_IOC_VERSION                              0x00160001
+#define SUPDRV_IOC_VERSION                              0x00170001
 
 /** SUP_IOCTL_COOKIE. */

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

@@ -267 +267 @@
         strcpy(CookieReq.u.In.szMagic, SUPCOOKIE_MAGIC);
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
-        const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00160000
+        const uint32_t uMinVersion = /*(SUPDRV_IOC_VERSION & 0xffff0000) == 0x00160000
                                    ? 0x00160001
-                                   : SUPDRV_IOC_VERSION & 0xffff0000;
+                                   : */ SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = uMinVersion;
         rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_COOKIE, &CookieReq, SUP_IOCTL_COOKIE_SIZE);