Changeset 91292 in vbox

Timestamp:

Sep 17, 2021 12:06:15 AM (3 years ago)

Author:

vboxsync

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

146952

Message:

VMM/CPUM: Use SVM_???_PAGES constants to size the big CPUMCTX fields. bugref:10093

Location:

trunk

Files:

• include/VBox/vmm/cpumctx.h (modified) (3 diffs)
• src/VBox/VMM/VMMR3/CPUM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/cpumctx.h

@@ -507 +507 @@
                  * HMPHYSCPU while executing the nested-guest using hardware-assisted SVM.
                  * This one is just used for caching the bitmap from guest physical memory. */
-                uint8_t                 abMsrBitmap[0x2000];
+                uint8_t                 abMsrBitmap[SVM_MSRPM_PAGES * X86_PAGE_SIZE];
                 /** 0x7000 - The IOPM (IO Permission bitmap).
                  *
@@ -516 +516 @@
                  * This one is just used for caching the IOPM from guest physical memory in
                  * case the guest hypervisor allows direct access to some IO ports. */
-                uint8_t                 abIoBitmap[0x3000];
+                uint8_t                 abIoBitmap[SVM_IOPM_PAGES * X86_PAGE_SIZE];
 
                 /** 0xa000 - MSR holding physical address of the Guest's Host-state. */
@@ -843 +843 @@
 AssertCompileMembersAtSameOffset(CPUMCTX, CPUM_UNION_STRUCT_NM(s,n.) gs,   CPUMCTX, CPUM_UNION_NM(s.) aSRegs[X86_SREG_GS]);
 # endif
-AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.Vmcb,                  4096);
-AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.abMsrBitmap,           4096);
-AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.abIoBitmap,            4096);
+AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.Vmcb,                  X86_PAGE_SIZE);
+AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.abMsrBitmap,           X86_PAGE_SIZE);
+AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.abIoBitmap,            X86_PAGE_SIZE);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pVmcsR0,               8);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pShadowVmcsR0,         8);

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -1040 +1040 @@
         pVCpu->cpum.s.Guest.hwvirt.enmHwvirt = CPUMHWVIRT_SVM;
 
-        AssertCompile(SVM_VMCB_PAGES * X86_PAGE_SIZE == sizeof(pVCpu->cpum.s.Guest.hwvirt.svm.Vmcb));
+        AssertCompile(SVM_VMCB_PAGES  * X86_PAGE_SIZE == sizeof(pVCpu->cpum.s.Guest.hwvirt.svm.Vmcb));
         AssertCompile(SVM_MSRPM_PAGES * X86_PAGE_SIZE == sizeof(pVCpu->cpum.s.Guest.hwvirt.svm.abMsrBitmap));
-        AssertCompile(SVM_IOPM_PAGES * X86_PAGE_SIZE == sizeof(pVCpu->cpum.s.Guest.hwvirt.svm.abIoBitmap));
+        AssertCompile(SVM_IOPM_PAGES  * X86_PAGE_SIZE == sizeof(pVCpu->cpum.s.Guest.hwvirt.svm.abIoBitmap));
     }