Changeset 74258 in vbox for trunk/include/VBox

Timestamp:

Sep 14, 2018 4:20:16 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM, CPUM: Nested VMX: bugref:9180 vmlaunch/vmresume bits.

Location:

trunk/include/VBox/vmm

Files:

• cpumctx.h (modified) (1 diff)
• hm_vmx.h (modified) (4 diffs)

trunk/include/VBox/vmm/cpumctx.h

@@ -602 +602 @@
                 uint32_t                uVmwriteBitmapR3Padding;
 #endif
-                /** 0x348 - Padding. */
-                uint8_t             abPadding[0x3f0 - 0x348];
+                /** 0x348 - The MSR auto-load/store area - R0 ptr. */
+                R0PTRTYPE(PVMXAUTOMSR)  pAutoMsrAreaR0;
+#if HC_ARCH_BITS == 32
+                uint32_t                uAutoMsrAreaR0;
+#endif
+                /** 0x350 - The MSR auto-load/store area - R3 ptr. */
+                R3PTRTYPE(PVMXAUTOMSR)  pAutoMsrAreaR3;
+#if HC_ARCH_BITS == 32
+                uint32_t                uAutoMsrAreaR3;
+#endif
+                /** 0x358 - Padding. */
+                uint8_t             abPadding[0x3f0 - 0x358];
             } vmx;
         } CPUM_UNION_NM(s);

trunk/include/VBox/vmm/hm_vmx.h

@@ -2922 +2922 @@
  */
 
-/** CR0 bits set here must always be set when in VMX operation. */
-#define VMX_V_CR0_FIXED0                                        (X86_CR0_PE | X86_CR0_NE | X86_CR0_PG)
-/** VMX_V_CR0_FIXED0 when unrestricted-guest execution is supported for the guest. */
-#define VMX_V_CR0_FIXED0_UX                                     (VMX_V_CR0_FIXED0 & ~(X86_CR0_PE | X86_CR0_PG))
-/** CR4 bits set here must always be set when in VMX operation. */
-#define VMX_V_CR4_FIXED0                                        (X86_CR4_VMXE)
-
-/** Virtual VMCS revision ID. Bump this arbitarily chosen identifier if incompatible
- *  changes to the layout of VMXVVMCS is done.  Bit 31 MBZ.  */
-#define VMX_V_VMCS_REVISION_ID                                  UINT32_C(0x1d000001)
-AssertCompile(!(VMX_V_VMCS_REVISION_ID & RT_BIT(31)));
-
-/** The size of the virtual VMCS region (we use the maximum allowed size to avoid
- *  complications when teleporation may be implemented). */
-#define VMX_V_VMCS_SIZE                                         X86_PAGE_4K_SIZE
-/** The size of the virtual VMCS region (in pages). */
-#define VMX_V_VMCS_PAGES                                        1
-
-/** The size of the Virtual-APIC page (in bytes).  */
-#define VMX_V_VIRT_APIC_SIZE                                    X86_PAGE_4K_SIZE
-/** The size of the Virtual-APIC page (in pages). */
-#define VMX_V_VIRT_APIC_PAGES                                   1
-
-/** The size of the VMREAD/VMWRITE bitmap (in bytes). */
-#define VMX_V_VMREAD_VMWRITE_BITMAP_SIZE                        X86_PAGE_4K_SIZE
-/** The size of the VMREAD/VMWRITE-bitmap (in pages). */
-#define VMX_V_VMREAD_VMWRITE_BITMAP_PAGES                       1
-
-/** The highest index value used for supported virtual VMCS field encoding. */
-#define VMX_V_VMCS_MAX_INDEX                                    RT_BF_GET(VMX_VMCS64_CTRL_TSC_MULTIPLIER_HIGH, VMX_BF_VMCS_ENC_INDEX)
-
 /** @name Virtual VMX MSR - Miscellaneous data.
  * @{ */
@@ -2962 +2931 @@
 #define VMX_V_PREEMPT_TIMER_SHIFT                               5
 /** Maximum number of MSRs in the auto-load/store MSR areas, (n+1) * 512. */
-#define VMX_V_MAX_MSRS                                          0
+#define VMX_V_AUTOMSR_COUNT_MAX                                 0
 /** SMM MSEG revision ID. */
 #define VMX_V_MSEG_REV_ID                                       0
@@ -2974 +2943 @@
 #define VMX_V_VMCS_STATE_LAUNCHED       RT_BIT(2)
 /** @} */
+
+/** CR0 bits set here must always be set when in VMX operation. */
+#define VMX_V_CR0_FIXED0                                        (X86_CR0_PE | X86_CR0_NE | X86_CR0_PG)
+/** VMX_V_CR0_FIXED0 when unrestricted-guest execution is supported for the guest. */
+#define VMX_V_CR0_FIXED0_UX                                     (VMX_V_CR0_FIXED0 & ~(X86_CR0_PE | X86_CR0_PG))
+/** CR4 bits set here must always be set when in VMX operation. */
+#define VMX_V_CR4_FIXED0                                        (X86_CR4_VMXE)
+
+/** Virtual VMCS revision ID. Bump this arbitarily chosen identifier if incompatible
+ *  changes to the layout of VMXVVMCS is done.  Bit 31 MBZ.  */
+#define VMX_V_VMCS_REVISION_ID                                  UINT32_C(0x1d000001)
+AssertCompile(!(VMX_V_VMCS_REVISION_ID & RT_BIT(31)));
+
+/** The size of the virtual VMCS region (we use the maximum allowed size to avoid
+ *  complications when teleporation may be implemented). */
+#define VMX_V_VMCS_SIZE                                         X86_PAGE_4K_SIZE
+/** The size of the virtual VMCS region (in pages). */
+#define VMX_V_VMCS_PAGES                                        1
+
+/** The size of the Virtual-APIC page (in bytes).  */
+#define VMX_V_VIRT_APIC_SIZE                                    X86_PAGE_4K_SIZE
+/** The size of the Virtual-APIC page (in pages). */
+#define VMX_V_VIRT_APIC_PAGES                                   1
+
+/** The size of the VMREAD/VMWRITE bitmap (in bytes). */
+#define VMX_V_VMREAD_VMWRITE_BITMAP_SIZE                        X86_PAGE_4K_SIZE
+/** The size of the VMREAD/VMWRITE-bitmap (in pages). */
+#define VMX_V_VMREAD_VMWRITE_BITMAP_PAGES                       1
+
+/** The size of the auto-load/store MSR area (in bytes). */
+#define VMX_V_AUTOMSR_AREA_SIZE                                 ((512 * (VMX_V_AUTOMSR_COUNT_MAX + 1)) * sizeof(VMXAUTOMSR))
+/* Assert that the size is page aligned or adjust the VMX_V_AUTOMSR_AREA_PAGES macro below. */
+AssertCompile(RT_ALIGN_Z(VMX_V_AUTOMSR_AREA_SIZE, X86_PAGE_4K_SIZE) == VMX_V_AUTOMSR_AREA_SIZE);
+/** The size of the auto-load/store MSR area (in pages). */
+#define VMX_V_AUTOMSR_AREA_PAGES                                ((VMX_V_AUTOMSR_AREA_SIZE) >> X86_PAGE_4K_SHIFT)
+
+/** The highest index value used for supported virtual VMCS field encoding. */
+#define VMX_V_VMCS_MAX_INDEX                                    RT_BF_GET(VMX_VMCS64_CTRL_TSC_MULTIPLIER_HIGH, VMX_BF_VMCS_ENC_INDEX)
 
 /**
@@ -3761 +3768 @@
     kVmxVDiag_Vmentry_HostSysenterEspEip,
     kVmxVDiag_Vmentry_LongModeCS,
+    kVmxVDiag_Vmentry_MsrLoad,
+    kVmxVDiag_Vmentry_MsrLoadCount,
+    kVmxVDiag_Vmentry_MsrLoadPtrReadPhys,
+    kVmxVDiag_Vmentry_MsrLoadRing3,
+    kVmxVDiag_Vmentry_MsrLoadRsvd,
     kVmxVDiag_Vmentry_NmiWindowExit,
     kVmxVDiag_Vmentry_PinCtlsAllowed1,