Changeset 17438 in vbox for trunk

Timestamp:

Mar 6, 2009 4:35:00 AM (16 years ago)

Author:

vboxsync

Message:

PGM: Some REM hacking for the ROM registration and some in-progress page sync hacking...

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• PGMPhys.cpp (modified) (2 diffs)
• VMMAll/PGMAllBth.h (modified) (8 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMInternal.h

@@ -3045 +3045 @@
 int             pgmPhysPageLoadIntoTlbWithPage(PPGM pPGM, PPGMPAGE pPage, RTGCPHYS GCPhys);
 int             pgmPhysPageMakeWritable(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys);
+int             pgmPhysPageMakeWritableUnlocked(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys);
 int             pgmPhysPageMap(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys, PPPGMPAGEMAP ppMap, void **ppv);
 int             pgmPhysPageMapByPageID(PVM pVM, uint32_t idPage, RTHCPHYS HCPhys, void **ppv);

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -1374 +1374 @@
 
             /*
-             * Before registering the handler, notify REM, it'll get
-             * confused about shadowed ROM otherwise.
+             * !HACK ALERT!  REM + (Shadowed) ROM ==> mess.
+             *
+             * If it's shadowed we'll register the handler after the ROM notification
+             * so we get the access handler callbacks that we should. If it isn't
+             * shadowed we'll do it the other way around to make REM use the built-in
+             * ROM behavior and not the handler behavior (which is to route all access
+             * to PGM atm).
              */
-            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,
-                                              fFlags & PGMPHYS_ROM_FLAG_SHADOWED
-                                              ? PGMPHYSHANDLERTYPE_PHYSICAL_ALL
-                                              : PGMPHYSHANDLERTYPE_PHYSICAL_WRITE,
-                                              GCPhys, GCPhysLast,
-                                              pgmR3PhysRomWriteHandler, pRomNew,
-                                              NULL, "pgmPhysRomWriteHandler", MMHyperCCToR0(pVM, pRomNew),
-                                              NULL, "pgmPhysRomWriteHandler", MMHyperCCToRC(pVM, pRomNew), pszDesc);
+            if (fFlags & PGMPHYS_ROM_FLAG_SHADOWED)
+            {
+                REMR3NotifyPhysRomRegister(pVM, GCPhys, cb, NULL, true /* fShadowed */);
+                rc = PGMR3HandlerPhysicalRegister(pVM,
+                                                  fFlags & PGMPHYS_ROM_FLAG_SHADOWED
+                                                  ? PGMPHYSHANDLERTYPE_PHYSICAL_ALL
+                                                  : PGMPHYSHANDLERTYPE_PHYSICAL_WRITE,
+                                                  GCPhys, GCPhysLast,
+                                                  pgmR3PhysRomWriteHandler, pRomNew,
+                                                  NULL, "pgmPhysRomWriteHandler", MMHyperCCToR0(pVM, pRomNew),
+                                                  NULL, "pgmPhysRomWriteHandler", MMHyperCCToRC(pVM, pRomNew), pszDesc);
+            }
+            else
+            {
+                rc = PGMR3HandlerPhysicalRegister(pVM,
+                                                  fFlags & PGMPHYS_ROM_FLAG_SHADOWED
+                                                  ? PGMPHYSHANDLERTYPE_PHYSICAL_ALL
+                                                  : PGMPHYSHANDLERTYPE_PHYSICAL_WRITE,
+                                                  GCPhys, GCPhysLast,
+                                                  pgmR3PhysRomWriteHandler, pRomNew,
+                                                  NULL, "pgmPhysRomWriteHandler", MMHyperCCToR0(pVM, pRomNew),
+                                                  NULL, "pgmPhysRomWriteHandler", MMHyperCCToRC(pVM, pRomNew), pszDesc);
+                REMR3NotifyPhysRomRegister(pVM, GCPhys, cb, NULL, false /* fShadowed */);
+            }
             if (RT_SUCCESS(rc))
             {
@@ -2458 +2472 @@
     pgmLock(pVM);
 
+
     /*
      * Allocate more pages, noting down the index of the first new page.
      */
     uint32_t iClear = pVM->pgm.s.cHandyPages;
+    AssertMsgReturn(iClear <= RT_ELEMENTS(pVM->pgm.s.aHandyPages), ("%d", iClear), VERR_INTERNAL_ERROR);
     int rc = VMMR3CallR0(pVM, VMMR0_DO_PGM_ALLOCATE_HANDY_PAGES, 0, NULL);
     if (rc == VERR_GMM_SEED_ME)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -628 +628 @@
             else
             {
-                /* When the guest accesses invalid physical memory (e.g. probing of RAM or accessing a remapped MMIO range), then we'll fall
+                /*
+                 * When the guest accesses invalid physical memory (e.g. probing
+                 * of RAM or accessing a remapped MMIO range), then we'll fall
                  * back to the recompiler to emulate the instruction.
                  */
-                LogFlow(("pgmPhysGetPageEx %RGp failed with %Rrc\n", GCPhys, rc));
+                LogFlow(("PGM #PF: pgmPhysGetPageEx(%RGp) failed with %Rrc\n", GCPhys, rc));
                 STAM_COUNTER_INC(&pVM->pgm.s.StatRZTrap0eHandlersInvalid);
                 STAM_PROFILE_STOP(&pVM->pgm.s.StatRZTrap0eTimeHandlers, b);
@@ -641 +643 @@
 #  ifdef PGM_OUT_OF_SYNC_IN_GC
             /*
-             * We are here only if page is present in Guest page tables and trap is not handled
-             * by our handlers.
+             * We are here only if page is present in Guest page tables and
+             * trap is not handled by our handlers.
+             *
              * Check it for page out-of-sync situation.
              */
@@ -754 +757 @@
             else
             {
+#   ifdef VBOX_WITH_NEW_PHYS_CODE
+                /*
+                 * Need to deal with these buggers somewhere...
+                 */
+                if (    PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED
+                    &&  (uErr & X86_TRAP_PF_RW))
+                {
+                    Log(("PGM #PF: %RGp %R[pgmpage] uErr=%#x\n", GCPhys, pPage, uErr));
+                    AssertMsgFailed(("PGM #PF: %RGp %R[pgmpage] uErr=%#x\n", GCPhys, pPage, uErr));
+                }
+#   endif /* VBOX_WITH_NEW_PHYS_CODE */
+
                 /*
                  * A side effect of not flushing global PDEs are out of sync pages due
@@ -1464 +1479 @@
         if (RT_SUCCESS(rc))
         {
+#ifdef VBOX_WITH_NEW_PHYS_CODE
+            /* Try make the page writable if necessary. */
+            if (    PteSrc.n.u1Write
+                &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED
+                &&  PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM)
+            {
+                rc = pgmPhysPageMakeWritableUnlocked(pVM, pPage, PteSrc.u & GST_PTE_PG_MASK);
+                AssertRC(rc);
+            }
+#endif
+
             /** @todo investiage PWT, PCD and PAT. */
             /*
@@ -1537 +1563 @@
             }
 
+#ifdef VBOX_WITH_NEW_PHYS_CODE
+            /*
+             * Make sure only allocated pages are mapped writable.
+             */
+            if (    PteDst.n.u1Write
+                &&  PteDst.n.u1Present
+                &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED)
+                PteDst.n.u1Write = 0;   /** @todo this isn't quite working yet. */
+#endif
+
 #ifdef PGMPOOL_WITH_USER_TRACKING
             /*
@@ -1822 +1858 @@
                 if (RT_SUCCESS(rc))
                 {
+# ifdef VBOX_WITH_NEW_PHYS_CODE
+                    /* Try make the page writable if necessary. */
+                    if (    PdeSrc.n.u1Write
+                        &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED
+                        &&  PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM)
+                    {
+                        rc = pgmPhysPageMakeWritableUnlocked(pVM, pPage, GCPhys);
+                        AssertRC(rc);
+                    }
+# endif
+
                     /*
                      * Make shadow PTE entry.
@@ -1840 +1887 @@
                         PGM_BTH_NAME(SyncPageWorkerTrackAddref)(pVM, pShwPage, PGM_PAGE_GET_TRACKING(pPage), pPage, iPTDst);
 # endif
+# ifdef VBOX_WITH_NEW_PHYS_CODE
+                    /* Make sure only allocated pages are mapped writable. */
+                    if (    PteDst.n.u1Write
+                        &&  PteDst.n.u1Present
+                        &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED)
+                        PteDst.n.u1Write = 0;   /** @todo this isn't quite working yet... */
+# endif
+
                     pPTDst->a[iPTDst] = PteDst;
 
@@ -2697 +2752 @@
                         SHWPTE      PteDst;
 
-# ifndef VBOX_WITH_NEW_PHYS_CODE
+# ifdef VBOX_WITH_NEW_PHYS_CODE
+                        /* Try make the page writable if necessary. */
+                        if (    PteDstBase.n.u1Write
+                            &&  PGM_PAGE_GET_STATE(pPage) != PGM_PAGE_STATE_ALLOCATED
+                            &&  PGM_PAGE_GET_TYPE(pPage)  == PGMPAGETYPE_RAM)
+                        {
+                            rc = pgmPhysPageMakeWritableUnlocked(pVM, pPage, GCPhys);
+                            AssertRCReturn(rc, rc);
+                        }
+# else  /* !VBOX_WITH_NEW_PHYS_CODE */
                         /* Make sure the RAM has already been allocated. */
                         if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)  /** @todo PAGE FLAGS */

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

@@ -462 +462 @@
             return pgmPhysAllocPage(pVM, pPage, GCPhys);
     }
+}
+
+
+/**
+ * Wrapper for pgmPhysPageMakeWritable which enters the critsect.
+ *
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS on success.
+ * @retval  VERR_PGM_PHYS_PAGE_RESERVED it it's a valid page but has no physical backing.
+ *
+ * @param   pVM         The VM address.
+ * @param   pPage       The physical page tracking structure.
+ * @param   GCPhys      The address of the page.
+ */
+int pgmPhysPageMakeWritableUnlocked(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys)
+{
+    int rc = pgmLock(pVM);
+    if (RT_SUCCESS(rc))
+    {
+        rc = pgmPhysPageMakeWritable(pVM, pPage, GCPhys);
+        pgmUnlock(pVM);
+    }
+    return rc;
 }