Changeset 100140 in vbox

Timestamp:

Jun 9, 2023 2:54:38 PM (21 months ago)

Author:

vboxsync

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

157833

Message:

VMM/EM: Do not do scheduling based on whether HM has been used and is 'active', because that's not a reliable property (especially after restoring saved state) and it's not correct to go to the recompiler all the time after HM was unable to execute a piece of code. This is probably a problem resurfacing after kicking out the IEM_THEN_REM state from EM and resurrecting the REM state. bugref:10369

Location:

trunk

Files:

• include/VBox/vmm/hm.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/EM.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/HM-armv8.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/HM.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/TRPM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/hm.h

@@ -320 +320 @@
 VMMR3_INT_DECL(void)            HMR3NotifyDebugEventChanged(PVM pVM);
 VMMR3_INT_DECL(void)            HMR3NotifyDebugEventChangedPerCpu(PVM pVM, PVMCPU pVCpu);
+# if 0 /* evil */
 VMMR3_INT_DECL(bool)            HMR3IsActive(PCVMCPU pVCpu);
+# endif
 VMMR3_INT_DECL(int)             HMR3EnablePatching(PVM pVM, RTGCPTR pPatchMem, unsigned cbPatchMem);
 VMMR3_INT_DECL(int)             HMR3DisablePatching(PVM pVM, RTGCPTR pPatchMem, unsigned cbPatchMem);

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

@@ -1805 +1805 @@
                             VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI);
                             fWakeupPending = true;
+# if 0 /* HMR3IsActive is not reliable (esp. after restore), just return VINF_EM_RESCHEDULE. */
                             if (pVM->em.s.fIemExecutesAll)
                                 rc2 = VINF_EM_RESCHEDULE;
@@ -1813 +1814 @@
                                     :                          VINF_EM_RESCHEDULE_REM;
                             }
+# else
+                            rc2 = VINF_EM_RESCHEDULE;
+# endif
                         }
                         UPDATE_RC();
@@ -1903 +1907 @@
 
             fWakeupPending = true;
-            if (pVM->em.s.fIemExecutesAll)
-                rc2 = VINF_EM_RESCHEDULE;
-            else
-                rc2 = HMR3IsActive(pVCpu)    ? VINF_EM_RESCHEDULE_HM
-                    : VM_IS_NEM_ENABLED(pVM) ? VINF_EM_RESCHEDULE
-                    :                          VINF_EM_RESCHEDULE_REM;
+            rc2 = VINF_EM_RESCHEDULE;
         }
 #endif /* VBOX_VMM_TARGET_ARMV8 */

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

@@ -366 +366 @@
 
 
+#if 0 /* evil */
 /**
  * Checks if we are currently using hardware acceleration.
@@ -376 +377 @@
     return pVCpu->hm.s.fActive;
 }
+#endif
 
 

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

@@ -2761 +2761 @@
 
 
+#if 0 /* evil */
 /**
  * Checks if we are currently using hardware acceleration.
@@ -2771 +2772 @@
     return pVCpu->hm.s.fActive;
 }
+#endif
 
 

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

@@ -426 +426 @@
         AssertMsg(rc == VERR_APIC_INTR_MASKED_BY_TPR || rc == VERR_NO_DATA, ("PDMGetInterrupt failed. rc=%Rrc\n", rc));
     }
+# if 0 /* HMR3IsActive is not reliable (esp. after restore), just return VINF_EM_RESCHEDULE. */
     return HMR3IsActive(pVCpu)    ? VINF_EM_RESCHEDULE_HM
          : VM_IS_NEM_ENABLED(pVM) ? VINF_EM_RESCHEDULE
          :                          VINF_EM_RESCHEDULE_REM; /* (Heed the halted state if this is changed!) */
+# else
+    return VINF_EM_RESCHEDULE;
+# endif
 #endif
 }