Changeset 54467 in vbox

Timestamp:

Feb 24, 2015 6:23:18 PM (10 years ago)

Author:

vboxsync

Message:

IPRT,VMM,SUPDrv: Use the new RTMpCurSetIndex* APIs - require driver reload.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPDrv.cpp (modified) (1 diff)
• HostDrivers/Support/SUPDrvIOC.h (modified) (1 diff)
• HostDrivers/Support/SUPLib.cpp (modified) (1 diff)
• Runtime/common/time/timesupref.h (modified) (1 diff)
• VMM/VMMAll/VMMAll.cpp (modified) (1 diff)
• VMM/VMMR0/VMMR0.cpp (modified) (4 diffs)
• VMM/VMMRZ/PGMRZDynMap.cpp (modified) (1 diff)

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

@@ -245 +245 @@
     { "RTMpCpuIdFromSetIndex",                  (void *)RTMpCpuIdFromSetIndex },
     { "RTMpCpuIdToSetIndex",                    (void *)RTMpCpuIdToSetIndex },
+    { "RTMpCurSetIndex",                        (void *)RTMpCurSetIndex },
+    { "RTMpCurSetIndexAndId",                   (void *)RTMpCurSetIndexAndId },
     { "RTMpGetArraySize",                       (void *)RTMpGetArraySize },
     { "RTMpGetCount",                           (void *)RTMpGetCount },

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

@@ -215 +215 @@
  *          - (nothing)
  */
-#define SUPDRV_IOC_VERSION                              0x001f0002
+#define SUPDRV_IOC_VERSION                              0x001f0003
 
 /** SUP_IOCTL_COOKIE. */

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

@@ -280 +280 @@
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
         const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x001f0000
-                                   ? 0x001f0002
+                                   ? 0x001f0003
                                    : SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = uMinVersion;

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

@@ -78 +78 @@
 #if TMPL_MODE == TMPL_MODE_ASYNC || TMPL_MODE == TMPL_MODE_SYNC_INVAR_WITH_DELTA
 # if   defined(IN_RING0)
-            uint32_t const  iCpuSet  = RTMpCpuIdToSetIndex(RTMpCpuId());
+            uint32_t const  iCpuSet  = RTMpCurSetIndex();
             uint16_t const  iGipCpu  = iCpuSet < RT_ELEMENTS(pGip->aiCpuFromCpuSetIdx)
                                      ? pGip->aiCpuFromCpuSetIdx[iCpuSet] : UINT16_MAX;

trunk/src/VBox/VMM/VMMAll/VMMAll.cpp

@@ -284 +284 @@
     RTNATIVETHREAD hThread = RTThreadNativeSelf();
 
-    /** @todo optimize for large number of VCPUs when that becomes more common. */
+    /** @todo optimize for large number of VCPUs when that becomes more common.
+     * Use a map like GIP does that's indexed by the host CPU index.  */
     for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
     {

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -566 +566 @@
 
             /* We need to update the VCPU <-> host CPU mapping. */
-            RTCPUID idHostCpu    = RTMpCpuId();
-            uint32_t iHostCpuSet = RTMpCpuIdToSetIndex(idHostCpu);
+            RTCPUID idHostCpu;
+            uint32_t iHostCpuSet = RTMpCurSetIndexAndId(&idHostCpu);
             pVCpu->iHostCpuSet   = iHostCpuSet;
             ASMAtomicWriteU32(&pVCpu->idHostCpu, idHostCpu);
@@ -879 +879 @@
              * we've got a TSC delta for the CPU.
              */
-            RTCPUID  idHostCpu   = RTMpCpuId();
-            uint32_t iHostCpuSet = RTMpCpuIdToSetIndex(idHostCpu);
+            RTCPUID  idHostCpu;
+            uint32_t iHostCpuSet = RTMpCurSetIndexAndId(&idHostCpu);
             if (RT_LIKELY(   iHostCpuSet < RTCPUSET_MAX_CPUS
                           && SUPIsTscDeltaAvailableForCpuSetIndex(iHostCpuSet)))
@@ -993 +993 @@
              * we've got a TSC delta for the CPU.
              */
-            RTCPUID  idHostCpu   = RTMpCpuId();
-            uint32_t iHostCpuSet = RTMpCpuIdToSetIndex(idHostCpu);
+            RTCPUID  idHostCpu;
+            uint32_t iHostCpuSet = RTMpCurSetIndexAndId(&idHostCpu);
             if (RT_LIKELY(   iHostCpuSet < RTCPUSET_MAX_CPUS
                           && SUPIsTscDeltaAvailableForCpuSetIndex(iHostCpuSet)))
@@ -1327 +1327 @@
              * we've got a TSC delta for the CPU.
              */
-            RTCPUID  idHostCpu   = RTMpCpuId();
-            uint32_t iHostCpuSet = RTMpCpuIdToSetIndex(idHostCpu);
+            RTCPUID  idHostCpu;
+            uint32_t iHostCpuSet = RTMpCurSetIndexAndId(&idHostCpu);
             if (RT_UNLIKELY(iHostCpuSet >= RTCPUSET_MAX_CPUS))
             {

trunk/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp

@@ -130 +130 @@
 # define PGMRZDYNMAP_CUR_CPU()              (0)
 #else
-# define PGMRZDYNMAP_CUR_CPU()              RTMpCpuIdToSetIndex(RTMpCpuId())
+# define PGMRZDYNMAP_CUR_CPU()              RTMpCurSetIndex()
 #endif