Changeset 100000 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

May 30, 2023 6:09:42 AM (20 months ago)

Author:

vboxsync

Message:

VMM: Take the vTimer expiration into account when halting due to a WFI/WFE instruction so the guest gets woken up if no other event is pending, bugref:10389

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EM.cpp (modified) (1 diff)
• TM.cpp (modified) (1 diff)
• VMEmt.cpp (modified) (4 diffs)

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

@@ -1896 +1896 @@
 #else
         bool fWakeupPending = false;
-        //ssertReleaseFailed();
-        /** @todo */
+
+        if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VTIMER_ACTIVATED))
+        {
+            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_VTIMER_ACTIVATED);
+
+            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;
+            }
+        }
 #endif
 

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

@@ -1270 +1270 @@
         pVCpu->tm.s.u64TSC         = 0;
         pVCpu->tm.s.u64TSCLastSeen = 0;
+#if defined(VBOX_VMM_TARGET_ARMV8)
+        pVCpu->cNsVTimerActivate   = UINT64_MAX;
+#endif
     }
 }

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

@@ -568 +568 @@
     }
 
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    uint64_t cNsVTimerActivate = TMCpuGetVTimerActivationNano(pVCpu);
+    const bool fVTimerActive = cNsVTimerActivate != UINT64_MAX;
+#endif
+
     /*
      * Halt loop.
@@ -584 +589 @@
         STAM_REL_PROFILE_ADD_PERIOD(&pUVCpu->vm.s.StatHaltTimers, cNsElapsedTimers);
         if (    VM_FF_IS_ANY_SET(pVM, VM_FF_EXTERNAL_HALTED_MASK)
-            ||  VMCPU_FF_IS_ANY_SET(pVCpu, fMask))
+            ||  VMCPU_FF_IS_ANY_SET(pVCpu, fMask)
+#if defined(VBOX_VMM_TARGET_ARMV8)
+            ||  cNsElapsedTimers >= cNsVTimerActivate
+#endif            
+            )
+        {
+#if defined(VBOX_VMM_TARGET_ARMV8)
+            cNsVTimerActivate = 0;
+#endif
             break;
+        }
 
         /*
@@ -595 +609 @@
             ||  VMCPU_FF_IS_ANY_SET(pVCpu, fMask))
             break;
+
+#if defined(VBOX_VMM_TARGET_ARMV8)
+        u64NanoTS = RT_MIN(cNsVTimerActivate, u64NanoTS);
+#endif
 
         /*
@@ -656 +674 @@
                 &&  Elapsed > 100000 /* 0.1 ms */)
                 fBlockOnce = false;
+
+#if defined(VBOX_VMM_TARGET_ARMV8)
+            cNsVTimerActivate -= RT_MIN(cNsVTimerActivate, Elapsed);
+            /* Did the vTimer expire? */
+            if (!cNsVTimerActivate)
+                break;
+#endif
         }
     }
     //if (fSpinning) RTLogRelPrintf("spun for %RU64 ns %u loops; lag=%RU64 pct=%d\n", RTTimeNanoTS() - u64Now, cLoops, TMVirtualSyncGetLag(pVM), u32CatchUpPct);
 
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    if (fVTimerActive)
+    {
+        if (!cNsVTimerActivate)
+            VMCPU_FF_SET(pVCpu, VMCPU_FF_VTIMER_ACTIVATED);
+
+        TMCpuSetVTimerNextActivation(pVCpu, cNsVTimerActivate);
+    }
+#endif
     ASMAtomicUoWriteBool(&pUVCpu->vm.s.fWait, false);
     return rc;