Changeset 74054 in vbox for trunk/include/VBox

Timestamp:

Sep 4, 2018 5:23:52 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 vmlaunch/vmresume bits.

Location:

trunk/include/VBox/vmm

Files:

• cpum.h (modified) (1 diff)
• cpumctx.h (modified) (1 diff)
• hm_vmx.h (modified) (6 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -1193 +1193 @@
     /** VMX: Supports RDTSCP. */
     uint32_t        fVmxRdtscp : 1;
-    /** VMX: Supports virtualize-x2APIC access. */
-    uint32_t        fVmxVirtX2ApicAccess : 1;
+    /** VMX: Supports virtualize-x2APIC mode. */
+    uint32_t        fVmxVirtX2ApicMode : 1;
     /** VMX: Supports VPID. */
     uint32_t        fVmxVpid : 1;

trunk/include/VBox/vmm/cpumctx.h

@@ -660 +660 @@
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.pvMsrBitmapR0, 8);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.pvIoBitmapR0,  8);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.GCPhysVmxon,            0x2e0);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.GCPhysVmcs,             0x2e8);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.enmInstrDiag,           0x2f0);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.fInVmxRootMode,         0x2f4);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.fInVmxNonRootMode,      0x2f5);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pVmcsR0,                0x2f8);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pVmcsR3,                0x300);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pShadowVmcsR0,          0x308);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pShadowVmcsR3,          0x310);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvVirtApicPageR0,       0x318);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvVirtApicPageR3,       0x320);
+AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pVmcsR0,          8);
+AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pShadowVmcsR0,    8);
+AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvVirtApicPageR0, 8);
 
 AssertCompileMembersAtSameOffset(CPUMCTX, CPUM_UNION_STRUCT_NM(g,qw.) rax, CPUMCTX, CPUM_UNION_NM(g.) aGRegs);

trunk/include/VBox/vmm/hm_vmx.h

@@ -1830 +1830 @@
  * @{
  */
-/** External interrupts cause VM-exits if set; otherwise dispatched through the
- *  guest's IDT. */
+/** External interrupt exiting. */
 #define VMX_PIN_CTLS_EXT_INT_EXIT                               RT_BIT(0)
-/** Non-maskable interrupts cause VM-exits if set; otherwise dispatched through
- *  the guest's IDT. */
+/** NMI exiting. */
 #define VMX_PIN_CTLS_NMI_EXIT                                   RT_BIT(3)
 /** Virtual NMIs. */
@@ -1995 +1993 @@
 #define VMX_PROC_CTLS2_RDTSCP                                   RT_BIT(3)
 /** Virtualize x2APIC mode. */
-#define VMX_PROC_CTLS2_VIRT_X2APIC_ACCESS                       RT_BIT(4)
+#define VMX_PROC_CTLS2_VIRT_X2APIC_MODE                         RT_BIT(4)
 /** VPID supported/enabled. */
 #define VMX_PROC_CTLS2_VPID                                     RT_BIT(5)
@@ -2041 +2039 @@
 #define VMX_BF_PROC_CTLS2_RDTSCP_SHIFT                          3
 #define VMX_BF_PROC_CTLS2_RDTSCP_MASK                           UINT32_C(0x00000008)
-#define VMX_BF_PROC_CTLS2_VIRT_X2APIC_ACCESS_SHIFT              4
-#define VMX_BF_PROC_CTLS2_VIRT_X2APIC_ACCESS_MASK               UINT32_C(0x00000010)
+#define VMX_BF_PROC_CTLS2_VIRT_X2APIC_MODE_SHIFT                4
+#define VMX_BF_PROC_CTLS2_VIRT_X2APIC_MODE_MASK                 UINT32_C(0x00000010)
 #define VMX_BF_PROC_CTLS2_VPID_SHIFT                            5
 #define VMX_BF_PROC_CTLS2_VPID_MASK                             UINT32_C(0x00000020)
@@ -2082 +2080 @@
 #define VMX_BF_PROC_CTLS2_UNDEF_26_31_MASK                      UINT32_C(0xfc000000)
 RT_BF_ASSERT_COMPILE_CHECKS(VMX_BF_PROC_CTLS2_, UINT32_C(0), UINT32_MAX,
-                            (VIRT_APIC_ACCESS, EPT, DESC_TABLE_EXIT, RDTSCP, VIRT_X2APIC_ACCESS, VPID, WBINVD_EXIT,
+                            (VIRT_APIC_ACCESS, EPT, DESC_TABLE_EXIT, RDTSCP, VIRT_X2APIC_MODE, VPID, WBINVD_EXIT,
                              UNRESTRICTED_GUEST, APIC_REG_VIRT, VIRT_INT_DELIVERY, PAUSE_LOOP_EXIT, RDRAND_EXIT, INVPCID, VMFUNC,
                              VMCS_SHADOWING, ENCLS_EXIT, RDSEED_EXIT, PML, EPT_VE, CONCEAL_FROM_PT, XSAVES_XRSTORS, UNDEF_21_24,
@@ -3437 +3435 @@
     kVmxVInstrDiag_Vmread_VmxRoot,
     /* VMLAUNCH/VMRESUME. */
+    kVmxVInstrDiag_Vmentry_AddrApicAccess,
     kVmxVInstrDiag_Vmentry_AddrIoBitmapA,
     kVmxVInstrDiag_Vmentry_AddrIoBitmapB,
     kVmxVInstrDiag_Vmentry_AddrMsrBitmap,
     kVmxVInstrDiag_Vmentry_AddrVirtApicPage,
+    kVmxVInstrDiag_Vmentry_AddrVmreadBitmap,
+    kVmxVInstrDiag_Vmentry_AddrVmwriteBitmap,
+    kVmxVInstrDiag_Vmentry_ApicRegVirt,
     kVmxVInstrDiag_Vmentry_BlocKMovSS,
     kVmxVInstrDiag_Vmentry_Cpl,
@@ -3459 +3461 @@
     kVmxVInstrDiag_Vmentry_TprThresholdVTpr,
     kVmxVInstrDiag_Vmentry_VirtApicPagePtrReadPhys,
+    kVmxVInstrDiag_Vmentry_VirtIntDelivery,
     kVmxVInstrDiag_Vmentry_VirtNmi,
+    kVmxVInstrDiag_Vmentry_VirtX2ApicTprShadow,
+    kVmxVInstrDiag_Vmentry_VirtX2ApicVirtApic,
     kVmxVInstrDiag_Vmentry_VmcsClear,
     kVmxVInstrDiag_Vmentry_VmcsLaunch,
     kVmxVInstrDiag_Vmentry_VmxRoot,
+    kVmxVInstrDiag_Vmentry_Vpid,
     /* Last member for determining array index limit. */
     kVmxVInstrDiag_Last