Changeset 79572 in vbox for trunk/include

Timestamp:

Jul 7, 2019 9:22:30 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Use a separate HC page for the guest's virtual-APIC page.

File:

• trunk/include/VBox/vmm/cpumctx.h (modified) (5 diffs)

trunk/include/VBox/vmm/cpumctx.h

@@ -601 +601 @@
                 uint32_t                uShadowVmcsR3Padding;
 #endif
-                /** 0x328 - Reserved - R0 ptr. */
-                R0PTRTYPE(void *)       pvRsvdR0;
-#if HC_ARCH_BITS == 32
-                uint32_t                uRsvdR0Padding0;
-#endif
-                /** 0x330 - Reserved - R3 ptr. */
-                R3PTRTYPE(void *)       pvRsvdR3;
-#if HC_ARCH_BITS == 32
-                uint32_t                uRsvdR3Padding0;
+                /** 0x328 - The virtual-APIC page - R0 ptr. */
+                R0PTRTYPE(void *)       pvVirtApicPageR0;
+#if HC_ARCH_BITS == 32
+                uint32_t                uVirtApicPageR0Padding;
+#endif
+                /** 0x330 - The virtual-APIC page - R3 ptr. */
+                R3PTRTYPE(void *)       pvVirtApicPageR3;
+#if HC_ARCH_BITS == 32
+                uint32_t                uVirtApicPageR3Padding;
 #endif
                 /** 0x338 - The VMREAD bitmap - R0 ptr. */
@@ -692 +692 @@
                 /** 0x3c2 - Whether virtual-NMI blocking is in effect. */
                 bool                    fVirtNmiBlocking;
-                /** 0x3c3 - Padding. */
-                uint8_t                 abPadding0[5];
+                /** 0x3c3 - Whether the virtual-APIC may have been modified in VMX non-root
+                 *  operation and we should write to it before VM-exit. */
+                bool                    fVirtApicPageDirty;
+                /** 0x3c4 - Padding. */
+                uint8_t                 abPadding0[4];
                 /** 0x3c8 - Guest VMX MSRs. */
                 VMXMSRS                 Msrs;
@@ -701 +704 @@
                 RTHCPHYS                HCPhysShadowVmcs;
                 /** 0x4b8 - Host physical address of the virtual-APIC page. */
-                RTHCPHYS                HCPhysRsvd0;
+                RTHCPHYS                HCPhysVirtApicPage;
                 /** 0x4c0 - Host physical address of the VMREAD bitmap. */
                 RTHCPHYS                HCPhysVmreadBitmap;
@@ -814 +817 @@
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pShadowVmcsR0,               0x318);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pShadowVmcsR3,               0x320);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvVirtApicPageR0,            0x328);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvVirtApicPageR3,            0x330);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvVmreadBitmapR0,            0x338);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvVmreadBitmapR3,            0x340);
@@ -833 +838 @@
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.offVirtApicWrite,            0x3c0);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.fVirtNmiBlocking,            0x3c2);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.fVirtApicPageDirty,          0x3c3);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.Msrs,                        0x3c8);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.HCPhysVmcs,                  0x4a8);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.HCPhysShadowVmcs,            0x4b0);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.HCPhysVirtApicPage,          0x4b8);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.HCPhysVmreadBitmap,          0x4c0);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.HCPhysVmwriteBitmap,         0x4c8);