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

Timestamp:

Jul 18, 2018 1:00:43 PM (7 years ago)

Author:

vboxsync

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

123808

Message:

VMM, Devices: bugref:9193 Remove unused code after using EMRZSetPendingIoPort[Read|Write].

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAll.cpp (modified) (1 diff)
• VMMAll/IOMAllMMIO.cpp (modified) (1 diff)
• VMMAll/PGMAllPhys.cpp (modified) (2 diffs)
• VMMR0/PDMR0Device.cpp (modified) (2 diffs)
• VMMR0/VMMR0.cpp (modified) (1 diff)
• VMMR3/EMHM.cpp (modified) (3 diffs)
• VMMR3/HM.cpp (modified) (3 diffs)
• VMMR3/VMM.cpp (modified) (1 diff)
• include/EMHandleRCTmpl.h (modified) (1 diff)
• include/HMInternal.h (modified) (1 diff)
• include/VMMInternal.h (modified) (1 diff)

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

@@ -13610 +13610 @@
                       || rcStrict == VINF_EM_RAW_EMULATE_INSTR
                       || rcStrict == VINF_EM_RAW_TO_R3
-                      || rcStrict == VINF_EM_RAW_EMULATE_IO_BLOCK
                       || rcStrict == VINF_EM_TRIPLE_FAULT
                       || rcStrict == VINF_GIM_R3_HYPERCALL

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

@@ -818 +818 @@
                   || rcStrict == VINF_EM_SUSPEND
                   || rcStrict == VINF_EM_RESET
-                  || rcStrict == VINF_EM_RAW_EMULATE_IO_BLOCK
                   //|| rcStrict == VINF_EM_HALT       /* ?? */
                   //|| rcStrict == VINF_EM_NO_MEMORY  /* ?? */

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

@@ -76 +76 @@
      || (a_rcStrict) == VINF_IOM_R3_MMIO_READ_WRITE \
      || ((a_rcStrict) == VINF_IOM_R3_MMIO_COMMIT_WRITE && (a_fWrite)) \
-     \
-     || ((a_fWrite) ? (a_rcStrict) == VINF_EM_RAW_EMULATE_IO_BLOCK : false) \
      \
      || (a_rcStrict) == VINF_EM_RAW_EMULATE_INSTR  \
@@ -3112 +3110 @@
  * @retval  VINF_IOM_R3_MMIO_READ_WRITE in RC and R0.
  * @retval  VINF_IOM_R3_MMIO_COMMIT_WRITE in RC and R0.
- *
- * @retval  VINF_EM_RAW_EMULATE_IO_BLOCK in R0 only.
  *
  * @retval  VINF_EM_RAW_EMULATE_INSTR_GDT_FAULT in RC only - write completed.

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

@@ -402 +402 @@
     LogFlow(("pdmR3DevHlp_DBGFTraceBuf: caller='%p'/%d: returns %p\n", pDevIns, pDevIns->iInstance, hTraceBuf));
     return hTraceBuf;
-}
-
-
-/** @interface_method_impl{PDMDEVHLPR0,pfnCanEmulateIoBlock} */
-static DECLCALLBACK(bool) pdmR0DevHlp_CanEmulateIoBlock(PPDMDEVINS pDevIns)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    LogFlow(("pdmR0DevHlp_GetVM: caller='%p'/%d\n", pDevIns, pDevIns->iInstance));
-    return HMCanEmulateIoBlock(VMMGetCpu(pDevIns->Internal.s.pVMR0));
 }
 
@@ -435 +426 @@
     pdmR0DevHlp_PATMSetMMIOPatchInfo,
     pdmR0DevHlp_GetVM,
-    pdmR0DevHlp_CanEmulateIoBlock,
     pdmR0DevHlp_GetVMCPU,
     pdmR0DevHlp_GetCurrentCpuId,

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

@@ -866 +866 @@
             STAM_COUNTER_INC(&pVM->vmm.s.StatRZRetEmulate);
             break;
-        case VINF_EM_RAW_EMULATE_IO_BLOCK:
-            STAM_COUNTER_INC(&pVM->vmm.s.StatRZRetIOBlockEmulate);
-            break;
         case VINF_PATCH_EMULATE_INSTR:
             STAM_COUNTER_INC(&pVM->vmm.s.StatRZRetPatchEmulate);

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

@@ -254 +254 @@
 static int emR3HmExecuteIOInstruction(PVM pVM, PVMCPU pVCpu)
 {
+    RT_NOREF(pVM);
     STAM_PROFILE_START(&pVCpu->em.s.StatIOEmu, a);
 
@@ -262 +263 @@
     {
         /*
-         * Try to restart the io instruction that was refused in ring-0.
-         */
-        rcStrict = HMR3RestartPendingIOInstr(pVM, pVCpu, &pVCpu->cpum.GstCtx);
-        if (IOM_SUCCESS(rcStrict))
-        {
-            STAM_COUNTER_INC(&pVCpu->em.s.CTX_SUFF(pStats)->StatIoRestarted);
-            STAM_PROFILE_STOP(&pVCpu->em.s.StatIOEmu, a);
-            return VBOXSTRICTRC_TODO(rcStrict);     /* rip already updated. */
-        }
-        AssertMsgReturn(rcStrict == VERR_NOT_FOUND, ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)),
-                        RT_SUCCESS_NP(rcStrict) ? VERR_IPE_UNEXPECTED_INFO_STATUS : VBOXSTRICTRC_TODO(rcStrict));
-
-        /*
          * Hand it over to the interpreter.
          */
@@ -285 +273 @@
         RT_UNTRUSTED_VALIDATED_FENCE();
         CPUM_IMPORT_EXTRN_RET(pVCpu, IEM_CPUMCTX_EXTRN_MUST_MASK);
-        Assert(!HMR3HasPendingIOInstr(pVCpu));
         rcStrict = EMHistoryExec(pVCpu, &pVCpu->em.s.aExitRecords[idxContinueExitRec], 0);
         LogFlow(("emR3HmExecuteIOInstruction: %Rrc (EMHistoryExec)\n", VBOXSTRICTRC_VAL(rcStrict)));

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

@@ -2784 +2784 @@
 
 /**
- * Force execution of the current IO code in the recompiler.
- *
- * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
- * @param   pCtx        Partial VM execution context.
- */
-VMMR3_INT_DECL(int) HMR3EmulateIoBlock(PVM pVM, PCPUMCTX pCtx)
-{
-    PVMCPU pVCpu = VMMGetCpu(pVM);
-
-    Assert(HMIsEnabled(pVM));
-    Log(("HMR3EmulateIoBlock\n"));
-
-    /* This is primarily intended to speed up Grub, so we don't care about paged protected mode. */
-    if (HMCanEmulateIoBlockEx(pCtx))
-    {
-        Log(("HMR3EmulateIoBlock -> enabled\n"));
-        pVCpu->hm.s.EmulateIoBlock.fEnabled         = true;
-        pVCpu->hm.s.EmulateIoBlock.GCPtrFunctionEip = pCtx->rip;
-        pVCpu->hm.s.EmulateIoBlock.cr0              = pCtx->cr0;
-        return VINF_EM_RESCHEDULE_REM;
-    }
-    return VINF_SUCCESS;
-}
-
-
-/**
  * Checks if we can currently use hardware accelerated raw mode.
  *
@@ -2830 +2803 @@
     }
 #endif
-
-    /* If we're still executing the IO code, then return false. */
-    if (   RT_UNLIKELY(pVCpu->hm.s.EmulateIoBlock.fEnabled)
-        && pCtx->rip <  pVCpu->hm.s.EmulateIoBlock.GCPtrFunctionEip + 0x200
-        && pCtx->rip >  pVCpu->hm.s.EmulateIoBlock.GCPtrFunctionEip - 0x200
-        && pCtx->cr0 == pVCpu->hm.s.EmulateIoBlock.cr0)
-        return false;
-
-    pVCpu->hm.s.EmulateIoBlock.fEnabled = false;
 
     /* AMD-V supports real & protected mode with or without paging. */
@@ -3277 +3241 @@
         && pVM->hm.s.vmx.fEnabled
         && pVM->hm.s.vmx.fUsePreemptTimer;
-}
-
-
-/**
- * Checks if there is an I/O instruction pending.
- *
- * @returns true if pending, false if not.
- * @param   pVCpu       The cross context virtual CPU structure.
- */
-VMMR3_INT_DECL(bool) HMR3HasPendingIOInstr(PVMCPU pVCpu)
-{
-    return pVCpu->hm.s.PendingIO.enmType != HMPENDINGIO_INVALID
-        && pVCpu->hm.s.PendingIO.GCPtrRip == pVCpu->cpum.GstCtx.rip;
-}
-
-
-/**
- * Restart an I/O instruction that was refused in ring-0
- *
- * @returns Strict VBox status code. Informational status codes other than the one documented
- *          here are to be treated as internal failure. Use IOM_SUCCESS() to check for success.
- * @retval  VINF_SUCCESS                Success.
- * @retval  VINF_EM_FIRST-VINF_EM_LAST  Success with some exceptions (see IOM_SUCCESS()), the
- *                                      status code must be passed on to EM.
- * @retval  VERR_NOT_FOUND if no pending I/O instruction.
- *
- * @param   pVM         The cross context VM structure.
- * @param   pVCpu       The cross context virtual CPU structure.
- * @param   pCtx        Pointer to the guest CPU context.
- */
-VMMR3_INT_DECL(VBOXSTRICTRC) HMR3RestartPendingIOInstr(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
-{
-    /*
-     * Check if we've got relevant data pending.
-     */
-    HMPENDINGIO enmType = pVCpu->hm.s.PendingIO.enmType;
-    if (enmType == HMPENDINGIO_INVALID)
-        return VERR_NOT_FOUND;
-    pVCpu->hm.s.PendingIO.enmType = HMPENDINGIO_INVALID;
-    if (pVCpu->hm.s.PendingIO.GCPtrRip != pCtx->rip)
-        return VERR_NOT_FOUND;
-
-    /*
-     * Execute pending I/O.
-     */
-    VBOXSTRICTRC rcStrict;
-    switch (enmType)
-    {
-        case HMPENDINGIO_PORT_READ:
-        {
-            uint32_t uAndVal = pVCpu->hm.s.PendingIO.s.Port.uAndVal;
-            uint32_t u32Val  = 0;
-
-            rcStrict = IOMIOPortRead(pVM, pVCpu, pVCpu->hm.s.PendingIO.s.Port.uPort, &u32Val,
-                                     pVCpu->hm.s.PendingIO.s.Port.cbSize);
-            if (IOM_SUCCESS(rcStrict))
-            {
-                /* Write back to the EAX register. */
-                pCtx->eax = (pCtx->eax & ~uAndVal) | (u32Val & uAndVal);
-                pCtx->rip = pVCpu->hm.s.PendingIO.GCPtrRipNext;
-            }
-            break;
-        }
-
-        default:
-            AssertLogRelFailedReturn(VERR_HM_UNKNOWN_IO_INSTRUCTION);
-    }
-
-    if (IOM_SUCCESS(rcStrict))
-    {
-        /*
-         * Check for I/O breakpoints.
-         */
-        uint32_t const uDr7 = pCtx->dr[7];
-        if (   (   (uDr7 & X86_DR7_ENABLED_MASK)
-                && X86_DR7_ANY_RW_IO(uDr7)
-                && (pCtx->cr4 & X86_CR4_DE))
-            || DBGFBpIsHwIoArmed(pVM))
-        {
-            VBOXSTRICTRC rcStrict2 = DBGFBpCheckIo(pVM, pVCpu, pCtx, pVCpu->hm.s.PendingIO.s.Port.uPort,
-                                                   pVCpu->hm.s.PendingIO.s.Port.cbSize);
-            if (rcStrict2 == VINF_EM_RAW_GUEST_TRAP)
-                rcStrict2 = TRPMAssertTrap(pVCpu, X86_XCPT_DB, TRPM_TRAP);
-            /* rcStrict is VINF_SUCCESS or in [VINF_EM_FIRST..VINF_EM_LAST]. */
-            else if (rcStrict2 != VINF_SUCCESS && (rcStrict == VINF_SUCCESS || rcStrict2 < rcStrict))
-                rcStrict = rcStrict2;
-        }
-    }
-    return rcStrict;
 }
 

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

@@ -519 +519 @@
     STAM_REG(pVM, &pVM->vmm.s.StatRZRetIRETTrap,            STAMTYPE_COUNTER, "/VMM/RZRet/IRETTrap",            STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_IRET_TRAP returns.");
     STAM_REG(pVM, &pVM->vmm.s.StatRZRetEmulate,             STAMTYPE_COUNTER, "/VMM/RZRet/Emulate",             STAMUNIT_OCCURENCES, "Number of VINF_EM_EXECUTE_INSTRUCTION returns.");
-    STAM_REG(pVM, &pVM->vmm.s.StatRZRetIOBlockEmulate,      STAMTYPE_COUNTER, "/VMM/RZRet/EmulateIOBlock",      STAMUNIT_OCCURENCES, "Number of VINF_EM_RAW_EMULATE_IO_BLOCK returns.");
     STAM_REG(pVM, &pVM->vmm.s.StatRZRetPatchEmulate,        STAMTYPE_COUNTER, "/VMM/RZRet/PatchEmulate",        STAMUNIT_OCCURENCES, "Number of VINF_PATCH_EMULATE_INSTR returns.");
     STAM_REG(pVM, &pVM->vmm.s.StatRZRetIORead,              STAMTYPE_COUNTER, "/VMM/RZRet/IORead",              STAMUNIT_OCCURENCES, "Number of VINF_IOM_R3_IOPORT_READ returns.");

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

@@ -253 +253 @@
 
 #ifdef EMHANDLERC_WITH_HM
-        /*
-         * (MM)IO intensive code block detected; fall back to the recompiler for better performance
-         */
-        case VINF_EM_RAW_EMULATE_IO_BLOCK:
-            rc = HMR3EmulateIoBlock(pVM, &pVCpu->cpum.GstCtx);
-            break;
-
         case VINF_EM_HM_PATCH_TPR_INSTR:
             rc = HMR3PatchTprInstr(pVM, pVCpu);

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

@@ -908 +908 @@
         RTGCUINTPTR                 GCPtrFaultAddress;
     } Event;
-
-    /** IO Block emulation state. */
-    struct
-    {
-        bool                    fEnabled;
-        uint8_t                 u8Align[7];
-
-        /** RIP at the start of the io code we wish to emulate in the recompiler. */
-        RTGCPTR                 GCPtrFunctionEip;
-
-        uint64_t                cr0;
-    } EmulateIoBlock;
 
     /* Pending IO operation. */

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

@@ -363 +363 @@
     STAMCOUNTER                 StatRZRetIRETTrap;
     STAMCOUNTER                 StatRZRetEmulate;
-    STAMCOUNTER                 StatRZRetIOBlockEmulate;
     STAMCOUNTER                 StatRZRetPatchEmulate;
     STAMCOUNTER                 StatRZRetIORead;