Changeset 47786 in vbox for trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

Timestamp:

Aug 16, 2013 8:59:32 AM (11 years ago)

Author:

vboxsync

Message:

PGM: Added a new page type for the VT-x APIC access page MMIO alias instead of abusing the MMIO2 aliasing. There are important differences, we can safely access the MMIO2 page when aliased and save time doing so, while the alias created by IOMMMIOMapMMIOHCPage must not be accessed outside the VT-x execution AFAIK.

File:

• trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp (modified) (20 diffs)

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -144 +144 @@
                  * delegate the job to EMT.
                  */
-                if (PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage))
+                if (   PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage)
+                    || PGM_PAGE_IS_SPECIAL_ALIAS_MMIO(pPage))
                 {
                     pgmUnlock(pVM);
@@ -151 +152 @@
                                                    pVM, &GCPhys, pvBuf, cbRead);
                 }
-                Assert(!PGM_PAGE_IS_MMIO(pPage));
+                Assert(!PGM_PAGE_IS_MMIO_OR_SPECIAL_ALIAS(pPage));
 
                 /*
@@ -282 +283 @@
                  */
                 if (    PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage)
-                    ||  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED)
+                    ||  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED
+                    ||  PGM_PAGE_IS_SPECIAL_ALIAS_MMIO(pPage))
                 {
                     if (    PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_WRITE_MONITORED
@@ -295 +297 @@
                     }
                 }
-                Assert(!PGM_PAGE_IS_MMIO(pPage));
+                Assert(!PGM_PAGE_IS_MMIO_OR_SPECIAL_ALIAS(pPage));
 
                 /*
@@ -378 +380 @@
         AssertFatalRC(rc2);
         PPGMPAGE pPage = pTlbe->pPage;
-        if (PGM_PAGE_IS_MMIO(pPage))
+        if (PGM_PAGE_IS_MMIO_OR_SPECIAL_ALIAS(pPage))
         {
             PGMPhysReleasePageMappingLock(pVM, pLock);
@@ -449 +451 @@
     {
         PPGMPAGE pPage = pTlbe->pPage;
-        if (PGM_PAGE_IS_MMIO(pPage))
+        if (PGM_PAGE_IS_MMIO_OR_SPECIAL_ALIAS(pPage))
             rc = VERR_PGM_PHYS_PAGE_RESERVED;
         else
@@ -552 +554 @@
 #if 1
         /* MMIO pages doesn't have any readable backing. */
-        if (PGM_PAGE_IS_MMIO(pPage))
+        if (PGM_PAGE_IS_MMIO_OR_SPECIAL_ALIAS(pPage))
             rc = VERR_PGM_PHYS_PAGE_RESERVED;
 #else
@@ -1979 +1981 @@
 
                     case PGMPAGETYPE_MMIO2_ALIAS_MMIO:
+                    case PGMPAGETYPE_SPECIAL_ALIAS_MMIO: /** @todo perhaps leave the special page alone?  I don't think VT-x copes with this code. */
                         pgmHandlerPhysicalResetAliasedPage(pVM, pPage, pRam->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT),
                                                            true /*fDoAccounting*/);
@@ -2032 +2035 @@
 
                     case PGMPAGETYPE_MMIO2_ALIAS_MMIO:
+                    case PGMPAGETYPE_SPECIAL_ALIAS_MMIO: /** @todo perhaps leave the special page alone?  I don't think VT-x copes with this code. */
                         pgmHandlerPhysicalResetAliasedPage(pVM, pPage, pRam->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT),
                                                            true /*fDoAccounting*/);
@@ -2127 +2131 @@
 
                 case PGMPAGETYPE_MMIO2_ALIAS_MMIO:
+                case PGMPAGETYPE_SPECIAL_ALIAS_MMIO:
                 case PGMPAGETYPE_MMIO2:
                 case PGMPAGETYPE_ROM_SHADOW: /* handled by pgmR3PhysRomReset. */
@@ -2149 +2154 @@
     return VINF_SUCCESS;
 }
+
 
 /**
@@ -2363 +2369 @@
                 {
                     PPGMPAGE    pPage    = &pRam->aPages[iPage];
-                    if (    PGM_PAGE_GET_TYPE(pPage) != PGMPAGETYPE_MMIO
+                    if (   !PGM_PAGE_IS_MMIO_OR_ALIAS(pPage)
                         /*|| not-out-of-action later */)
                     {
                         fAllMMIO = false;
-                        Assert(PGM_PAGE_GET_TYPE(pPage) != PGMPAGETYPE_MMIO2_ALIAS_MMIO);
                         AssertMsgFailed(("%RGp %R[pgmpage]\n", pRam->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT), pPage));
                         break;
                     }
-                    Assert(PGM_PAGE_IS_ZERO(pPage));
+                    Assert(   PGM_PAGE_IS_ZERO(pPage)
+                           || PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_MMIO2_ALIAS_MMIO
+                           || PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_SPECIAL_ALIAS_MMIO);
                     pPage++;
                 }
@@ -2409 +2416 @@
                 {
                     PPGMPAGE pPage = &pRam->aPages[iPage];
-                    AssertMsg(PGM_PAGE_IS_MMIO(pPage), ("%RGp %R[pgmpage]\n", pRam->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT), pPage));
-                    AssertMsg(PGM_PAGE_IS_ZERO(pPage), ("%RGp %R[pgmpage]\n", pRam->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT), pPage));
-                    if (PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_MMIO)
+                    AssertMsg(   (PGM_PAGE_IS_MMIO(pPage) && PGM_PAGE_IS_ZERO(pPage))
+                              || PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_MMIO2_ALIAS_MMIO
+                              || PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_SPECIAL_ALIAS_MMIO,
+                              ("%RGp %R[pgmpage]\n", pRam->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT), pPage));
+                    if (PGM_PAGE_IS_MMIO_OR_ALIAS(pPage))
                         PGM_PAGE_SET_TYPE(pVM, pPage, PGMPAGETYPE_RAM);
                 }
@@ -2488 +2497 @@
  * @param   pszDesc         The description.
  */
-VMMR3DECL(int) PGMR3PhysMMIO2Register(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS cb, uint32_t fFlags, void **ppv, const char *pszDesc)
+VMMR3DECL(int) PGMR3PhysMMIO2Register(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS cb, uint32_t fFlags,
+                                      void **ppv, const char *pszDesc)
 {
     /*
@@ -2506 +2516 @@
     const uint32_t cPages = cb >> PAGE_SHIFT;
     AssertLogRelReturn(((RTGCPHYS)cPages << PAGE_SHIFT) == cb, VERR_INVALID_PARAMETER);
-    AssertLogRelReturn(cPages <= INT32_MAX / 2, VERR_NO_MEMORY);
+    AssertLogRelReturn(cPages <= PGM_MMIO2_MAX_PAGE_COUNT, VERR_NO_MEMORY);
 
     /*
@@ -2517 +2527 @@
             return VERR_NO_MEMORY;
     }
+
+    /*
+     * Allocate an MMIO2 range ID (not freed on failure).
+     * The zero ID is not used as it could be confused with NIL_GMM_PAGEID.
+     */
+    pgmLock(pVM);
+    uint8_t idMmio2 = pVM->pgm.s.cMmio2Regions + 1;
+    if (idMmio2 > PGM_MMIO2_MAX_RANGES)
+    {
+        pgmUnlock(pVM);
+        AssertLogRelFailedReturn(VERR_PGM_TOO_MANY_MMIO2_RANGES);
+    }
+    pVM->pgm.s.cMmio2Regions = idMmio2;
+    pgmUnlock(pVM);
 
     /*
@@ -2549 +2573 @@
                 pNew->iRegion               = iRegion;
                 pNew->idSavedState          = UINT8_MAX;
+                pNew->idMmio2               = idMmio2;
                 pNew->RamRange.pSelfR0      = MMHyperCCToR0(pVM, &pNew->RamRange);
                 pNew->RamRange.pSelfRC      = MMHyperCCToRC(pVM, &pNew->RamRange);
@@ -2563 +2588 @@
                 {
                     PGM_PAGE_INIT(&pNew->RamRange.aPages[iPage],
-                                  paPages[iPage].Phys, NIL_GMM_PAGEID,
+                                  paPages[iPage].Phys,
+                                  PGM_MMIO2_PAGEID_MAKE(idMmio2, iPage),
                                   PGMPAGETYPE_MMIO2, PGM_PAGE_STATE_ALLOCATED);
                 }
@@ -2575 +2601 @@
                  * Since there is no particular order, just push it.
                  */
+                /** @todo we can save us the linked list now, just search the lookup table... */
                 pgmLock(pVM);
+                Assert(pVM->pgm.s.apMmio2RangesR3[idMmio2] == NULL);
+                Assert(pVM->pgm.s.apMmio2RangesR0[idMmio2] == NIL_RTR0PTR);
                 pNew->pNextR3 = pVM->pgm.s.pMmio2RangesR3;
                 pVM->pgm.s.pMmio2RangesR3 = pNew;
+                pVM->pgm.s.apMmio2RangesR3[idMmio2] = pNew;
+                pVM->pgm.s.apMmio2RangesR0[idMmio2] = MMHyperCCToR0(pVM, pNew);
                 pgmUnlock(pVM);
 
@@ -2650 +2681 @@
                 pVM->pgm.s.pMmio2RangesR3 = pNext;
             pCur->pNextR3 = NULL;
+
+            uint8_t idMmio2 = pCur->idMmio2;
+            Assert(pVM->pgm.s.apMmio2RangesR3[idMmio2] == pCur);
+            pVM->pgm.s.apMmio2RangesR3[idMmio2] = NULL;
+            pVM->pgm.s.apMmio2RangesR0[idMmio2] = NIL_RTR0PTR;
 
             /*