Changeset 60852 in vbox for trunk

Timestamp:

May 5, 2016 5:47:40 PM (9 years ago)

Author:

vboxsync

Message:

IOM: New way of defer RC+R0 MMIO writes (only used for IEM accesses).

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IOMAll.cpp (modified) (1 diff)
• VMMAll/IOMAllMMIO.cpp (modified) (11 diffs)
• VMMR3/IOM.cpp (modified) (4 diffs)

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

@@ -439 +439 @@
 static VBOXSTRICTRC iomIOPortRing3WritePending(PVMCPU pVCpu, RTIOPORT Port, uint32_t u32Value, size_t cbValue)
 {
+    Log(("iomIOPortRing3WritePending: %#x LB %u -> %RTiop\n", u32Value, cbValue, Port));
     AssertReturn(pVCpu->iom.s.PendingIOPortWrite.cbValue == 0, VERR_IOM_IOPORT_IPE_1);
     pVCpu->iom.s.PendingIOPortWrite.IOPort   = Port;

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

@@ -234 +234 @@
     return false;
 }
+
+
+#ifndef IN_RING3
+/**
+ * Defers a pending MMIO write to ring-3.
+ *
+ * @returns VINF_IOM_R3_MMIO_COMMIT_WRITE
+ * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
+ * @param   GCPhys      The write address.
+ * @param   pvBuf       The bytes being written.
+ * @param   cbBuf       How many bytes.
+ * @param   pRange      The range, if resolved.
+ */
+static VBOXSTRICTRC iomMmioRing3WritePending(PVMCPU pVCpu, RTGCPHYS GCPhys, void const *pvBuf, size_t cbBuf, PIOMMMIORANGE pRange)
+{
+    Log3(("iomMmioRing3WritePending: %RGp LB %#x\n", GCPhys, cbBuf));
+    AssertReturn(pVCpu->iom.s.PendingMmioWrite.cbValue == 0, VERR_IOM_MMIO_IPE_1);
+    pVCpu->iom.s.PendingMmioWrite.GCPhys  = GCPhys;
+    AssertReturn(cbBuf <= sizeof(pVCpu->iom.s.PendingMmioWrite.abValue), VERR_IOM_MMIO_IPE_2);
+    pVCpu->iom.s.PendingMmioWrite.cbValue = (uint32_t)cbBuf;
+    memcpy(pVCpu->iom.s.PendingMmioWrite.abValue, pvBuf, cbBuf);
+    VMCPU_FF_SET(pVCpu, VMCPU_FF_IOM);
+    return VINF_IOM_R3_MMIO_COMMIT_WRITE;
+}
+#endif
 
 
@@ -331 +356 @@
                      * could be kind of screwed here...
                      *
-                     * Fix: Save the current state and resume it in ring-3. Requires EM to not go
-                     *      to REM for MMIO accesses (like may currently do). */
-
+                     * Fix: VINF_IOM_R3_IOPORT_COMMIT_WRITE (part 2) */
                     LogFlow(("iomMMIODoComplicatedWrite: GCPhys=%RGp GCPhysStart=%RGp cbValue=%u rc=%Rrc [read]\n", GCPhys, GCPhysStart, cbValue, rc2));
                     return rc2;
@@ -401 +424 @@
                  * kind of screwed here...
                  *
-                 * Fix: Save the current state and resume it in ring-3. Requires EM to not go
-                 *      to REM for MMIO accesses (like may currently do). */
+                 * Fix: VINF_IOM_R3_IOPORT_COMMIT_WRITE (part 2) */
                 LogFlow(("iomMMIODoComplicatedWrite: GCPhys=%RGp GCPhysStart=%RGp cbValue=%u rc=%Rrc [write]\n", GCPhys, GCPhysStart, cbValue, rc2));
                 return rc2;
@@ -1999 +2021 @@
 #ifndef IN_RING3
     if (rc == VERR_SEM_BUSY)
-        return VINF_IOM_R3_MMIO_READ_WRITE;
+    {
+        if (enmAccessType == PGMACCESSTYPE_READ)
+            return VINF_IOM_R3_MMIO_READ;
+        Assert(enmAccessType == PGMACCESSTYPE_WRITE);
+        return iomMmioRing3WritePending(pVCpu, GCPhysFault, pvBuf, cbBuf, NULL /*pRange*/);
+    }
 #endif
     AssertRC(rc);
@@ -2019 +2046 @@
             rcStrict = iomMMIODoRead(pVM, pVCpu, pRange, GCPhysFault, pvBuf, (unsigned)cbBuf);
         else
+        {
             rcStrict = iomMMIODoWrite(pVM, pVCpu, pRange, GCPhysFault, pvBuf, (unsigned)cbBuf);
+#ifndef IN_RING3
+            if (rcStrict == VINF_IOM_R3_MMIO_WRITE)
+                rcStrict = iomMmioRing3WritePending(pVCpu, GCPhysFault, pvBuf, cbBuf, pRange);
+#endif
+        }
 
         /* Check the return code. */
@@ -2027 +2060 @@
         AssertMsg(   rcStrict == VINF_SUCCESS
                   || rcStrict == (enmAccessType == PGMACCESSTYPE_READ ? VINF_IOM_R3_MMIO_READ :  VINF_IOM_R3_MMIO_WRITE)
+                  || (rcStrict == VINF_IOM_R3_MMIO_COMMIT_WRITE && enmAccessType == PGMACCESSTYPE_WRITE)
                   || rcStrict == VINF_IOM_R3_MMIO_READ_WRITE
                   || rcStrict == VINF_EM_DBG_STOP
@@ -2043 +2077 @@
         PDMCritSectLeave(pDevIns->CTX_SUFF(pCritSectRo));
     }
+#ifdef IN_RING3
     else
         iomMmioReleaseRange(pVM, pRange);
+#else
+    else
+    {
+        if (rcStrict == VINF_IOM_R3_MMIO_READ_WRITE)
+        {
+            if (enmAccessType == PGMACCESSTYPE_READ)
+                rcStrict = VINF_IOM_R3_MMIO_READ;
+            else
+            {
+                Assert(enmAccessType == PGMACCESSTYPE_WRITE);
+                rcStrict = iomMmioRing3WritePending(pVCpu, GCPhysFault, pvBuf, cbBuf, pRange);
+            }
+        }
+        iomMmioReleaseRange(pVM, pRange);
+    }
+#endif
     return rcStrict;
 }
@@ -2064 +2115 @@
 VMMDECL(VBOXSTRICTRC) IOMMMIORead(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, uint32_t *pu32Value, size_t cbValue)
 {
+    Assert(pVCpu->iom.s.PendingMmioWrite.cbValue == 0);
     /* Take the IOM lock before performing any MMIO. */
     VBOXSTRICTRC rc = IOM_LOCK_SHARED(pVM);
@@ -2196 +2248 @@
 VMMDECL(VBOXSTRICTRC) IOMMMIOWrite(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, uint32_t u32Value, size_t cbValue)
 {
+    Assert(pVCpu->iom.s.PendingMmioWrite.cbValue == 0);
     /* Take the IOM lock before performing any MMIO. */
     VBOXSTRICTRC rc = IOM_LOCK_SHARED(pVM);
@@ -2321 +2374 @@
 {
     STAM_COUNTER_INC(&pVM->iom.s.StatInstIns);
+    Assert(pVCpu->iom.s.PendingMmioWrite.cbValue == 0);
 
     /*
@@ -2487 +2541 @@
 {
     STAM_COUNTER_INC(&pVM->iom.s.StatInstOuts);
+    Assert(pVCpu->iom.s.PendingMmioWrite.cbValue == 0);
 
     /*

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

@@ -86 +86 @@
  * mapped into the physical memory address space, it can be accessed in a number
  * of ways thru PGM.
+ *
+ *
+ * @section sec_iom_logging     Logging Levels
+ *
+ * Following assignments:
+ *      - Level 5 is used for defering I/O port and MMIO writes to ring-3.
  *
  */
@@ -1731 +1737 @@
     if (pVCpu->iom.s.PendingIOPortWrite.cbValue)
     {
+        Log5(("IOM: Dispatching pending I/O port write: %#x LB %u -> %RTiop\n", pVCpu->iom.s.PendingIOPortWrite.u32Value,
+              pVCpu->iom.s.PendingMmioWrite.cbValue, pVCpu->iom.s.PendingIOPortWrite.IOPort));
         VBOXSTRICTRC rcStrictCommit = IOMIOPortWrite(pVM, pVCpu, pVCpu->iom.s.PendingIOPortWrite.IOPort,
                                                      pVCpu->iom.s.PendingIOPortWrite.u32Value,
@@ -1741 +1749 @@
     if (pVCpu->iom.s.PendingMmioWrite.cbValue)
     {
+        Log5(("IOM: Dispatching pending MMIO write: %RGp LB %#x\n",
+              pVCpu->iom.s.PendingMmioWrite.GCPhys, pVCpu->iom.s.PendingMmioWrite.cbValue));
         /** @todo Try optimize this some day?  Currently easier and correcter to
          *        involve PGM here since we never know if the MMIO area is still mapped
@@ -1747 +1757 @@
                                                    pVCpu->iom.s.PendingMmioWrite.abValue, pVCpu->iom.s.PendingMmioWrite.cbValue,
                                                    PGMACCESSORIGIN_IOM);
-        pVCpu->iom.s.PendingIOPortWrite.cbValue = 0;
+        pVCpu->iom.s.PendingMmioWrite.cbValue = 0;
         rcStrict = iomR3MergeStatus(rcStrict, rcStrictCommit, VINF_IOM_R3_MMIO_COMMIT_WRITE, pVCpu);
     }