Changeset 100000 in vbox

Timestamp:

May 30, 2023 6:09:42 AM (18 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

Files:

• include/VBox/vmm/tm.h (modified) (1 diff)
• include/VBox/vmm/vm.h (modified) (3 diffs)
• src/VBox/VMM/VMMAll/TMAllCpu.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/EM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/TM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/VMEmt.cpp (modified) (4 diffs)

trunk/include/VBox/vmm/tm.h

@@ -171 +171 @@
 VMMDECL(uint64_t)       TMCpuTicksPerSecond(PVMCC pVM);
 VMM_INT_DECL(bool)      TMCpuTickIsTicking(PVMCPUCC pVCpu);
+
+#if defined(VBOX_VMM_TARGET_ARMV8)
+VMM_INT_DECL(void)      TMCpuSetVTimerNextActivation(PVMCPUCC pVCpu, uint64_t cNanoSecs);
+VMM_INT_DECL(uint64_t)  TMCpuGetVTimerActivationNano(PVMCPUCC pVCpu);
+#endif
 /** @} */
 

trunk/include/VBox/vmm/vm.h

@@ -130 +130 @@
     VMCPUSTATE volatile     enmState;
 
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    uint32_t                u32Alignment0;
+    /** The number of nano seconds when the vTimer of the associated vCPU is supposed to activate
+     *  required to get out of a halt (due to wfi/wfe).
+     *
+     * @note This actually should go into TMCPU but this drags in a whole lot of padding changes
+     *       and I'm not sure yet whether this will remain in this form anyway.
+     */
+    uint64_t                cNsVTimerActivate;
+    /** Padding up to 64 bytes. */
+    uint8_t                 abAlignment0[64 - 12 - 8 - 4];
+#else
     /** Padding up to 64 bytes. */
     uint8_t                 abAlignment0[64 - 12];
+#endif
     /** @} */
 
@@ -517 +530 @@
 #define VMCPU_FF_HM_UPDATE_CR3              RT_BIT_64(VMCPU_FF_HM_UPDATE_CR3_BIT)
 #define VMCPU_FF_HM_UPDATE_CR3_BIT          12
+#if defined(VBOX_VMM_TARGET_ARMV8)
+# define VMCPU_FF_VTIMER_ACTIVATED          RT_BIT_64(VMCPU_FF_VTIMER_ACTIVATED_BIT)
+# define VMCPU_FF_VTIMER_ACTIVATED_BIT      13
+#else
 /* Bit 13 used to be VMCPU_FF_HM_UPDATE_PAE_PDPES. */
+#endif
 /** This action forces the VM to resync the page tables before going
  * back to execute guest code. (GLOBAL FLUSH) */
@@ -593 +611 @@
 # define VMCPU_FF_EXTERNAL_HALTED_MASK          (  VMCPU_FF_INTERRUPT_IRQ | VMCPU_FF_INTERRUPT_FIQ \
                                                  | VMCPU_FF_REQUEST       | VMCPU_FF_INTERRUPT_NMI  | VMCPU_FF_INTERRUPT_SMI \
-                                                 | VMCPU_FF_UNHALT        | VMCPU_FF_TIMER          | VMCPU_FF_DBGF )
+                                                 | VMCPU_FF_UNHALT        | VMCPU_FF_TIMER          | VMCPU_FF_DBGF \
+                                                 | VMCPU_FF_VTIMER_ACTIVATED)
 #else
 # define VMCPU_FF_EXTERNAL_HALTED_MASK          (  VMCPU_FF_UPDATE_APIC | VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC \

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

@@ -660 +660 @@
 }
 
+
+#if defined(VBOX_VMM_TARGET_ARMV8)
+/**
+ * Sets the number of nanoseconds from now when the vTiemr is supposed to expire next.
+ *
+ * @param   pVCpu           The cross context virtual CPU structure.
+ * @param   cNanoSecs       Number of nano seconds when the timer is supposed to fire.
+ *
+ * @note This is required in order to kick the vCPU out of a halting state because the
+ *       vTimer is supposed to fire an interrupt.
+ */
+VMM_INT_DECL(void) TMCpuSetVTimerNextActivation(PVMCPUCC pVCpu, uint64_t cNanoSecs)
+{
+    pVCpu->cNsVTimerActivate = cNanoSecs;
+}
+
+
+/**
+ * Returns when the vTimer is supposed to expire next in number of nanoseconds.
+ *
+ * @returns Number of nanoseconds when the vTimer is supposed to 
+ */
+VMM_INT_DECL(uint64_t) TMCpuGetVTimerActivationNano(PVMCPUCC pVCpu)
+{
+    return pVCpu->cNsVTimerActivate;
+}
+#endif

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;