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

Timestamp:

Mar 13, 2025 8:43:30 AM (7 weeks ago)

Author:

vboxsync

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

167938

Message:

VMM/NEM/win: Workaround for SMP TSC drift introduced in NEMHCResumeCpuTickOnAll on startup and resume (unpause). bugref:10876 ticketref:22334

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (3 diffs)
• VMMR3/NEMR3Native-win.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h

@@ -1147 +1147 @@
     AssertReturn(VM_IS_NEM_ENABLED(pVM), VERR_NEM_IPE_9);
 
+    /** @todo Do this WHvSuspendPartitionTime call to when the VM is suspended. */
+    HRESULT hrcSuspend = E_FAIL;
+    if (WHvSuspendPartitionTime && WHvResumePartitionTime)
+    {
+        hrcSuspend = WHvSuspendPartitionTime(pVM->nem.s.hPartition);
+        AssertLogRelMsg(SUCCEEDED(hrcSuspend),
+                        ("WHvSuspendPartitionTime(%p) -> %Rhrc (Last=%#x/%u)\n",
+                         pVM->nem.s.hPartition, hrcSuspend, RTNtLastStatusValue(), RTNtLastErrorValue()));
+    }
+
     /*
      * Call the offical API to do the job.
@@ -1169 +1179 @@
     {
         Assert(enmName == WHvX64RegisterTsc);
-        const uint64_t offDelta = (ASMReadTSC() - uFirstTsc);
+        const uint64_t offDelta = SUCCEEDED(hrcSuspend) ? 0 : ASMReadTSC() - uFirstTsc;
         Value.Reg64 = uPausedTscValue + offDelta;
         hrc = WHvSetVirtualProcessorRegisters(pVM->nem.s.hPartition, iCpu, &enmName, 1, &Value);
@@ -1175 +1185 @@
                               ("WHvSetVirtualProcessorRegisters(%p, 0,{tsc},2,%#RX64 + %#RX64) -> %Rhrc (Last=%#x/%u)\n",
                                pVM->nem.s.hPartition, iCpu, uPausedTscValue, offDelta, hrc, RTNtLastStatusValue(), RTNtLastErrorValue())
+                              , VERR_NEM_SET_TSC);
+    }
+
+    if (SUCCEEDED(hrcSuspend))
+    {
+        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);
     }

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

@@ -163 +163 @@
 static decltype(WHvGetVirtualProcessorRegisters) *  g_pfnWHvGetVirtualProcessorRegisters;
 static decltype(WHvSetVirtualProcessorRegisters) *  g_pfnWHvSetVirtualProcessorRegisters;
-static decltype(WHvSuspendPartitionTime) *          g_pfnWHvSuspendPartitionTime;
-static decltype(WHvResumePartitionTime) *           g_pfnWHvResumePartitionTime;
+static decltype(WHvResumePartitionTime)            *g_pfnWHvResumePartitionTime;
+static decltype(WHvSuspendPartitionTime)           *g_pfnWHvSuspendPartitionTime;
 decltype(WHvGetVirtualProcessorState) *             g_pfnWHvGetVirtualProcessorState = NULL;
 decltype(WHvSetVirtualProcessorState) *             g_pfnWHvSetVirtualProcessorState = NULL;
@@ -222 +222 @@
     NEM_WIN_IMPORT(0, false, WHvGetVirtualProcessorRegisters),
     NEM_WIN_IMPORT(0, false, WHvSetVirtualProcessorRegisters),
-    NEM_WIN_IMPORT(0, true,  WHvSuspendPartitionTime),
-    NEM_WIN_IMPORT(0, true,  WHvResumePartitionTime),
+    NEM_WIN_IMPORT(0, true,  WHvResumePartitionTime),  /* since 19H1 */
+    NEM_WIN_IMPORT(0, true,  WHvSuspendPartitionTime), /* since 19H1 */
     NEM_WIN_IMPORT(0, true,  WHvRequestInterrupt),
     NEM_WIN_IMPORT(0, true,  WHvGetVirtualProcessorState),
@@ -303 +303 @@
 # define WHvGetVirtualProcessorRegisters            g_pfnWHvGetVirtualProcessorRegisters
 # define WHvSetVirtualProcessorRegisters            g_pfnWHvSetVirtualProcessorRegisters
+# define WHvResumePartitionTime                     g_pfnWHvResumePartitionTime
 # define WHvSuspendPartitionTime                    g_pfnWHvSuspendPartitionTime
-# define WHvResumePartitionTime                     g_pfnWHvResumePartitionTime
 # define WHvRequestInterrupt                        g_pfnWHvRequestInterrupt
 # define WHvGetVirtualProcessorState                g_pfnWHvGetVirtualProcessorState