Changeset 36254 in vbox for trunk/src/VBox/Runtime

Timestamp:

Mar 10, 2011 5:22:08 PM (14 years ago)

Author:

vboxsync

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

70492

Message:

GIP,++: Lots of CPUs (disabled).

Location:

trunk/src/VBox/Runtime

Files:

• common/time/timesupA.mac (modified) (2 diffs)
• common/time/timesupref.h (modified) (1 diff)
• generic/RTMpGetArraySize-generic.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/time/timesupA.mac

@@ -95 +95 @@
     mov     u32ApicIdPlus, ebx
  %endif
-    ; pGipCpu = &pGip->aCPU[u8ApicId];
+    ; pGipCpu = &pGip->aCPU[pGip->aiCpuFromApicId[u8ApicId]];
     shr     ebx, 24
+ %ifdef SUP_WITH_LOTS_OF_CPUS
+    movzx   ebx, word [esi + ebx * 2 + SUPGLOBALINFOPAGE.aiCpuFromApicId]
+ %else
+    and     ebx, SUPGLOBALINFOPAGE_CPUS - 1
+ %endif
     mov     eax, SUPGIPCPU_size
     mul     ebx
@@ -516 +521 @@
     mov     u32ApicIdPlus, ebx
  %endif
-    ; pGipCpu = &pGip->aCPU[u8ApicId];
+    ; pGipCpu = &pGip->aCPU[pGip->aiCpuFromApicId[u8ApicId]];
     shr     ebx, 24
+ %ifdef SUP_WITH_LOTS_OF_CPUS
+    movzx   eax, word [pGip + rbx * 2 + SUPGLOBALINFOPAGE.aiCpuFromApicId]
+ %else
     mov     eax, ebx
- %if SUPGLOBALINFOPAGE_CPUS < 256
     and     eax, SUPGLOBALINFOPAGE_CPUS - 1
  %endif

trunk/src/VBox/Runtime/common/time/timesupref.h

@@ -63 +63 @@
 
 #ifdef ASYNC_GIP
-        uint8_t u8ApicId = ASMGetApicId();
-# if SUPGLOBALINFOPAGE_CPUS < 256
-        PSUPGIPCPU pGipCpu = &pGip->aCPUs[u8ApicId & SUPGLOBALINFOPAGE_CPUS];
+        uint8_t    u8ApicId = ASMGetApicId();
+# ifdef SUP_WITH_LOTS_OF_CPUS
+        PSUPGIPCPU pGipCpu = &pGip->aCPUs[pGip->aiCpuFromApicId[u8ApicId]];
 # else
-        PSUPGIPCPU pGipCpu = &pGip->aCPUs[u8ApicId];
+        PSUPGIPCPU pGipCpu = &pGip->aCPUs[u8ApicId & (SUPGLOBALINFOPAGE_CPUS - 1)];
 # endif
 #else

trunk/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +30 @@
 *******************************************************************************/
 #include <iprt/mp.h>
+#include "internal/iprt.h"
+
+#include <iprt/asm.h>
 #include <iprt/cpuset.h>
-#include "internal/iprt.h"
 
 
 RTDECL(uint32_t) RTMpGetArraySize(void)
 {
-    RTCPUSET    CpuSet;
-    return RTCpuLastIndex(RTMpGetSet(&CpuSet)) + 1;
+    /*
+     * Cache the result here.  This whole point of this function is that it
+     * will always return the same value, so that should be safe.
+     *
+     * Note! Because RTCPUSET may be to small to represent all the CPUs, we
+     *       check with RTMpGetCount() as well.
+     */
+    static uint32_t s_cMaxCpus = 0;
+    uint32_t cCpus = s_cMaxCpus;
+    if (RT_UNLIKELY(cCpus == 0))
+    {
+        RTCPUSET    CpuSet;
+        uint32_t    cCpus1 = RTCpuLastIndex(RTMpGetSet(&CpuSet)) + 1;
+        uint32_t    cCpus2 = RTMpGetCount();
+        uint32_t    cCpus  = RT_MAX(cCpus1, cCpus2);
+        ASMAtomicCmpXchgU32(&s_cMaxCpus, cCpus, 0);
+        return cCpus;
+    }
+    return s_cMaxCpus;
+
 }
 RT_EXPORT_SYMBOL(RTMpGetArraySize);