Changeset 106996 in vbox for trunk

Timestamp:

Nov 13, 2024 9:50:08 PM (2 weeks ago)

Author:

vboxsync

Message:

VMM/ARM: Fix import mask for things we have to fetch from the NEM backend, move the state syncing to the hypervisor down just before running the vCPU to avoid having to sync stuff back in case some forced action flags are set which cause us to break out of the runloop, bugref:10392

Location:

trunk

Files:

• include/VBox/vmm/iem-armv8.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/NEMR3Native-win-armv8.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/iem-armv8.h

@@ -64 +64 @@
                                                     | CPUMCTX_EXTRN_ELR \
                                                     | CPUMCTX_EXTRN_SP \
-                                                    | CPUMCTX_EXTRN_PSTATE )
+                                                    | CPUMCTX_EXTRN_PSTATE \
+                                                    | CPUMCTX_EXTRN_SCTLR_TCR_TTBR )
 /** The CPUMCTX_EXTRN_XXX mask needed when injecting an exception/interrupt.
  * IEM will import missing bits, callers are encouraged to make these registers

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

@@ -2494 +2494 @@
     for (unsigned iLoop = 0;; iLoop++)
     {
-        /* Ensure that Hyper-V has the whole state. */
-        int rc2 = nemHCWinCopyStateToHyperV(pVM, pVCpu);
-        AssertRCReturn(rc2, rc2);
-
         /*
          * Poll timers and run for a bit.
@@ -2514 +2510 @@
             if (VMCPU_CMPXCHG_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC_NEM_WAIT, VMCPUSTATE_STARTED_EXEC_NEM))
             {
+                /* Ensure that Hyper-V has the whole state. */
+                int rc2 = nemHCWinCopyStateToHyperV(pVM, pVCpu);
+                AssertRCReturn(rc2, rc2);
+
 #ifdef LOG_ENABLED
                 if (LogIsFlowEnabled())