Changeset 108404 in vbox for trunk/src/VBox/VMM

Timestamp:

Feb 27, 2025 9:41:50 AM (2 months ago)

Author:

vboxsync

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

167771

Message:

VMM/NEMR3Native-win-armv8.cpp: Need to call WHvResumePartitionTime() to get time ticking despite the docs claiming that it is resumed as soon as vCPU starts executing. Also suspend time already when querying the guest CPU tick counter, bugref:10392

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUMR3CpuId-armv8.cpp (modified) (1 diff)
• NEMR3Native-win-armv8.cpp (modified) (5 diffs)

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

@@ -168 +168 @@
     /* Write ID_AA64ISAR0_EL1 register back. */
     pVM->cpum.s.GuestIdRegs.u64RegIdAa64Isar0El1 = u64IdReg;
+
+
+    u64IdReg = pVM->cpum.s.GuestIdRegs.u64RegIdAa64Dfr0El1;
+    PORTABLE_DISABLE_FEATURE_BIT_CFG(0, u64IdReg, ARMV8_ID_AA64DFR0_EL1_PMUVER,   ARMV8_ID_AA64DFR0_EL1_PMUVER_SUPPORTED_V3, CPUMISAEXTCFG_DISABLED ,    ARMV8_ID_AA64DFR0_EL1_PMUVER_NOT_IMPL);
+
+    pVM->cpum.s.GuestIdRegs.u64RegIdAa64Dfr0El1 = u64IdReg;
 
     /** @todo Other ID and feature registers. */

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

@@ -1763 +1763 @@
     AssertReturn(VM_IS_NEM_ENABLED(pVM), VERR_NEM_IPE_9);
 
+    /* Ensure time for the partition is suspended - it will be resumed as soon as a vCPU starts executing. */
+    HRESULT hrc = WHvSuspendPartitionTime(pVM->nem.s.hPartition);
+    AssertLogRelMsgReturn(SUCCEEDED(hrc),
+                          ("WHvSuspendPartitionTime(%p) -> %Rhrc (Last=%#x/%u)\n",
+                           pVM->nem.s.hPartition, hrc, RTNtLastStatusValue(), RTNtLastErrorValue())
+                          , VERR_NEM_GET_REGISTERS_FAILED);
+
     /* Call the offical API. */
     WHV_REGISTER_NAME  enmName = WHvArm64RegisterCntvctEl0;
     WHV_REGISTER_VALUE Value   = { { {0, 0} } };
-    HRESULT hrc = WHvGetVirtualProcessorRegisters(pVM->nem.s.hPartition, pVCpu->idCpu, &enmName, 1, &Value);
+    hrc = WHvGetVirtualProcessorRegisters(pVM->nem.s.hPartition, pVCpu->idCpu, &enmName, 1, &Value);
     AssertLogRelMsgReturn(SUCCEEDED(hrc),
                           ("WHvGetVirtualProcessorRegisters(%p, %u,{CNTVCT_EL0},1,) -> %Rhrc (Last=%#x/%u)\n",
@@ -1772 +1779 @@
                           , VERR_NEM_GET_REGISTERS_FAILED);
     *pcTicks = Value.Reg64;
+    LogFlow(("NEMHCQueryCpuTick: %#RX64 (host: %#RX64)\n", *pcTicks, ASMReadTSC()));
     if (puAux)
         *puAux =0;
@@ -1797 +1805 @@
      * Call the offical API to do the job.
      */
-    /* Ensure time for the partition is suspended - it will be resumed as soon as a vCPU starts executing. */
-    HRESULT hrc = WHvSuspendPartitionTime(pVM->nem.s.hPartition);
-    AssertLogRelMsgReturn(SUCCEEDED(hrc),
-                          ("WHvSuspendPartitionTime(%p) -> %Rhrc (Last=%#x/%u)\n",
-                           pVM->nem.s.hPartition, hrc, RTNtLastStatusValue(), RTNtLastErrorValue())
-                          , VERR_NEM_SET_TSC);
+    LogFlow(("NEMHCResumeCpuTickOnAll: %#RX64 (host: %#RX64)\n", uPausedTscValue, ASMReadTSC()));
 
     /*
@@ -1815 +1818 @@
         WHV_REGISTER_VALUE Value;
         Value.Reg64 = uPausedTscValue;
-        hrc = WHvSetVirtualProcessorRegisters(pVM->nem.s.hPartition, idCpu, &enmName, 1, &Value);
+        HRESULT hrc = WHvSetVirtualProcessorRegisters(pVM->nem.s.hPartition, idCpu, &enmName, 1, &Value);
         AssertLogRelMsgReturn(SUCCEEDED(hrc),
                               ("WHvSetVirtualProcessorRegisters(%p, 0,{CNTVCT_EL0},1,%#RX64) -> %Rhrc (Last=%#x/%u)\n",
@@ -1825 +1828 @@
         pVCpuDst->nem.s.fSyncCntvRegs = true;
     }
+
+    HRESULT hrc = WHvResumePartitionTime(pVM->nem.s.hPartition);
+    AssertLogRelMsgReturn(SUCCEEDED(hrc),
+                          ("WHvResumePartitionTime(%p) -> %Rhrc (Last=%#x/%u)\n",
+                           pVM->nem.s.hPartition, hrc, RTNtLastStatusValue(), RTNtLastErrorValue())
+                          , VERR_NEM_SET_TSC);
 
     return VINF_SUCCESS;