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

Timestamp:

Oct 21, 2019 8:21:43 PM (5 years ago)

Author:

vboxsync

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

134151

Message:

IOM: Replaced IOMMMIOPhysHandler with the new version. bugref:9218

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IOMAllMMIO.cpp (modified) (1 diff)
• VMMAll/IOMAllMmioNew.cpp (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)
• VMMR3/IOM.cpp (modified) (2 diffs)

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

@@ -698 +698 @@
 
 /**
- * Physical access handler for MMIO ranges.
- *
- * @returns VBox status code (appropriate for GC return).
- * @param   pVM         The cross context VM structure.
- * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
- * @param   uErrorCode  CPU Error code.
- * @param   pCtxCore    Trap register frame.
- * @param   GCPhysFault The GC physical address.
- */
-VMMDECL(VBOXSTRICTRC) IOMMMIOPhysHandler(PVMCC pVM, PVMCPUCC pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pCtxCore, RTGCPHYS GCPhysFault)
-{
-    /*
-     * We don't have a range here, so look it up before calling the common function.
-     */
-    int rc2 = IOM_LOCK_SHARED(pVM); NOREF(rc2);
-#ifndef IN_RING3
-    if (rc2 == VERR_SEM_BUSY)
-        return VINF_IOM_R3_MMIO_READ_WRITE;
-#endif
-    PIOMMMIORANGE pRange = iomMmioGetRange(pVM, pVCpu, GCPhysFault);
-    if (RT_UNLIKELY(!pRange))
-    {
-        IOM_UNLOCK_SHARED(pVM);
-        return VERR_IOM_MMIO_RANGE_NOT_FOUND;
-    }
-    iomMmioRetainRange(pRange);
-    IOM_UNLOCK_SHARED(pVM);
-
-    VBOXSTRICTRC rcStrict = iomMmioCommonPfHandlerOld(pVM, pVCpu, (uint32_t)uErrorCode, pCtxCore, GCPhysFault, pRange);
-
-    iomMmioReleaseRange(pVM, pRange);
-    return VBOXSTRICTRC_VAL(rcStrict);
-}
-
-
-/**
  * @callback_method_impl{FNPGMPHYSHANDLER, MMIO page accesses}
  *

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

@@ -742 +742 @@
  * @param   GCPhysFault The GC physical address.
  */
-VMM_INT_DECL(VBOXSTRICTRC) IOMMmioPhysHandlerNew(PVMCC pVM, PVMCPUCC pVCpu, uint32_t uErrorCode, RTGCPHYS GCPhysFault)
+VMM_INT_DECL(VBOXSTRICTRC) IOMR0MmioPhysHandler(PVMCC pVM, PVMCPUCC pVCpu, uint32_t uErrorCode, RTGCPHYS GCPhysFault)
 {
     STAM_COUNTER_INC(&pVM->iom.s.StatMmioPhysHandlerNew);

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -15486 +15486 @@
                  VMX_EXIT_QUAL_APIC_ACCESS_OFFSET(pVmxTransient->uExitQual)));
 
-            PVMCC      pVM  = pVCpu->CTX_SUFF(pVM);
-            PCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
-            rcStrict = IOMMMIOPhysHandler(pVM, pVCpu,
-                                          uAccessType == VMX_APIC_ACCESS_TYPE_LINEAR_READ ? 0 : X86_TRAP_PF_RW,
-                                          CPUMCTX2CORE(pCtx), GCPhys);
+            rcStrict = IOMR0MmioPhysHandler(pVCpu->CTX_SUFF(pVM), pVCpu,
+                                            uAccessType == VMX_APIC_ACCESS_TYPE_LINEAR_READ ? 0 : X86_TRAP_PF_RW, GCPhys);
             Log4Func(("IOMMMIOPhysHandler returned %Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
             if (   rcStrict == VINF_SUCCESS

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

@@ -221 +221 @@
     STAM_REG(pVM, &pVM->iom.s.StatMmioHandlerNewR3,   STAMTYPE_COUNTER, "/IOM/MmioHandlerNewR3",                    STAMUNIT_OCCURENCES,     "Number of calls to iomMmioHandlerNew from ring-3.");
     STAM_REG(pVM, &pVM->iom.s.StatMmioHandlerNewR0,   STAMTYPE_COUNTER, "/IOM/MmioHandlerNewR0",                    STAMUNIT_OCCURENCES,     "Number of calls to iomMmioHandlerNew from ring-0.");
-    STAM_REG(pVM, &pVM->iom.s.StatMmioPfHandlerNew,   STAMTYPE_COUNTER, "/IOM/MmioPfHandlerNew",                    STAMUNIT_OCCURENCES,     "Number of calls to iomMmioPfHandlerNew from ring-3.");
-    STAM_REG(pVM, &pVM->iom.s.StatMmioPhysHandlerNew, STAMTYPE_COUNTER, "/IOM/MmioPhysHandlerNew",                  STAMUNIT_OCCURENCES,     "Number of calls to iomMmioPhysHandler from ring-3.");
+    STAM_REG(pVM, &pVM->iom.s.StatMmioPfHandlerNew,   STAMTYPE_COUNTER, "/IOM/MmioPfHandlerNew",                    STAMUNIT_OCCURENCES,     "Number of calls to iomMmioPfHandlerNew.");
+    STAM_REG(pVM, &pVM->iom.s.StatMmioPhysHandlerNew, STAMTYPE_COUNTER, "/IOM/MmioPhysHandlerNew",                  STAMUNIT_OCCURENCES,     "Number of calls to IOMR0MmioPhysHandler.");
 
     /* Redundant, but just in case we change something in the future */
@@ -1913 +1913 @@
         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
+        /** @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. */