Changeset 15346 in vbox for trunk/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp

Timestamp:

Dec 12, 2008 1:23:23 AM (16 years ago)

Author:

vboxsync

Message:

Avoid a few calls to RTMpCpuId() and RTMCpuIdToSetIndex().

File:

• trunk/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp (modified) (9 diffs)

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

@@ -367 +367 @@
         }
         pSet->cEntries = PGMMAPSET_CLOSED;
+        pSet->iCpu = -1;
         memset(&pSet->aiHashTable[0], 0xff, sizeof(pSet->aiHashTable));
     }
@@ -465 +466 @@
                 }
                 pSet->cEntries = PGMMAPSET_CLOSED;
+                pSet->iCpu = -1;
             }
             else
@@ -1272 +1274 @@
  * @param   pThis       The dynamic mapping cache instance.
  * @param   HCPhys      The address of the page to be mapped.
+ * @param   iRealCpu    The real cpu set index. (optimization)
  * @param   pVM         The shared VM structure, for statistics only.
  * @param   ppvPage     Where to the page address.
  */
-DECLINLINE(uint32_t) pgmR0DynMapPage(PPGMR0DYNMAP pThis, RTHCPHYS HCPhys, PVM pVM, void **ppvPage)
+DECLINLINE(uint32_t) pgmR0DynMapPage(PPGMR0DYNMAP pThis, RTHCPHYS HCPhys, int32_t iRealCpu, PVM pVM, void **ppvPage)
 {
     RTSPINLOCKTMP   Tmp       = RTSPINLOCKTMP_INITIALIZER;
@@ -1345 +1348 @@
      * Invalidate the entry?
      */
-    RTCPUID idRealCpu = RTMpCpuId();
-    bool fInvalidateIt = RTCpuSetIsMember(&paPages[iPage].PendingSet, idRealCpu);
+    bool fInvalidateIt = RTCpuSetIsMemberByIndex(&paPages[iPage].PendingSet, iRealCpu);
     if (RT_UNLIKELY(fInvalidateIt))
-        RTCpuSetDel(&paPages[iPage].PendingSet, idRealCpu);
+        RTCpuSetDelByIndex(&paPages[iPage].PendingSet, iRealCpu);
 
     RTSpinlockRelease(pThis->hSpinlock, &Tmp);
@@ -1497 +1499 @@
     Assert(pVCpu->pgm.s.AutoSet.cEntries == PGMMAPSET_CLOSED);
     pVCpu->pgm.s.AutoSet.cEntries = 0;
+    pVCpu->pgm.s.AutoSet.iCpu = RTMpCpuIdToSetIndex(RTMpCpuId());
 }
 
@@ -1554 +1557 @@
     AssertMsg(cEntries <= RT_ELEMENTS(pSet->aEntries), ("%#x (%u)\n", cEntries, cEntries));
     pSet->cEntries = PGMMAPSET_CLOSED;
+    pSet->iCpu = -1;
 
     pgmDynMapFlushAutoSetWorker(pSet, cEntries);
@@ -1580 +1584 @@
         pgmDynMapFlushAutoSetWorker(pSet, cEntries);
     }
+    Assert(pSet->iCpu == RTMpCpuIdToSetIndex(RTMpCpuId()));
 }
 
@@ -1607 +1612 @@
         {
             PPGMR0DYNMAP    pThis = g_pPGMR0DynMap;
-            RTCPUID         idRealCpu = RTMpCpuId();
-
-            while (i-- > 0)
-            {
-                Assert(pSet->aEntries[i].cRefs > 0);
-                uint32_t iPage = pSet->aEntries[i].iPage;
-                Assert(iPage < pThis->cPages);
-                if (RTCpuSetIsMember(&pThis->paPages[iPage].PendingSet, idRealCpu))
+            int32_t         iRealCpu = RTMpCpuIdToSetIndex(RTMpCpuId());
+            if (pSet->iCpu != iRealCpu)
+            {
+                while (i-- > 0)
                 {
-                    RTCpuSetDel(&pThis->paPages[iPage].PendingSet, idRealCpu);
-                    ASMInvalidatePage(pThis->paPages[iPage].pvPage);
-                    STAM_COUNTER_INC(&pVCpu->pVMR0->pgm.s.StatR0DynMapMigrateInvlPg);
+                    Assert(pSet->aEntries[i].cRefs > 0);
+                    uint32_t iPage = pSet->aEntries[i].iPage;
+                    Assert(iPage < pThis->cPages);
+                    if (RTCpuSetIsMemberByIndex(&pThis->paPages[iPage].PendingSet, iRealCpu))
+                    {
+                        RTCpuSetDelByIndex(&pThis->paPages[iPage].PendingSet, iRealCpu);
+                        ASMInvalidatePage(pThis->paPages[iPage].pvPage);
+                        STAM_COUNTER_INC(&pVCpu->pVMR0->pgm.s.StatR0DynMapMigrateInvlPg);
+                    }
                 }
+
+                pSet->iCpu = iRealCpu;
             }
         }
@@ -1684 +1693 @@
 int pgmR0DynMapHCPageCommon(PVM pVM, PPGMMAPSET pSet, RTHCPHYS HCPhys, void **ppv)
 {
+    Assert(pSet->iCpu == RTMpCpuIdToSetIndex(RTMpCpuId()));
+
     /*
      * Map it.
      */
     void *pvPage;
-    uint32_t const  iPage = pgmR0DynMapPage(g_pPGMR0DynMap, HCPhys, pVM, &pvPage);
+    uint32_t const  iPage = pgmR0DynMapPage(g_pPGMR0DynMap, HCPhys, pSet->iCpu, pVM, &pvPage);
     if (RT_UNLIKELY(iPage == UINT32_MAX))
     {