Changeset 81462 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 22, 2019 9:10:18 PM (5 years ago)

Author:

vboxsync

Message:

IOM: Ring-3 commit optimization. bugref:9218

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IOMAllMmioNew.cpp (modified) (1 diff)
• VMMR3/IOM.cpp (modified) (2 diffs)
• include/IOMInternal.h (modified) (1 diff)

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

@@ -357 +357 @@
 
 
+#ifdef IN_RING3
+/**
+ * Helper for IOMR3ProcessForceFlag() that lives here to utilize iomMmioDoWrite et al.
+ */
+VBOXSTRICTRC iomR3MmioCommitWorker(PVM pVM, PVMCPU pVCpu, PIOMMMIOENTRYR3 pRegEntry, RTGCPHYS offRegion)
+{
+# ifdef VBOX_WITH_STATISTICS
+    STAM_PROFILE_START(UnusedMacroArg, Prf);
+    PIOMMMIOSTATSENTRY const pStats = iomMmioGetStats(pVM, pRegEntry);
+# endif
+    PPDMDEVINS const         pDevIns = pRegEntry->pDevIns;
+    int rc = PDMCritSectEnter(pDevIns->CTX_SUFF(pCritSectRo), VERR_IGNORED);
+    AssertRCReturn(rc, rc);
+
+    VBOXSTRICTRC rcStrict = iomMmioDoWrite(pVM, pVCpu, pRegEntry, pVCpu->iom.s.PendingMmioWrite.GCPhys, offRegion,
+                                           pVCpu->iom.s.PendingMmioWrite.abValue, pVCpu->iom.s.PendingMmioWrite.cbValue
+                                           IOM_MMIO_STATS_COMMA_ARG);
+
+    PDMCritSectLeave(pDevIns->CTX_SUFF(pCritSectRo));
+    STAM_PROFILE_STOP(&pStats->ProfWriteR3, Prf);
+    return rcStrict;
+}
+#endif /* IN_RING3 */
+
+
 /**
  * Deals with complicated MMIO reads.

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

@@ -1914 +1914 @@
               pVCpu->iom.s.PendingMmioWrite.GCPhys, pVCpu->iom.s.PendingMmioWrite.cbValue));
 
-#if 0
         /* Use new MMIO handle hint and bypass PGM if it still looks right. */
         size_t idxMmioRegionHint = pVCpu->iom.s.PendingMmioWrite.idxMmioRegionHint;
@@ -1924 +1923 @@
             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));
-                STAM_COUNTER_INC(&pStats->Writes);
-                STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfWrite), Prf);
+                VBOXSTRICTRC rcStrictCommit = iomR3MmioCommitWorker(pVM, pVCpu, pRegEntry, offRegion);
+                pVCpu->iom.s.PendingMmioWrite.cbValue = 0;
+                return iomR3MergeStatus(rcStrict, rcStrictCommit, VINF_IOM_R3_MMIO_COMMIT_WRITE, pVCpu);
             }
         }
-#endif
-
-        /** @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
-         *        to the same location as when we wrote to it in RC/R0 context. */
+
+        /* Fall back on PGM. */
         VBOXSTRICTRC rcStrictCommit = PGMPhysWrite(pVM, pVCpu->iom.s.PendingMmioWrite.GCPhys,
                                                    pVCpu->iom.s.PendingMmioWrite.abValue, pVCpu->iom.s.PendingMmioWrite.cbValue,

trunk/src/VBox/VMM/include/IOMInternal.h

@@ -853 +853 @@
 DECLCALLBACK(void)  iomR3MmioInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 void                iomR3MmioRegStats(PVM pVM, PIOMMMIOENTRYR3 pRegEntry);
+VBOXSTRICTRC        iomR3MmioCommitWorker(PVM pVM, PVMCPU pVCpu, PIOMMMIOENTRYR3 pRegEntry, RTGCPHYS offRegion); /* IOMAllMmioNew.cpp */
 #endif /* IN_RING3 */
 #ifdef IN_RING0