Changeset 93582 in vbox for trunk

Timestamp:

Feb 3, 2022 2:15:58 PM (3 years ago)

Author:

vboxsync

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

149718

Message:

VMM/{VMXAllTemplate.cpp.h,NEMR3Native-darwin.cpp}: Temporarily intercept all CR3 accesses to investigate an issue with 32bit guests where we seem to end up with an invalid page table root address under certain circumstances, bugref:9044

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/VMXAllTemplate.cpp.h (modified) (4 diffs)
• VMMR3/NEMR3Native-darwin.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

@@ -2086 +2086 @@
             if (VM_IS_VMX_NESTED_PAGING(pVM))
             {
+#ifndef HMVMX_ALAWAYS_INTERCEPT_CR3_ACCESS
                 if (CPUMIsGuestPagingEnabled(pVCpu))
                 {
@@ -2102 +2103 @@
                 if (VM_IS_VMX_UNRESTRICTED_GUEST(pVM))
                     uProcCtls &= ~VMX_PROC_CTLS_CR3_STORE_EXIT;
+#endif
             }
             else
@@ -8022 +8024 @@
              *   - We are executing in the VM debug loop.
              */
-#ifndef IN_NEM_DARWIN
+#ifndef HMVMX_ALAWAYS_INTERCEPT_CR3_ACCESS
+# ifndef IN_NEM_DARWIN
             Assert(   iCrReg != 3
                    || !VM_IS_VMX_NESTED_PAGING(pVM)
                    || !CPUMIsGuestPagingEnabledEx(&pVCpu->cpum.GstCtx)
                    || pVCpu->hmr0.s.fUsingDebugLoop);
-#else
+# else
             Assert(   iCrReg != 3
                    || !CPUMIsGuestPagingEnabledEx(&pVCpu->cpum.GstCtx));
+# endif
 #endif
 
@@ -8082 +8086 @@
              *   - We are executing in the VM debug loop.
              */
-#ifndef IN_NEM_DARWIN
+#ifndef HMVMX_ALAWAYS_INTERCEPT_CR3_ACCESS
+# ifndef IN_NEM_DARWIN
             Assert(   iCrReg != 3
                    || !VM_IS_VMX_NESTED_PAGING(pVM)
                    || !CPUMIsGuestPagingEnabledEx(&pVCpu->cpum.GstCtx)
                    || pVCpu->hmr0.s.fLeaveDone);
-#else
+# else
             Assert(   iCrReg != 3
                    || !CPUMIsGuestPagingEnabledEx(&pVCpu->cpum.GstCtx));
+# endif
 #endif
 

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

@@ -1327 +1327 @@
 //#define HMVMX_ALWAYS_TRAP_ALL_XCPTS
 //#define HMVMX_ALWAYS_SYNC_FULL_GUEST_STATE
+#define HMVMX_ALAWAYS_INTERCEPT_CR3_ACCESS /* Temporary to investigate an issue with 32bit guests whete seem to end up with an invalid page table root address. */
 #define VCPU_2_VMXSTATE(a_pVCpu)            (a_pVCpu)->nem.s
 #define VCPU_2_VMXSTATS(a_pVCpu)            (*(a_pVCpu)->nem.s.pVmxStats)
@@ -2190 +2191 @@
          |  VMX_PROC_CTLS_MWAIT_EXIT;                                 /* MWAIT causes a VM-exit. */
 
+#ifdef HMVMX_ALAWAYS_INTERCEPT_CR3_ACCESS
+    fVal |= VMX_PROC_CTLS_CR3_LOAD_EXIT
+         |  VMX_PROC_CTLS_CR3_STORE_EXIT;
+#endif
+
     /* We toggle VMX_PROC_CTLS_MOV_DR_EXIT later, check if it's not -always- needed to be set or clear. */
     if (   !(g_HmMsrs.u.vmx.ProcCtls.n.allowed1 & VMX_PROC_CTLS_MOV_DR_EXIT)