Changeset 74047 in vbox for trunk/include/VBox/vmm

Timestamp:

Sep 3, 2018 4:10:27 PM (7 years ago)

Author:

vboxsync

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

124803

Message:

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

Location:

trunk/include/VBox/vmm

Files:

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

trunk/include/VBox/vmm/cpumctx.h

@@ -572 +572 @@
                 uint32_t                uShadowVmcsR3Padding;
 #endif
-                /** 0x318 - Padding. */
-                uint8_t             abPadding[0x3f0 - 0x318];
+                /** 0x318 - Cache of the nested-guest Virtual-APIC page - R0 ptr. */
+                R0PTRTYPE(void *)       pvVirtApicPageR0;
+#if HC_ARCH_BITS == 32
+                uint32_t                uVirtApicPageR3Padding;
+#endif
+                /** 0x320 - Cache of the nested-guest Virtual-APIC page - R3 ptr. */
+                R3PTRTYPE(void *)       pvVirtApicPageR3;
+#if HC_ARCH_BITS == 32
+                uint32_t                uVirtApicPageR3Padding;
+#endif
+                /** 0x328 - Padding. */
+                uint8_t             abPadding[0x3f0 - 0x328];
             } vmx;
         } CPUM_UNION_NM(s);

trunk/include/VBox/vmm/hm_vmx.h

@@ -2377 +2377 @@
 
 
+/** @name TPR threshold.
+ * @{ */
+/** Mask of the TPR threshold field (bits 31:4 MBZ). */
+#define VMX_TPR_THRESHOLD_MASK                                   UINT32_C(0xf)
+
+/** Bit fields for TPR threshold. */
+#define VMX_BF_TPR_THRESHOLD_TPR_SHIFT                           0
+#define VMX_BF_TPR_THRESHOLD_TPR_MASK                            UINT32_C(0x0000000f)
+#define VMX_BF_TPR_THRESHOLD_RSVD_4_31_SHIFT                     4
+#define VMX_BF_TPR_THRESHOLD_RSVD_4_31_MASK                      UINT32_C(0xfffffff0)
+RT_BF_ASSERT_COMPILE_CHECKS(VMX_BF_TPR_THRESHOLD_, UINT32_C(0), UINT32_MAX,
+                            (TPR, RSVD_4_31));
+/** @} */
+
+
 /** @name Guest-activity states.
  * @{
@@ -2786 +2801 @@
 #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 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)
@@ -2970 +2990 @@
     /** 0xb8 - VM-entry instruction length. */
     uint32_t        u32EntryInstrLen;
-    /** 0xbc - TPR-treshold. */
-    uint32_t        u32TprTreshold;
+    /** 0xbc - TPR-threshold. */
+    uint32_t        u32TprThreshold;
     /** 0xc0 - Secondary-processor based VM-execution controls. */
     uint32_t        u32ProcCtls2;
@@ -3417 +3437 @@
     kVmxVInstrDiag_Vmread_VmxRoot,
     /* VMLAUNCH/VMRESUME. */
+    kVmxVInstrDiag_Vmentry_AddrIoBitmapA,
+    kVmxVInstrDiag_Vmentry_AddrIoBitmapB,
+    kVmxVInstrDiag_Vmentry_AddrMsrBitmap,
+    kVmxVInstrDiag_Vmentry_AddrVirtApicPage,
     kVmxVInstrDiag_Vmentry_BlocKMovSS,
     kVmxVInstrDiag_Vmentry_Cpl,
     kVmxVInstrDiag_Vmentry_Cr3TargetCount,
     kVmxVInstrDiag_Vmentry_LongModeCS,
+    kVmxVInstrDiag_Vmentry_NmiWindowExit,
     kVmxVInstrDiag_Vmentry_PinCtlsAllowed1,
     kVmxVInstrDiag_Vmentry_PinCtlsDisallowed0,
@@ -3431 +3456 @@
     kVmxVInstrDiag_Vmentry_RealOrV86Mode,
     kVmxVInstrDiag_Vmentry_Success,
+    kVmxVInstrDiag_Vmentry_TprThreshold,
+    kVmxVInstrDiag_Vmentry_TprThresholdVTpr,
+    kVmxVInstrDiag_Vmentry_VirtApicPagePtrReadPhys,
+    kVmxVInstrDiag_Vmentry_VirtNmi,
     kVmxVInstrDiag_Vmentry_VmcsClear,
     kVmxVInstrDiag_Vmentry_VmcsLaunch,