Changeset 90927 in vbox

Timestamp:

Aug 26, 2021 5:06:14 PM (4 years ago)

Author:

vboxsync

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

146564

Message:

VMM/HMVMXR0: Nested VMX: bugref:10092 Added new VMCS fields.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (9 diffs)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (5 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -1797 +1797 @@
 #define VMX_VMCS16_GUEST_FS_SEL                                 0x0808
 #define VMX_VMCS16_GUEST_GS_SEL                                 0x080a
-#define VMX_VMCS16_GUEST_SEG_SEL(a_iSegReg)                     (VMX_VMCS16_GUEST_ES_SEL + (a_iSegReg) * 2)
 #define VMX_VMCS16_GUEST_LDTR_SEL                               0x080c
 #define VMX_VMCS16_GUEST_TR_SEL                                 0x080e
@@ -1861 +1860 @@
 #define VMX_VMCS64_CTRL_ENCLS_EXITING_BITMAP_FULL               0x202e
 #define VMX_VMCS64_CTRL_ENCLS_EXITING_BITMAP_HIGH               0x202f
+#define VMX_VMCS64_CTRL_SPPTP_FULL                              0x2030
+#define VMX_VMCS64_CTRL_SPPTP_HIGH                              0x2031
 #define VMX_VMCS64_CTRL_TSC_MULTIPLIER_FULL                     0x2032
 #define VMX_VMCS64_CTRL_TSC_MULTIPLIER_HIGH                     0x2033
+#define VMX_VMCS64_CTRL_PROC_EXEC3_FULL                         0x2034
+#define VMX_VMCS64_CTRL_PROC_EXEC3_HIGH                         0x2035
+#define VMX_VMCS64_CTRL_ENCLV_EXITING_BITMAP_FULL               0x2036
+#define VMX_VMCS64_CTRL_ENCLV_EXITING_BITMAP_HIGH               0x2037
 
 /** 64-bit read-only data fields.  */
@@ -1889 +1894 @@
 #define VMX_VMCS64_GUEST_BNDCFGS_FULL                           0x2812
 #define VMX_VMCS64_GUEST_BNDCFGS_HIGH                           0x2813
+#define VMX_VMCS64_GUEST_RTIT_CTL_FULL                          0x2814
+#define VMX_VMCS64_GUEST_RTIT_CTL_HIGH                          0x2815
+#define VMX_VMCS64_GUEST_PKRS_FULL                              0x2818
+#define VMX_VMCS64_GUEST_PKRS_HIGH                              0x2819
 
 /** 64-bit host-state fields.  */
@@ -1897 +1906 @@
 #define VMX_VMCS64_HOST_PERF_GLOBAL_CTRL_FULL                   0x2c04
 #define VMX_VMCS64_HOST_PERF_GLOBAL_CTRL_HIGH                   0x2c05
+#define VMX_VMCS64_HOST_PKRS_FULL                               0x2c06
+#define VMX_VMCS64_HOST_PKRS_HIGH                               0x2c07
 
 /** 32-bit control fields.  */
@@ -1935 +1946 @@
 #define VMX_VMCS32_GUEST_FS_LIMIT                               0x4808
 #define VMX_VMCS32_GUEST_GS_LIMIT                               0x480a
-#define VMX_VMCS32_GUEST_SEG_LIMIT(a_iSegReg)                   (VMX_VMCS32_GUEST_ES_LIMIT + (a_iSegReg) * 2)
 #define VMX_VMCS32_GUEST_LDTR_LIMIT                             0x480c
 #define VMX_VMCS32_GUEST_TR_LIMIT                               0x480e
@@ -1946 +1956 @@
 #define VMX_VMCS32_GUEST_FS_ACCESS_RIGHTS                       0x481c
 #define VMX_VMCS32_GUEST_GS_ACCESS_RIGHTS                       0x481e
-#define VMX_VMCS32_GUEST_SEG_ACCESS_RIGHTS(a_iSegReg)           (VMX_VMCS32_GUEST_ES_ACCESS_RIGHTS + (a_iSegReg) * 2)
 #define VMX_VMCS32_GUEST_LDTR_ACCESS_RIGHTS                     0x4820
 #define VMX_VMCS32_GUEST_TR_ACCESS_RIGHTS                       0x4822
@@ -1986 +1995 @@
 #define VMX_VMCS_GUEST_FS_BASE                                  0x680e
 #define VMX_VMCS_GUEST_GS_BASE                                  0x6810
-#define VMX_VMCS_GUEST_SEG_BASE(a_iSegReg)                      (VMX_VMCS_GUEST_ES_BASE + (a_iSegReg) * 2)
 #define VMX_VMCS_GUEST_LDTR_BASE                                0x6812
 #define VMX_VMCS_GUEST_TR_BASE                                  0x6814
@@ -1998 +2006 @@
 #define VMX_VMCS_GUEST_SYSENTER_ESP                             0x6824
 #define VMX_VMCS_GUEST_SYSENTER_EIP                             0x6826
+#define VMX_VMCS_GUEST_S_CET                                    0x6828
+#define VMX_VMCS_GUEST_SSP                                      0x682a
+#define VMX_VMCS_GUEST_INTR_SSP_TABLE_ADDR                      0x682c
 
 /** Natural-width host-state fields. */
@@ -2012 +2023 @@
 #define VMX_VMCS_HOST_RSP                                       0x6c14
 #define VMX_VMCS_HOST_RIP                                       0x6c16
+#define VMX_VMCS_HOST_S_CET                                     0x6c18
+#define VMX_VMCS_HOST_SSP                                       0x6c1a
+#define VMX_VMCS_HOST_INTR_SSP_TABLE_ADDR                       0x6c1c
+
+#define VMX_VMCS16_GUEST_SEG_SEL(a_iSegReg)                     (VMX_VMCS16_GUEST_ES_SEL           + (a_iSegReg) * 2)
+#define VMX_VMCS_GUEST_SEG_BASE(a_iSegReg)                      (VMX_VMCS_GUEST_ES_BASE            + (a_iSegReg) * 2)
+#define VMX_VMCS32_GUEST_SEG_LIMIT(a_iSegReg)                   (VMX_VMCS32_GUEST_ES_LIMIT         + (a_iSegReg) * 2)
+#define VMX_VMCS32_GUEST_SEG_ACCESS_RIGHTS(a_iSegReg)           (VMX_VMCS32_GUEST_ES_ACCESS_RIGHTS + (a_iSegReg) * 2)
 
 /**

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

@@ -540 +540 @@
     VMX_VMCS64_CTRL_ENCLS_EXITING_BITMAP_FULL,
     VMX_VMCS64_CTRL_ENCLS_EXITING_BITMAP_HIGH,
+    VMX_VMCS64_CTRL_SPPTP_FULL,
+    VMX_VMCS64_CTRL_SPPTP_HIGH,
     VMX_VMCS64_CTRL_TSC_MULTIPLIER_FULL,
     VMX_VMCS64_CTRL_TSC_MULTIPLIER_HIGH,
+    VMX_VMCS64_CTRL_PROC_EXEC3_FULL,
+    VMX_VMCS64_CTRL_PROC_EXEC3_HIGH,
+    VMX_VMCS64_CTRL_ENCLV_EXITING_BITMAP_FULL,
+    VMX_VMCS64_CTRL_ENCLV_EXITING_BITMAP_HIGH,
 
     /* 64-bit read-only data fields. */
@@ -568 +574 @@
     VMX_VMCS64_GUEST_BNDCFGS_FULL,
     VMX_VMCS64_GUEST_BNDCFGS_HIGH,
+    VMX_VMCS64_GUEST_RTIT_CTL_FULL,
+    VMX_VMCS64_GUEST_RTIT_CTL_HIGH,
+    VMX_VMCS64_GUEST_PKRS_FULL,
+    VMX_VMCS64_GUEST_PKRS_HIGH,
 
     /* 64-bit host-state fields. */
@@ -576 +586 @@
     VMX_VMCS64_HOST_PERF_GLOBAL_CTRL_FULL,
     VMX_VMCS64_HOST_PERF_GLOBAL_CTRL_HIGH,
+    VMX_VMCS64_HOST_PKRS_FULL,
+    VMX_VMCS64_HOST_PKRS_HIGH,
 
     /* 32-bit control fields. */
@@ -674 +686 @@
     VMX_VMCS_GUEST_SYSENTER_ESP,
     VMX_VMCS_GUEST_SYSENTER_EIP,
+    VMX_VMCS_GUEST_S_CET,
+    VMX_VMCS_GUEST_SSP,
+    VMX_VMCS_GUEST_INTR_SSP_TABLE_ADDR,
 
     /* Natural-width host-state fields */
@@ -687 +702 @@
     VMX_VMCS_HOST_SYSENTER_EIP,
     VMX_VMCS_HOST_RSP,
-    VMX_VMCS_HOST_RIP
+    VMX_VMCS_HOST_RIP,
+    VMX_VMCS_HOST_S_CET,
+    VMX_VMCS_HOST_SSP,
+    VMX_VMCS_HOST_INTR_SSP_TABLE_ADDR
 };
 #endif /* VBOX_WITH_NESTED_HWVIRT_VMX */