Changeset 13115 in vbox for trunk/src

Timestamp:

Oct 9, 2008 9:32:28 AM (16 years ago)

Author:

vboxsync

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

37610

Message:

Corrections for the EPTP

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -296 +296 @@
         /** Current CR4 mask. */
         uint64_t                    cr4_mask;
+
+        /** Current EPTP. */
+        RTHCPHYS                    GCPhysEPTP;
 
         /** VMX MSR values */

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -1187 +1187 @@
         if (pVM->hwaccm.s.fNestedPaging)
         {
-            RTHCPHYS GCPhys;
 
             AssertMsg(PGMGetEPTCR3(pVM) == PGMGetHyperCR3(pVM), ("%VHp vs %VHp\n", PGMGetEPTCR3(pVM), PGMGetHyperCR3(pVM)));
-            GCPhys = PGMGetEPTCR3(pVM);
-
-            Assert(!(GCPhys & 0xfff));
+            pVM->hwaccm.s.vmx.GCPhysEPTP = PGMGetEPTCR3(pVM);
+
+            Assert(!(pVM->hwaccm.s.vmx.GCPhysEPTP & 0xfff));
             /** @todo Check the IA32_VMX_EPT_VPID_CAP MSR for other supported memory types. */
-            GCPhys |=   VMX_EPT_MEMTYPE_WB
-                     | (VMX_EPT_PAGE_WALK_LENGTH_DEFAULT << VMX_EPT_PAGE_WALK_LENGTH_SHIFT);
-            rc = VMXWriteVMCS(VMX_VMCS_CTRL_EPTP_FULL, GCPhys);
+            pVM->hwaccm.s.vmx.GCPhysEPTP |=   VMX_EPT_MEMTYPE_WB
+                                           | (VMX_EPT_PAGE_WALK_LENGTH_DEFAULT << VMX_EPT_PAGE_WALK_LENGTH_SHIFT);
+            
+            rc = VMXWriteVMCS(VMX_VMCS_CTRL_EPTP_FULL, pVM->hwaccm.s.vmx.GCPhysEPTP);
 #if HC_ARCH_BITS == 32
-            rc = VMXWriteVMCS(VMX_VMCS_CTRL_EPTP_HIGH, (uint32_t)(GCPhys >> 32ULL));
+            rc = VMXWriteVMCS(VMX_VMCS_CTRL_EPTP_HIGH, (uint32_t)(pVM->hwaccm.s.vmx.GCPhysEPTP >> 32ULL));
 #endif
             AssertRC(rc);
@@ -2949 +2949 @@
 
     Assert(pVM->hwaccm.s.fNestedPaging);
-    descriptor[0] = PGMGetEPTCR3(pVM);
+    descriptor[0] = pVM->hwaccm.s.vmx.GCPhysEPTP;
     descriptor[1] = GCPhys;
     int rc = VMXR0InvEPT(enmFlush, &descriptor[0]);