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

Timestamp:

Sep 17, 2021 8:43:17 PM (3 years ago)

Author:

vboxsync

Message:

VMM/CPUM,++: Moved the nested VT-X MSR permission bitmap allocations into CPUMCTX. bugref:10093

Location:

trunk/include/VBox/vmm

Files:

• cpum.mac (modified) (2 diffs)
• cpumctx.h (modified) (4 diffs)
• vm.h (modified) (1 diff)
• vm.mac (modified) (1 diff)

trunk/include/VBox/vmm/cpum.mac

@@ -288 +288 @@
     .hwvirt.vmx.aExitMsrStoreArea       resb        0x2000
     .hwvirt.vmx.aExitMsrLoadArea        resb        0x2000
+    .hwvirt.vmx.abMsrBitmap             resb        0x1000
     alignb 8
     .hwvirt.vmx.GCPhysVmxon             resq        1
@@ -302 +303 @@
     .hwvirt.vmx.pvVirtApicPageR0        resq        1
     .hwvirt.vmx.pvVirtApicPageR3        resq        1
-    .hwvirt.vmx.pvMsrBitmapR0           resq        1
-    .hwvirt.vmx.pvMsrBitmapR3           resq        1
     .hwvirt.vmx.pvIoBitmapR0            resq        1
     .hwvirt.vmx.pvIoBitmapR3            resq        1

trunk/include/VBox/vmm/cpumctx.h

@@ -553 +553 @@
                 /** 0xc000 - The VM-exit MSR-load area. */
                 VMXAUTOMSR              aExitMsrLoadArea[VMX_V_AUTOMSR_AREA_SIZE / sizeof(VMXAUTOMSR)];
+                /** 0xe000 - The MSR permission bitmap. */
+                uint8_t                 abMsrBitmap[VMX_V_MSR_BITMAP_SIZE];
 
                 /** 0x300 - Guest physical address of the VMXON region. */
@@ -582 +584 @@
                 /** 0x358 - The virtual-APIC page - R3 ptr. */
                 R3PTRTYPE(void *)       pvVirtApicPageR3;
-                /** 0x3b0 - MSR bitmap - R0 ptr. */
-                R0PTRTYPE(void *)       pvMsrBitmapR0;
-                /** 0x3b8 - The MSR bitmap - R3 ptr. */
-                R3PTRTYPE(void *)       pvMsrBitmapR3;
                 /** 0x3c0 - The I/O bitmap - R0 ptr. */
                 R0PTRTYPE(void *)       pvIoBitmapR0;
@@ -624 +622 @@
 #endif
         /** 0x530 - Pad to 64 byte boundary. */
-        uint8_t                 abPadding0[8];
+        uint8_t                 abPadding0[8+16];
     } hwvirt;
 } CPUMCTX;
@@ -840 +838 @@
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.aExitMsrStoreArea,     X86_PAGE_SIZE);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.aExitMsrLoadArea,      X86_PAGE_SIZE);
-AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvMsrBitmapR0,         8);
+AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.abMsrBitmap,           X86_PAGE_SIZE);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvIoBitmapR0,          8);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.Msrs,                  8);

trunk/include/VBox/vmm/vm.h

@@ -305 +305 @@
         CPUMCTX             GstCtx;
 #endif
-        uint8_t             padding[86016];      /* multiple of 4096 */
+        uint8_t             padding[90112];      /* multiple of 4096 */
     } cpum;
 

trunk/include/VBox/vmm/vm.mac

@@ -91 +91 @@
     .pgm                    resb 4096+28672
     alignb 4096
-    .cpum                   resb 86016
+    .cpum                   resb 90112
 %define VMCPU.cpum.GstCtx   VMCPU.cpum
     alignb 4096