Changeset 81436 in vbox for trunk

Timestamp:

Oct 22, 2019 7:27:02 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134154

Message:

PGMPhys: A REM removal cleanup. bugref:9576

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• IOM.cpp (modified) (1 diff)
• PGMPhys.cpp (modified) (1 diff)

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

@@ -1913 +1913 @@
         Log5(("IOM: Dispatching pending MMIO write: %RGp LB %#x\n",
               pVCpu->iom.s.PendingMmioWrite.GCPhys, pVCpu->iom.s.PendingMmioWrite.cbValue));
+
+        /* Use new MMIO handle hint and bypass PGM if it still looks right. */
+        size_t idxMmioRegionHint = pVCpu->iom.s.PendingMmioWrite.idxMmioRegionHint;
+        if (idxMmioRegionHint < pVM->iom.s.cMmioRegs)
+        {
+            PIOMMMIOENTRYR3 pRegEntry    = &pVM->iom.s.paMmioRegs[idxMmioRegionHint];
+            RTGCPHYS const GCPhysMapping = pRegEntry->GCPhysMapping;
+            RTGCPHYS const offRegion     = pVCpu->iom.s.PendingMmioWrite.GCPhys - GCPhysMapping;
+            if (offRegion < pRegEntry->cbRegion && GCPhysMapping != NIL_RTGCPHYS)
+            {
+                rcStrict = iomMmioDoWrite(pVM, pVCpu, pRegEntry, GCPhysFault, offRegion, pvBuf, (uint32_t)cbBuf IOM_MMIO_STATS_COMMA_ARG);
+                PDMCritSectLeave(pDevIns->CTX_SUFF(pCritSectRo));
+    #ifndef IN_RING3
+                if (rcStrict == VINF_IOM_R3_MMIO_WRITE)
+                    rcStrict = iomMmioRing3WritePending(pVCpu, GCPhysFault, pvBuf, cbBuf, pRegEntry->idxSelf);
+                if (rcStrict == VINF_IOM_R3_MMIO_WRITE)
+                {
+                    STAM_COUNTER_INC(&pStats->WriteRZToR3);
+                    STAM_COUNTER_INC(&pVM->iom.s.StatRZMMIOWritesToR3);
+                }
+                else if (rcStrict == VINF_IOM_R3_MMIO_COMMIT_WRITE)
+                {
+                    STAM_COUNTER_INC(&pStats->CommitRZToR3);
+                    STAM_COUNTER_INC(&pVM->iom.s.StatRZMMIOCommitsToR3);
+                }
+                else
+    #endif
+                    STAM_COUNTER_INC(&pStats->Writes);
+                STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfWrite), Prf);
+            }
+        }
+
         /** @todo Try optimize this some day?  Currently easier and more correct to
          *        involve PGM here since we never know if the MMIO area is still mapped

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

@@ -4236 +4236 @@
             rc = NEMR3NotifyPhysRomRegisterEarly(pVM, GCPhys, cb, fNemNotify);
 
-            /*
-             * !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).
-             */
-            if (fFlags & PGMPHYS_ROM_FLAGS_SHADOWED)
-            {
-                if (RT_SUCCESS(rc))
-                    rc = PGMHandlerPhysicalRegister(pVM, GCPhys, GCPhysLast, pVM->pgm.s.hRomPhysHandlerType,
-                                                    pRomNew, MMHyperCCToR0(pVM, pRomNew), MMHyperCCToRC(pVM, pRomNew),
-                                                    pszDesc);
-            }
-            else
-            {
-                if (RT_SUCCESS(rc))
-                    rc = PGMHandlerPhysicalRegister(pVM, GCPhys, GCPhysLast, pVM->pgm.s.hRomPhysHandlerType,
-                                                    pRomNew, MMHyperCCToR0(pVM, pRomNew), MMHyperCCToRC(pVM, pRomNew),
-                                                    pszDesc);
-            }
+            /* Register the ROM access handler. */
+            if (RT_SUCCESS(rc))
+                rc = PGMHandlerPhysicalRegister(pVM, GCPhys, GCPhysLast, pVM->pgm.s.hRomPhysHandlerType,
+                                                pRomNew, MMHyperCCToR0(pVM, pRomNew), MMHyperCCToRC(pVM, pRomNew),
+                                                pszDesc);
             if (RT_SUCCESS(rc))
             {