Changeset 47421 in vbox

Timestamp:

Jul 26, 2013 12:15:44 PM (12 years ago)

Author:

vboxsync

Message:

VMM: Use IEM for I/O that's been deferred to ring-3.

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (7 diffs)
• VMMR3/EM.cpp (modified) (1 diff)
• VMMR3/EMHM.cpp (modified) (2 diffs)
• VMMR3/EMRaw.cpp (modified) (2 diffs)
• include/EMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/Makefile.kmk

@@ -33 +33 @@
 # Can be prepended to by setting it in LocalConfig.kmk
 VMM_COMMON_DEFS ?= VBOX_IN_VMM
+ifdef VBOX_WITH_FIRST_IEM_STEP
+ VMM_COMMON_DEFS += VBOX_WITH_FIRST_IEM_STEP
+endif
 ifdef VBOX_WITH_IEM
  VMM_COMMON_DEFS += VBOX_WITH_IEM
@@ -187 +190 @@
         VMMAll/DBGFAll.cpp \
         VMMAll/HMAll.cpp \
+        VMMAll/IEMAll.cpp \
+        VMMAll/IEMAllAImpl.asm \
+        VMMAll/IEMAllAImplC.cpp \
         VMMAll/IOMAll.cpp \
         VMMAll/IOMAllMMIO.cpp \
@@ -207 +213 @@
         VMMAll/EMAllA.asm \
         VMMAll/FTMAll.cpp \
-        VMMAll/IEMAll.cpp \
-        VMMAll/IEMAllAImpl.asm \
-        VMMAll/IEMAllAImplC.cpp \
         VMMAll/TMAll.cpp \
         VMMAll/TMAllCpu.cpp \
@@ -437 +440 @@
         VMMAll/CPUMAllA.asm \
         VMMAll/DBGFAll.cpp \
-        VMMAll/IOMAll.cpp \
+        VMMAll/IEMAll.cpp \
+        VMMAll/IEMAllAImpl.asm \
+        VMMAll/IEMAllAImplC.cpp \
+        VMMAll/IOMAll.cpp \
         VMMAll/IOMAllMMIO.cpp \
         VMMAll/EMAll.cpp \
@@ -474 +480 @@
   VMMRC_SOURCES += $(VMMRCImp_0_OUTDIR)/VMMRC.def
  endif
- ifdef VBOX_WITH_IEM
-  VMMRC_SOURCES += \
-        VMMAll/IEMAll.cpp \
-        VMMAll/IEMAllAImpl.asm \
-        VMMAll/IEMAllAImplC.cpp
- endif
 
  # the very last one.
@@ -549 +549 @@
         VMMAll/FTMAll.cpp \
         VMMAll/HMAll.cpp \
+        VMMAll/IEMAll.cpp \
+        VMMAll/IEMAllAImpl.asm \
+        VMMAll/IEMAllAImplC.cpp \
         VMMAll/IOMAll.cpp \
         VMMAll/IOMAllMMIO.cpp \
@@ -581 +584 @@
         VMMR0/VMMR0TripleFaultHack.cpp \
         VMMR0/VMMR0TripleFaultHackA.asm
- endif
- ifdef VBOX_WITH_IEM
-  VMMR0_SOURCES += \
-        VMMAll/IEMAll.cpp \
-        VMMAll/IEMAllAImpl.asm \
-        VMMAll/IEMAllAImplC.cpp
  endif
  ifdef VBOX_WITH_NETSHAPER

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

@@ -383 +383 @@
         EM_REG_COUNTER_USED(&pStats->StatR3FailedPrefix,         "/EM/CPU%d/R3/Interpret/Failed/Prefix",     "The number of rejections because of prefix .");
 
+        EM_REG_COUNTER_USED(&pStats->StatIoRestarted,            "/EM/CPU%d/R3/PrivInst/IoRestarted",        "I/O instructions restarted in ring-3.");
+# ifdef VBOX_WITH_FIRST_IEM_STEP
+        EM_REG_COUNTER_USED(&pStats->StatIoIem,                  "/EM/CPU%d/R3/PrivInst/IoIem",              "I/O instructions end to IEM in ring-3.");
+# else
+        EM_REG_COUNTER_USED(&pStats->StatIn,                     "/EM/CPU%d/R3/PrivInst/In",                 "Number of in instructions.");
+        EM_REG_COUNTER_USED(&pStats->StatOut,                    "/EM/CPU%d/R3/PrivInst/Out",                "Number of out instructions.");
+# endif
         EM_REG_COUNTER_USED(&pStats->StatCli,                    "/EM/CPU%d/R3/PrivInst/Cli",                "Number of cli instructions.");
         EM_REG_COUNTER_USED(&pStats->StatSti,                    "/EM/CPU%d/R3/PrivInst/Sti",                "Number of sli instructions.");
-        EM_REG_COUNTER_USED(&pStats->StatIn,                     "/EM/CPU%d/R3/PrivInst/In",                 "Number of in instructions.");
-        EM_REG_COUNTER_USED(&pStats->StatOut,                    "/EM/CPU%d/R3/PrivInst/Out",                "Number of out instructions.");
-        EM_REG_COUNTER_USED(&pStats->StatIoRestarted,            "/EM/CPU%d/R3/PrivInst/IoRestarted",        "Number of restarted i/o instructions.");
         EM_REG_COUNTER_USED(&pStats->StatHlt,                    "/EM/CPU%d/R3/PrivInst/Hlt",                "Number of hlt instructions not handled in GC because of PATM.");
         EM_REG_COUNTER_USED(&pStats->StatInvlpg,                 "/EM/CPU%d/R3/PrivInst/Invlpg",             "Number of invlpg instructions.");

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

@@ -299 +299 @@
                     RT_SUCCESS_NP(rcStrict) ? VERR_IPE_UNEXPECTED_INFO_STATUS : VBOXSTRICTRC_TODO(rcStrict));
 
+#ifdef VBOX_WITH_FIRST_IEM_STEP
+    /* Hand it over to the interpreter. */
+    rcStrict = IEMExecOne(pVCpu);
+    LogFlow(("emR3ExecuteIOInstruction: %Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+    STAM_COUNTER_INC(&pVCpu->em.s.CTX_SUFF(pStats)->StatIoIem);
+    STAM_PROFILE_STOP(&pVCpu->em.s.StatIOEmu, a);
+    return VBOXSTRICTRC_TODO(rcStrict);
+
+#else
     /** @todo probably we should fall back to the recompiler; otherwise we'll go back and forth between HC & GC
      *   as io instructions tend to come in packages of more than one
@@ -379 +388 @@
     STAM_PROFILE_STOP(&pVCpu->em.s.StatIOEmu, a);
     return emR3ExecuteInstruction(pVM, pVCpu, "IO: ");
+#endif
 }
 

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

@@ -415 +415 @@
 static int emR3ExecuteIOInstruction(PVM pVM, PVMCPU pVCpu)
 {
+#ifdef VBOX_WITH_FIRST_IEM_STEP
+    STAM_PROFILE_START(&pVCpu->em.s.StatIOEmu, a);
+
+    /* Hand it over to the interpreter. */
+    VBOXSTRICTRC rcStrict = IEMExecOne(pVCpu);
+    LogFlow(("emR3ExecuteIOInstruction: %Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+    STAM_COUNTER_INC(&pVCpu->em.s.CTX_SUFF(pStats)->StatIoIem);
+    STAM_PROFILE_STOP(&pVCpu->em.s.StatIOEmu, a);
+    return VBOXSTRICTRC_TODO(rcStrict);
+
+#else
     PCPUMCTX pCtx = pVCpu->em.s.pCtx;
 
@@ -497 +508 @@
     STAM_PROFILE_STOP(&pVCpu->em.s.StatIOEmu, a);
     return emR3ExecuteInstruction(pVM, pVCpu, "IO: ");
+#endif
 }
 

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

@@ -266 +266 @@
     /** @name Privileged Instructions Ending Up In HC.
      * @{ */
+    STAMCOUNTER             StatIoRestarted;
+#ifdef VBOX_WITH_FIRST_IEM_STEP
+    STAMCOUNTER             StatIoIem;
+#else
+    STAMCOUNTER             StatIn;
+    STAMCOUNTER             StatOut;
+#endif
     STAMCOUNTER             StatCli;
     STAMCOUNTER             StatSti;
-    STAMCOUNTER             StatIn;
-    STAMCOUNTER             StatIoRestarted;
-    STAMCOUNTER             StatOut;
     STAMCOUNTER             StatInvlpg;
     STAMCOUNTER             StatHlt;