Changeset 49852 in vbox for trunk

Timestamp:

Dec 9, 2013 6:09:21 PM (11 years ago)

Author:

vboxsync

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

91204

Message:

VMM/HMVMXR0: Add guest-state checks for PAE PDPTEs.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (1 diff)

trunk/include/VBox/vmm/hm_vmx.h

@@ -426 +426 @@
 /** CS.Attr.DPL invalid. */
 #define VMX_IGS_CS_ATTR_DPL_INVALID                             121
+/** PAE PDPTE reserved bits not set to 0. */
+#define VMX_IGS_PAE_PDPTE_RESERVED                              123
 /** @} */
 

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

@@ -9187 +9187 @@
         }
 
-        /** @todo Checks on Guest Page-Directory-Pointer-Table Entries.  */
+        /** @todo Checks on Guest Page-Directory-Pointer-Table Entries when guest is
+         *        in IA-32e Paging Mode (AMD64 Paging). */
+        if (   pVM->hm.s.fNestedPaging
+            && CPUMIsGuestInPAEModeEx(pCtx))
+        {
+            rc = VMXReadVmcs64(VMX_VMCS64_GUEST_PDPTE0_FULL, &u64Val);
+            AssertRCBreak(rc);
+            HMVMX_CHECK_BREAK(!(u64Val & X86_PDPE_PAE_MBZ_MASK), VMX_IGS_PAE_PDPTE_RESERVED);
+
+            rc = VMXReadVmcs64(VMX_VMCS64_GUEST_PDPTE1_FULL, &u64Val);
+            AssertRCBreak(rc);
+            HMVMX_CHECK_BREAK(!(u64Val & X86_PDPE_PAE_MBZ_MASK), VMX_IGS_PAE_PDPTE_RESERVED);
+
+            rc = VMXReadVmcs64(VMX_VMCS64_GUEST_PDPTE2_FULL, &u64Val);
+            AssertRCBreak(rc);
+            HMVMX_CHECK_BREAK(!(u64Val & X86_PDPE_PAE_MBZ_MASK), VMX_IGS_PAE_PDPTE_RESERVED);
+
+            rc = VMXReadVmcs64(VMX_VMCS64_GUEST_PDPTE3_FULL, &u64Val);
+            AssertRCBreak(rc);
+            HMVMX_CHECK_BREAK(!(u64Val & X86_PDPE_PAE_MBZ_MASK), VMX_IGS_PAE_PDPTE_RESERVED);
+        }
 
         /* Shouldn't happen but distinguish it from AssertRCBreak() errors. */