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

Timestamp:

Sep 17, 2021 12:02:38 PM (3 years ago)

Author:

vboxsync

Message:

VMM/CPUM,++: Moved the nested VT-X shadow VMCS allocation into CPUMCTX. bugref:10093

Location:

trunk/include/VBox/vmm

Files:

• cpum.mac (modified) (2 diffs)
• cpumctx.h (modified) (3 diffs)

trunk/include/VBox/vmm/cpum.mac

@@ -265 +265 @@
 
     alignb 4096
+    .hwvirt                             resb        0
+    .hwvirt.svm                         resb        0
+    .hwvirt.vmx                         resb        0
     .hwvirt.svm.Vmcb                    resb        4096
     .hwvirt.svm.abMsrBitmap             resb        8192
@@ -277 +280 @@
     .hwvirt.svm.fInterceptEvents       resb          1
     ;.unnamed_padding.1 resb 0
+
+    .hwvirt.vmx.Vmcs                    EQU (.hwvirt.vmx )
+    .hwvirt.vmx.ShadowVmcs              EQU (.hwvirt.vmx + 0x1000)
+
     alignb 8
     .hwvirt.enmHwvirt                  resd          1

trunk/include/VBox/vmm/cpumctx.h

@@ -541 +541 @@
                 /** 0x4000 - The current VMCS. */
                 VMXVVMCS                Vmcs;
+                /** 0X5000 - The shadow VMCS. */
+                VMXVVMCS                ShadowVmcs;
 
                 /** 0x300 - Guest physical address of the VMXON region. */
@@ -566 +568 @@
                  *  mode before execution of IRET. */
                 bool                    fNmiUnblockingIret;
-                /** 0X340 - The shadow VMCS - R0 ptr. */
-                R0PTRTYPE(PVMXVVMCS)    pShadowVmcsR0;
-                /** 0x348 - The shadow VMCS - R3 ptr. */
-                R3PTRTYPE(PVMXVVMCS)    pShadowVmcsR3;
                 /** 0x350 - The virtual-APIC page - R0 ptr. */
                 R0PTRTYPE(void *)       pvVirtApicPageR0;
@@ -846 +844 @@
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.abIoBitmap,            X86_PAGE_SIZE);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.Vmcs,                  X86_PAGE_SIZE);
-AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pShadowVmcsR0,         8);
+AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.ShadowVmcs,            X86_PAGE_SIZE);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvVmreadBitmapR0,      8);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvVmwriteBitmapR0,     8);