Changeset 72657 in vbox

Timestamp:

Jun 22, 2018 11:05:11 AM (6 years ago)

Author:

vboxsync

Message:

EM: Make the EMHistoryExec parameters adjustable. bugref:9198

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/EMAll.cpp (modified) (2 diffs)
• VMMR3/EM.cpp (modified) (1 diff)
• include/EMInternal.h (modified) (3 diffs)

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

@@ -472 +472 @@
             VBOXSTRICTRC rcStrict = IEMExecForExits(pVCpu, fWillExit,
                                                     pExitRec->cMaxInstructionsWithoutExit /* cMinInstructions*/,
-                                                    4096 /*cMaxInstructions*/,
+                                                    pVCpu->em.s.cHistoryExecMaxInstructions,
                                                     pExitRec->cMaxInstructionsWithoutExit,
                                                     &ExecStats);
@@ -494 +494 @@
             PEMEXITREC   pExitRecUnconst = (PEMEXITREC)pExitRec;
             VBOXSTRICTRC rcStrict = IEMExecForExits(pVCpu, fWillExit,
-                                                    64 /*cMinInstructions*/,
-                                                    4096 /*cMaxInstructions*/,
-                                                    32 /*cMaxInstructionsWithoutExit*/,
+                                                    pVCpu->em.s.cHistoryProbeMinInstructions,
+                                                    pVCpu->em.s.cHistoryExecMaxInstructions,
+                                                    pVCpu->em.s.cHistoryProbeMaxInstructionsWithoutExit,
                                                     &ExecStats);
             LogFlow(("EMHistoryExec/EXEC_PROBE: %Rrc cExits=%u cMaxExitDistance=%u cInstructions=%u\n",

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

@@ -183 +183 @@
         pVM->aCpus[i].em.s.fExitOptimizationEnabledR0                = fExitOptimizationEnabledR0;
         pVM->aCpus[i].em.s.fExitOptimizationEnabledR0PreemptDisabled = fExitOptimizationEnabledR0PreemptDisabled;
+
+        pVM->aCpus[i].em.s.cHistoryExecMaxInstructions               = 8192;
+        pVM->aCpus[i].em.s.cHistoryProbeMinInstructions              = 48;
+        pVM->aCpus[i].em.s.cHistoryProbeMaxInstructionsWithoutExit   = 24;
+#ifdef RT_OS_WINDOWS
+        if (VM_IS_NEM_ENABLED(pVM))
+        {
+            pVM->aCpus[i].em.s.cHistoryProbeMaxInstructionsWithoutExit = 32;
+            pVM->aCpus[i].em.s.cHistoryProbeMinInstructions            = 64;
+        }
+#endif
     }
 

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

@@ -503 +503 @@
      * wrapped around or not.  */
     uint64_t                iNextExit;
+
+    /** Index into aExitRecords set by EMHistoryExec when returning to ring-3.
+     * This is UINT16_MAX if not armed.  */
+    uint16_t volatile       idxContinueExitRec;
     /** Whether exit optimizations are enabled or not (in general). */
     bool                    fExitOptimizationEnabled : 1;
@@ -510 +514 @@
     bool                    fExitOptimizationEnabledR0PreemptDisabled : 1;
     /** Explicit padding. */
-    bool                    afPadding2[1];
-    /** Index into aExitRecords set by EMHistoryExec when returning to ring-3.
-     * This is UINT16_MAX if not armed.  */
-    uint16_t volatile       idxContinueExitRec;
+    bool                    fPadding2;
+    /** Max number of instructions to execute. */
+    uint16_t                cHistoryExecMaxInstructions;
+    /** Min number of instructions to execute while probing. */
+    uint16_t                cHistoryProbeMinInstructions;
+    /** Max number of instructions to execute without an exit before giving up probe. */
+    uint16_t                cHistoryProbeMaxInstructionsWithoutExit;
+    uint16_t                uPadding3;
     /** Number of exit records in use. */
     uint32_t                cExitRecordUsed;
@@ -522 +530 @@
     /** Number of instructions executed by EMHistoryExec. */
     STAMCOUNTER             StatHistoryExecInstructions;
-    uint64_t                aPadding3[2];
+    uint64_t                uPadding4;
     /** Number of instructions executed by EMHistoryExec when probing. */
     STAMCOUNTER             StatHistoryProbeInstructions;