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

Timestamp:

Mar 5, 2009 1:37:58 AM (16 years ago)

Author:

vboxsync

Message:

PGM,GMM: Hacking on the new phys code.

File:

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

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -49 +49 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-/*static - shut up warning */
-DECLCALLBACK(int) pgmR3PhysRomWriteHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser);
+static DECLCALLBACK(int) pgmR3PhysRomWriteHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser);
 
 
@@ -290 +289 @@
     for (PPGMRAMRANGE pRam = pVM->pgm.s.pRamRangesR3; pRam; pRam = pRam->pNextR3)
     {
-        uint32_t iPage = pRam->cb >> PAGE_SHIFT; Assert((RTGCPHYS)iPage << PAGE_SHIFT == pRam->cb);
+        uint32_t    iPage = pRam->cb >> PAGE_SHIFT; Assert((RTGCPHYS)iPage << PAGE_SHIFT == pRam->cb);
 #ifdef VBOX_WITH_NEW_PHYS_CODE
-        if (!pVM->pgm.f.fRamPreAlloc)
+        int         rc;
+        if (!pVM->pgm.s.fRamPreAlloc)
         {
             /* Replace all RAM pages by ZERO pages. */
@@ -1330 +1330 @@
 
             /*
+             * Before registering the handler, notify REM, it'll get
+             * confused about shadowed ROM otherwise.
+             */
+            REMR3NotifyPhysRomRegister(pVM, GCPhys, cb, NULL,
+                                       !!(fFlags & PGMPHYS_ROM_FLAG_SHADOWED));
+            /** @todo fix shadowing and REM. */
+
+            /*
              * Register the write access handler for the range (PGMROMPROT_READ_ROM_WRITE_IGNORE).
              */
-            rc = PGMR3HandlerPhysicalRegister(pVM, PGMPHYSHANDLERTYPE_PHYSICAL_WRITE, GCPhys, GCPhysLast,
-#if 0 /** @todo we actually need a ring-3 write handler here for shadowed ROMs, so hack REM! */
+            rc = PGMR3HandlerPhysicalRegister(pVM,
+                                              fFlags & PGMPHYS_ROM_FLAG_SHADOWED
+                                              ? PGMPHYSHANDLERTYPE_PHYSICAL_ALL
+                                              : PGMPHYSHANDLERTYPE_PHYSICAL_WRITE,
+                                              GCPhys, GCPhysLast,
                                               pgmR3PhysRomWriteHandler, pRomNew,
-#else
-                                              NULL, NULL,
-#endif
                                               NULL, "pgmPhysRomWriteHandler", MMHyperCCToR0(pVM, pRomNew),
                                               NULL, "pgmPhysRomWriteHandler", MMHyperCCToRC(pVM, pRomNew), pszDesc);
@@ -1401 +1409 @@
                     }
 
-                    REMR3NotifyPhysRomRegister(pVM, GCPhys, cb, NULL, false); /** @todo fix shadowing and REM. */
-
                     GMMR3AllocatePagesCleanup(pReq);
                     pgmUnlock(pVM);
@@ -1416 +1422 @@
             }
 
-            pgmR3PhysUnlinkRamRange2(pVM, pRamNew, pRamPrev);
-            if (pRamNew)
+            if (!fRamExists)
+            {
+                pgmR3PhysUnlinkRamRange2(pVM, pRamNew, pRamPrev);
                 MMHyperFree(pVM, pRamNew);
+            }
         }
         MMHyperFree(pVM, pRomNew);
@@ -1444 +1452 @@
  * @param   pvUser          User argument.
  */
-/*static - shut up warning */
- DECLCALLBACK(int) pgmR3PhysRomWriteHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser)
+static DECLCALLBACK(int) pgmR3PhysRomWriteHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser)
 {
     PPGMROMRANGE    pRom = (PPGMROMRANGE)pvUser;
@@ -2019 +2026 @@
         if (RT_SUCCESS(rc))
         {
-
             rc = MMR3PhysRegisterEx(pVM, pvRam, GCPhys, PGM_DYNAMIC_CHUNK_SIZE, 0, MM_PHYS_TYPE_DYNALLOC_CHUNK, "Main Memory");
             if (RT_SUCCESS(rc))
@@ -2051 +2057 @@
 }
 
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
 
 /**
@@ -2105 +2110 @@
 }
 
+#endif /* !VBOX_WITH_NEW_PHYS_CODE */
 
 /**
@@ -2314 +2320 @@
     Req.pvR3 = NULL;
     Req.idChunkMap = idChunk;
-    Req.idChunkUnmap = INT32_MAX;
+    Req.idChunkUnmap = NIL_GMM_CHUNKID;
     if (pVM->pgm.s.ChunkR3Map.c >= pVM->pgm.s.ChunkR3Map.cMax)
         Req.idChunkUnmap = pgmR3PhysChunkFindUnmapCandidate(pVM);
-    rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_MAP_UNMAP_CHUNK, 0, &Req.Hdr);
+    rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_MAP_UNMAP_CHUNK, 0, &Req.Hdr);
     if (RT_SUCCESS(rc))
     {
@@ -2334 +2340 @@
 
         /* remove the unmapped one. */
-        if (Req.idChunkUnmap != INT32_MAX)
+        if (Req.idChunkUnmap != NIL_GMM_CHUNKID)
         {
             PPGMCHUNKR3MAP pUnmappedChunk = (PPGMCHUNKR3MAP)RTAvlU32Remove(&pVM->pgm.s.ChunkR3Map.pTree, Req.idChunkUnmap);
@@ -2407 +2413 @@
 {
     pgmLock(pVM);
-    int rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_PGM_ALLOCATE_HANDY_PAGES, 0, NULL);
+    int rc = VMMR3CallR0(pVM, VMMR0_DO_PGM_ALLOCATE_HANDY_PAGES, 0, NULL);
     if (rc == VERR_GMM_SEED_ME)
     {
@@ -2413 +2419 @@
         rc = SUPPageAlloc(GMM_CHUNK_SIZE >> PAGE_SHIFT, &pvChunk);
         if (RT_SUCCESS(rc))
-            rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_SEED_CHUNK, (uintptr_t)pvChunk, NULL);
+            rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_SEED_CHUNK, (uintptr_t)pvChunk, NULL);
         if (RT_FAILURE(rc))
         {
@@ -2432 +2438 @@
  * @returns VBox status code.
  * @retval  VINF_SUCCESS on success.
- * @retval  VINF_PGM_PHYS_TLB_CATCH_WRITE and *pvPtr set if the page has a write
+ * @retval  VINF_PGM_PHYS_TLB_CATCH_WRITE and *ppv set if the page has a write
  *          access handler of some kind.
  * @retval  VERR_PGM_PHYS_TLB_CATCH_ALL if the page has a handler catching all
@@ -2441 +2447 @@
  * @param   GCPhys      The GC physical address to convert.
  * @param   fWritable   Whether write access is required.
- * @param   pR3Ptr      Where to store the R3 pointer on success.
- */
-VMMR3DECL(int) PGMR3PhysTlbGCPhys2Ptr(PVM pVM, RTGCPHYS GCPhys, bool fWritable, void **pvPtr)
+ * @param   ppv         Where to store the pointer corresponding to GCPhys on
+ *                      success.
+ */
+VMMR3DECL(int) PGMR3PhysTlbGCPhys2Ptr(PVM pVM, RTGCPHYS GCPhys, bool fWritable, void **ppv)
 {
     pgmLock(pVM);
@@ -2452 +2459 @@
     if (RT_SUCCESS(rc))
     {
-#if 0 /** @todo ifndef PGM_IGNORE_RAM_FLAGS_RESERVED */
-        if (RT_UNLIKELY(PGM_PAGE_IS_RESERVED(pPage)))
-            rc = VERR_PGM_PHYS_TLB_UNASSIGNED;
-#endif
-        {
-#if 0 /** @todo looks like the system ROM is registered incorrectly, 0xfe000 claims to be a zero page. */
-            if (fWritable && PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED)
-                rc = VERR_PGM_PHYS_TLB_UNASSIGNED; /** @todo VBOX_WITH_NEW_PHYS_CODE: remap it to a writeable page. */
+#ifdef VBOX_WITH_NEW_PHYS_CODE
+        if (!PGM_PAGE_HAS_ANY_HANDLERS(pPage))
+            rc = VINF_SUCCESS;
+        else
+        {
+            if (PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage)) /* catches MMIO */
+                rc = VERR_PGM_PHYS_TLB_CATCH_ALL;
+            else if (fWritable && PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
+                rc = VINF_PGM_PHYS_TLB_CATCH_WRITE;
+            else
+            {
+                /* Temporariliy disabled phycial handler(s), since the recompiler
+                   doesn't get notified when it's reset we'll have to pretend its
+                   operating normally. */
+                if (pgmHandlerPhysicalIsAll(pVM, GCPhys))
+                    rc = VERR_PGM_PHYS_TLB_CATCH_ALL;
+                else
+                    rc = VINF_PGM_PHYS_TLB_CATCH_WRITE;
+            }
+        }
+        if (RT_SUCCESS(rc))
+        {
+            /* Make sure what we return is writable. */
+            if (fWritable && rc != VINF_PGM_PHYS_TLB_CATCH_WRITE)
+                switch (PGM_PAGE_GET_STATE(pPage))
+                {
+                    case PGM_PAGE_STATE_ALLOCATED:
+                    case PGM_PAGE_STATE_ZERO:
+                        break;
+                    case PGM_PAGE_STATE_SHARED:
+                    case PGM_PAGE_STATE_WRITE_MONITORED:
+                        rc = pgmPhysPageMakeWritable(pVM, pPage, GCPhys & ~(RTGCPHYS)PAGE_OFFSET_MASK);
+                        AssertLogRelRCReturn(rc, rc);
+                        break;
+                }
+
+            /* Get a ring-3 mapping of the address. */
+            PPGMPAGER3MAPTLBE pTlbe;
+            int rc = pgmPhysPageQueryTlbe(&pVM->pgm.s, GCPhys, &pTlbe);
+            AssertLogRelRCReturn(rc, rc);
+            *ppv = (void *)((uintptr_t)pTlbe->pv | (GCPhys & PAGE_OFFSET_MASK));
+            /** @todo mapping/locking hell; this isn't horribly efficient since
+             *        pgmPhysPageLoadIntoTlb will repeate the lookup we've done here. */
+        }
+        /* else: handler catching all access, no pointer returned. */
+
 #else
-            if (0)
-                /* nothing */;
-#endif
-            else if (PGM_PAGE_HAS_ANY_HANDLERS(pPage))
+        if (0)
+            /* nothing */;
+        else if (PGM_PAGE_HAS_ANY_HANDLERS(pPage))
+        {
+            if (PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage)) /* catches MMIO */
+                rc = VERR_PGM_PHYS_TLB_CATCH_ALL;
+            else if (fWritable && PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
+                rc = VINF_PGM_PHYS_TLB_CATCH_WRITE;
+            else
             {
-                if (PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage)) /* catches MMIO */
+                /* Temporariliy disabled phycial handler(s), since the recompiler
+                   doesn't get notified when it's reset we'll have to pretend its
+                   operating normally. */
+                if (pgmHandlerPhysicalIsAll(pVM, GCPhys))
                     rc = VERR_PGM_PHYS_TLB_CATCH_ALL;
-                else if (fWritable && PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
+                else
                     rc = VINF_PGM_PHYS_TLB_CATCH_WRITE;
-                else
-                {
-                    /* Temporariliy disabled phycial handler(s), since the recompiler
-                       doesn't get notified when it's reset we'll have to pretend its
-                       operating normally. */
-                    if (pgmHandlerPhysicalIsAll(pVM, GCPhys))
-                        rc = VERR_PGM_PHYS_TLB_CATCH_ALL;
-                    else
-                        rc = VINF_PGM_PHYS_TLB_CATCH_WRITE;
-                }
+            }
+        }
+        else
+            rc = VINF_SUCCESS;
+        if (RT_SUCCESS(rc))
+        {
+            if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
+            {
+                AssertMsg(PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM, ("GCPhys=%RGp type=%d\n", GCPhys, PGM_PAGE_GET_TYPE(pPage)));
+                RTGCPHYS off = GCPhys - pRam->GCPhys;
+                unsigned iChunk = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
+                *ppv = (void *)(pRam->paChunkR3Ptrs[iChunk] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
+            }
+            else if (RT_LIKELY(pRam->pvR3))
+            {
+                AssertMsg(PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM || PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_MMIO2, ("GCPhys=%RGp type=%d\n", GCPhys, PGM_PAGE_GET_TYPE(pPage)));
+                RTGCPHYS off = GCPhys - pRam->GCPhys;
+                *ppv = (uint8_t *)pRam->pvR3 + off;
             }
             else
-                rc = VINF_SUCCESS;
-            if (RT_SUCCESS(rc))
-            {
-                if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
-                {
-                    AssertMsg(PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM, ("GCPhys=%RGp type=%d\n", GCPhys, PGM_PAGE_GET_TYPE(pPage)));
-                    RTGCPHYS off = GCPhys - pRam->GCPhys;
-                    unsigned iChunk = (off >> PGM_DYNAMIC_CHUNK_SHIFT);
-                    *pvPtr = (void *)(pRam->paChunkR3Ptrs[iChunk] + (off & PGM_DYNAMIC_CHUNK_OFFSET_MASK));
-                }
-                else if (RT_LIKELY(pRam->pvR3))
-                {
-                    AssertMsg(PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM || PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_MMIO2, ("GCPhys=%RGp type=%d\n", GCPhys, PGM_PAGE_GET_TYPE(pPage)));
-                    RTGCPHYS off = GCPhys - pRam->GCPhys;
-                    *pvPtr = (uint8_t *)pRam->pvR3 + off;
-                }
-                else
-                    rc = VERR_PGM_PHYS_TLB_UNASSIGNED;
-            }
-        }
+                rc = VERR_PGM_PHYS_TLB_UNASSIGNED;
+        }
+#endif /* !VBOX_WITH_NEW_PHYS_CODE */
     }
     else