Changeset 78620 in vbox for trunk

Timestamp:

May 21, 2019 8:54:23 AM (6 years ago)

Author:

vboxsync

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

130686

Message:

VMM: Nested VMX: bugref:9180 Added SPPT pointer field to the virtual VMCS.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/HMVMXAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/CPUM.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -3648 +3648 @@
     /** 0x290 - ENCLS-exiting bitmap address.  */
     RTUINT64U       u64AddrEnclsBitmap;
-    /** 0x298 - TSC multiplier.  */
+    /** 0x298 - Sub-page-permission-table pointer. */
+    RTUINT64U       u64SpptPtr;
+    /** 0x2a0 - TSC multiplier.  */
     RTUINT64U       u64TscMultiplier;
-    /** 0x2a0 - Reserved for future. */
-    RTUINT64U       au64Reserved0[16];
+    /** 0x2a8 - Reserved for future. */
+    RTUINT64U       au64Reserved0[15];
     /** @} */
 

trunk/src/VBox/VMM/VMMAll/HMVMXAll.cpp

@@ -996 +996 @@
         LogRel(("  %sXSS-bitmap                 = %#RX64\n",   pszPrefix, pVmcs->u64XssBitmap.u));
         LogRel(("  %sENCLS-exiting bitmap addr  = %#RX64\n",   pszPrefix, pVmcs->u64AddrEnclsBitmap.u));
+        LogRel(("  %sSPPT pointer               = %#RX64\n",   pszPrefix, pVmcs->u64SpptPtr.u));
         LogRel(("  %sTSC multiplier             = %#RX64\n",   pszPrefix, pVmcs->u64TscMultiplier.u));
 

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

@@ -264 +264 @@
         /*    22 */ RT_UOFFSETOF(VMXVVMCS, u64XssBitmap),
         /*    23 */ RT_UOFFSETOF(VMXVVMCS, u64AddrEnclsBitmap),
-        /*    24 */ UINT16_MAX,
+        /*    24 */ RT_UOFFSETOF(VMXVVMCS, u64SpptPtr),
         /*    25 */ RT_UOFFSETOF(VMXVVMCS, u64TscMultiplier)
     },

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -444 +444 @@
     SSMFIELD_ENTRY(       VMXVVMCS, u64XssBitmap),
     SSMFIELD_ENTRY(       VMXVVMCS, u64AddrEnclsBitmap),
+    SSMFIELD_ENTRY(       VMXVVMCS, u64SpptPtr),
     SSMFIELD_ENTRY(       VMXVVMCS, u64TscMultiplier),
     SSMFIELD_ENTRY_IGNORE(VMXVVMCS, au64Reserved0),
@@ -3843 +3844 @@
         pHlp->pfnPrintf(pHlp, "  %sXSS-bitmap                 = %#RX64\n",   pszPrefix, pVmcs->u64XssBitmap.u);
         pHlp->pfnPrintf(pHlp, "  %sENCLS-exiting bitmap addr  = %#RX64\n",   pszPrefix, pVmcs->u64AddrEnclsBitmap.u);
+        pHlp->pfnPrintf(pHlp, "  %sSPPT pointer               = %#RX64\n",   pszPrefix, pVmcs->u64SpptPtr.u);
         pHlp->pfnPrintf(pHlp, "  %sTSC multiplier             = %#RX64\n",   pszPrefix, pVmcs->u64TscMultiplier.u);