Changeset 72642 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 21, 2018 3:41:14 PM (7 years ago)

Author:

vboxsync

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

123148

Message:

EM,IEM,VMX: Working on configuring exit history optimziations. Currently enabled in ring-0 for NEM but disabled for HM. bugref:9198

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (6 diffs)
• IEMAll.cpp (modified) (2 diffs)

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

@@ -438 +438 @@
 }
 
+#ifndef IN_RC
 
 /**
@@ -601 +602 @@
                                               PEMEXITENTRY pHistEntry, uint64_t uExitNo)
 {
+# ifdef IN_RING0
+    /* Disregard the preempt disabled flag. */
+    uFlagsAndType &= ~EMEXIT_F_PREEMPT_DISABLED;
+# endif
+
     /*
      * Work the hash table.
      */
     AssertCompile(RT_ELEMENTS(pVCpu->em.s.aExitRecords) == 1024);
-#define EM_EXIT_RECORDS_IDX_MASK 0x3ff
+# define EM_EXIT_RECORDS_IDX_MASK 0x3ff
     uintptr_t  idxSlot  = ((uintptr_t)uFlatPC >> 1) & EM_EXIT_RECORDS_IDX_MASK;
     PEMEXITREC pExitRec = &pVCpu->em.s.aExitRecords[idxSlot];
@@ -733 +739 @@
 }
 
+#endif /* !IN_RC */
 
 /**
@@ -761 +768 @@
     pHistEntry->idxSlot       = UINT32_MAX;
 
+#ifndef IN_RC
     /*
      * If common exit type, we will insert/update the exit into the exit record hash table.
      */
     if (   (uFlagsAndType & (EMEXIT_F_KIND_MASK | EMEXIT_F_CS_EIP | EMEXIT_F_UNFLATTENED_PC)) == EMEXIT_F_KIND_EM
+# ifdef IN_RING0
+        && pVCpu->em.s.fExitOptimizationEnabledR0
+        && ( !(uFlagsAndType & EMEXIT_F_PREEMPT_DISABLED) || pVCpu->em.s.fExitOptimizationEnabledR0PreemptDisabled)
+# else
         && pVCpu->em.s.fExitOptimizationEnabled
-        && uFlatPC != UINT64_MAX)
+# endif
+        && uFlatPC != UINT64_MAX
+       )
         return emHistoryAddOrUpdateRecord(pVCpu, uFlagsAndType, uFlatPC, pHistEntry, uExitNo);
+#endif
     return NULL;
 }
@@ -842 +857 @@
     pHistEntry->uFlagsAndType = uFlagsAndType | (pHistEntry->uFlagsAndType & (EMEXIT_F_CS_EIP | EMEXIT_F_UNFLATTENED_PC));
 
+#ifndef IN_RC
     /*
      * If common exit type, we will insert/update the exit into the exit record hash table.
      */
     if (   (uFlagsAndType & (EMEXIT_F_KIND_MASK | EMEXIT_F_CS_EIP | EMEXIT_F_UNFLATTENED_PC)) == EMEXIT_F_KIND_EM
+# ifdef IN_RING0
+        && pVCpu->em.s.fExitOptimizationEnabledR0
+        && ( !(uFlagsAndType & EMEXIT_F_PREEMPT_DISABLED) || pVCpu->em.s.fExitOptimizationEnabledR0PreemptDisabled)
+# else
         && pVCpu->em.s.fExitOptimizationEnabled
-        && pHistEntry->uFlatPC != UINT64_MAX)
+# endif
+        && pHistEntry->uFlatPC != UINT64_MAX
+       )
         return emHistoryAddOrUpdateRecord(pVCpu, uFlagsAndType, pHistEntry->uFlatPC, pHistEntry, uExitNo);
+#endif
     return NULL;
 }
@@ -879 +902 @@
     pHistEntry->uFlatPC       = uFlatPC;
 
+#ifndef IN_RC
     /*
      * If common exit type, we will insert/update the exit into the exit record hash table.
      */
     if (   (uFlagsAndType & (EMEXIT_F_KIND_MASK | EMEXIT_F_CS_EIP | EMEXIT_F_UNFLATTENED_PC)) == EMEXIT_F_KIND_EM
-        && pVCpu->em.s.fExitOptimizationEnabled)
+# ifdef IN_RING0
+        && pVCpu->em.s.fExitOptimizationEnabledR0
+        && ( !(uFlagsAndType & EMEXIT_F_PREEMPT_DISABLED) || pVCpu->em.s.fExitOptimizationEnabledR0PreemptDisabled)
+# else
+        && pVCpu->em.s.fExitOptimizationEnabled
+# endif
+       )
         return emHistoryAddOrUpdateRecord(pVCpu, uFlagsAndType, uFlatPC, pHistEntry, uExitNo);
+#endif
     return NULL;
 }

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

@@ -14193 +14193 @@
 #endif
         {
-            uint32_t cInstructionSinceLastExit = 0;
+#ifdef IN_RING0
+            bool const fCheckPreemptionPending   = !RTThreadPreemptIsPossible() || !RTThreadPreemptIsEnabled(NIL_RTTHREAD);
+#endif
+            uint32_t   cInstructionSinceLastExit = 0;
 
             /*
@@ -14258 +14261 @@
                                 {
 #ifdef IN_RING0
-                                    if (!RTThreadPreemptIsPending(NIL_RTTHREAD))
+                                    if (   !fCheckPreemptionPending
+                                        || !RTThreadPreemptIsPending(NIL_RTTHREAD))
 #endif
                                     {