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

Timestamp:

May 30, 2023 6:11:02 AM (20 months ago)

Author:

vboxsync

Message:

VMM/NEMR3Native-darwin-armv8: Set the vTimer expiration time when halting due to a WFI/WFE instruction and the vTimer is active, reduces host load when the guest idling which would consume a full core before, bugref:10390

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp

@@ -51 +51 @@
 #include <iprt/asm.h>
 #include <iprt/asm-arm.h>
+#include <iprt/asm-math.h>
 #include <iprt/ldr.h>
 #include <iprt/mem.h>
@@ -1036 +1037 @@
             return nemR3DarwinHandleExitExceptionTrappedHvcInsn(pVM, pVCpu, uIss);
         case ARMV8_ESR_EL2_EC_TRAPPED_WFX:
-            return VINF_SUCCESS; /** @todo VINF_EM_HALT; We don't get notified about the vTimer if halting here currently leading to a guest hang...*/
+        {
+            /* No need to halt if there is an interrupt pending already. */
+            if (VMCPU_FF_IS_ANY_SET(pVCpu, (VMCPU_FF_INTERRUPT_IRQ | VMCPU_FF_INTERRUPT_FIQ)))
+                return VINF_SUCCESS;
+
+            /* Set the vTimer expiration in order to get out of the halt at the right point in time. */
+            if (   (pVCpu->cpum.GstCtx.CntvCtlEl0 & ARMV8_CNTV_CTL_EL0_AARCH64_ENABLE)
+                && !(pVCpu->cpum.GstCtx.CntvCtlEl0 & ARMV8_CNTV_CTL_EL0_AARCH64_IMASK))
+            {
+                uint64_t cTicksVTimer = ASMReadTSC() - pVCpu->nem.s.u64VTimerOff;
+
+                /* Check whether it expired and start executing guest code. */
+                if (cTicksVTimer >= pVCpu->cpum.GstCtx.CntvCValEl0)
+                    return VINF_SUCCESS;
+
+                uint64_t cTicksVTimerToExpire = pVCpu->cpum.GstCtx.CntvCValEl0 - cTicksVTimer;
+                uint64_t cNanoSecsVTimerToExpire = ASMMultU64ByU32DivByU32(cTicksVTimerToExpire, RT_NS_1SEC, (uint32_t)pVM->nem.s.u64CntFrqHz);
+
+                /* Our halt method doesn't work with sub millisecond granularity at the moment causing a huge slowdown. */
+                if (cNanoSecsVTimerToExpire < 20 * RT_NS_1MS)
+                    return VINF_SUCCESS;
+
+                TMCpuSetVTimerNextActivation(pVCpu, cNanoSecsVTimerToExpire);
+            }
+            else
+                TMCpuSetVTimerNextActivation(pVCpu, UINT64_MAX);
+
+            return VINF_EM_HALT;
+        }
         case ARMV8_ESR_EL2_EC_UNKNOWN:
         default:
@@ -1076 +1105 @@
             return nemR3DarwinHandleExitException(pVM, pVCpu, pExit);
         case HV_EXIT_REASON_VTIMER_ACTIVATED:
+        {
+            LogFlowFunc(("vTimer got activated\n"));
+            TMCpuSetVTimerNextActivation(pVCpu, UINT64_MAX);
             pVCpu->nem.s.fVTimerActivated = true;
             return GICPpiSet(pVCpu, NEM_DARWIN_VTIMER_GIC_PPI_IRQ, true /*fAsserted*/);
+        }
         default:
             AssertReleaseFailed();