Changeset 91304 in vbox

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

Files:

• include/VBox/vmm/cpum.mac (modified) (2 diffs)
• include/VBox/vmm/cpumctx.h (modified) (4 diffs)
• include/VBox/vmm/vm.h (modified) (1 diff)
• include/VBox/vmm/vm.mac (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (7 diffs)
• src/VBox/VMM/VMMR3/CPUM.cpp (modified) (7 diffs)
• src/VBox/VMM/include/CPUMInternal.mac (modified) (2 diffs)
• src/VBox/VMM/testcase/tstVMStruct.h (modified) (1 diff)
• src/VBox/VMM/testcase/tstVMStructSize.cpp (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

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -6754 +6754 @@
         /* Read the MSR bitmap. */
         RTGCPHYS const GCPhysMsrBitmap = pVmcs->u64AddrMsrBitmap.u;
-        Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap));
-        int rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap),
-                                         GCPhysMsrBitmap, VMX_V_MSR_BITMAP_SIZE);
+        int rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), &pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap[0],
+                                         GCPhysMsrBitmap, sizeof(pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap));
         if (RT_SUCCESS(rc))
         { /* likely */ }
@@ -7447 +7446 @@
     if (pVmcs->u32ProcCtls & VMX_PROC_CTLS_USE_MSR_BITMAPS)
     {
-        Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap));
-        uint32_t const fMsrpm = CPUMGetVmxMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), idMsr);
+        uint32_t const fMsrpm = CPUMGetVmxMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap, idMsr);
         if (uExitReason == VMX_EXIT_RDMSR)
             return RT_BOOL(fMsrpm & VMXMSRPM_EXIT_RD);

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -2127 +2127 @@
  *
  * @returns @c true if the MSR is intercepted, @c false otherwise.
- * @param   pvMsrBitmap     The MSR bitmap.
+ * @param   pbMsrBitmap     The MSR bitmap.
  * @param   offMsr          The MSR byte offset.
  * @param   iBit            The bit offset from the byte offset.
  */
-DECLINLINE(bool) hmR0VmxIsMsrBitSet(const void *pvMsrBitmap, uint16_t offMsr, int32_t iBit)
-{
-    uint8_t const * const pbMsrBitmap = (uint8_t const * const)pvMsrBitmap;
-    Assert(pbMsrBitmap);
+DECLINLINE(bool) hmR0VmxIsMsrBitSet(uint8_t const *pbMsrBitmap, uint16_t offMsr, int32_t iBit)
+{
     Assert(offMsr + (iBit >> 3) <= X86_PAGE_4K_SIZE);
     return ASMBitTest(pbMsrBitmap + offMsr, iBit);
@@ -2204 +2202 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
         bool const fClear = !fIsNstGstVmcs ? true
-                          : !hmR0VmxIsMsrBitSet(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), offMsrRead, iBit);
+                          : !hmR0VmxIsMsrBitSet(pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap, offMsrRead, iBit);
 #else
         RT_NOREF2(pVCpu, fIsNstGstVmcs);
@@ -2224 +2222 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
         bool const fClear = !fIsNstGstVmcs ? true
-                          : !hmR0VmxIsMsrBitSet(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), offMsrWrite, iBit);
+                          : !hmR0VmxIsMsrBitSet(pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap, offMsrWrite, iBit);
 #else
         RT_NOREF2(pVCpu, fIsNstGstVmcs);
@@ -2840 +2838 @@
                      * allow passthrough too.
                      */
-                    void const *pvMsrBitmapNstGst = pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap);
+                    void const *pvMsrBitmapNstGst = pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap;
                     Assert(pvMsrBitmapNstGst);
                     uint32_t const fMsrpmNstGst = CPUMGetVmxMsrPermission(pvMsrBitmapNstGst, pGuestMsrLoad->u32Msr);
@@ -10422 +10420 @@
     if (pVmcsNstGst->u32ProcCtls & VMX_PROC_CTLS_USE_MSR_BITMAPS)
     {
-        uint64_t const *pu64MsrBitmapNstGst = (uint64_t const *)pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap);
+        uint64_t const *pu64MsrBitmapNstGst = (uint64_t const *)&pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap[0];
         uint64_t const *pu64MsrBitmapGst    = (uint64_t const *)pVmcsInfoGst->pvMsrBitmap;
         Assert(pu64MsrBitmapNstGst);
@@ -17325 +17323 @@
     uint32_t fMsrpm;
     if (CPUMIsGuestVmxProcCtlsSet(&pVCpu->cpum.GstCtx, VMX_PROC_CTLS_USE_MSR_BITMAPS))
-        fMsrpm = CPUMGetVmxMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), pVCpu->cpum.GstCtx.ecx);
+        fMsrpm = CPUMGetVmxMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap, pVCpu->cpum.GstCtx.ecx);
     else
         fMsrpm = VMXMSRPM_EXIT_RD;
@@ -17347 +17345 @@
     uint32_t fMsrpm;
     if (CPUMIsGuestVmxProcCtlsSet(&pVCpu->cpum.GstCtx, VMX_PROC_CTLS_USE_MSR_BITMAPS))
-        fMsrpm = CPUMGetVmxMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pvMsrBitmap), pVCpu->cpum.GstCtx.ecx);
+        fMsrpm = CPUMGetVmxMsrPermission(pVCpu->cpum.GstCtx.hwvirt.vmx.abMsrBitmap, pVCpu->cpum.GstCtx.ecx);
     else
         fMsrpm = VMXMSRPM_EXIT_WR;

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

@@ -1067 +1067 @@
             pCtx->hwvirt.vmx.pvVirtApicPageR3 = NULL;
         }
-        if (pCtx->hwvirt.vmx.pvMsrBitmapR3)
-        {
-            SUPR3ContFree(pCtx->hwvirt.vmx.pvMsrBitmapR3, VMX_V_MSR_BITMAP_PAGES);
-            pCtx->hwvirt.vmx.pvMsrBitmapR3 = NULL;
-        }
         if (pCtx->hwvirt.vmx.pvIoBitmapR3)
         {
@@ -1118 +1113 @@
         AssertCompile(sizeof(pCtx->hwvirt.vmx.aExitMsrLoadArea) == VMX_V_AUTOMSR_AREA_PAGES * X86_PAGE_SIZE);
         AssertCompile(sizeof(pCtx->hwvirt.vmx.aExitMsrLoadArea) == VMX_V_AUTOMSR_AREA_SIZE);
+        AssertCompile(sizeof(pCtx->hwvirt.vmx.abMsrBitmap) == VMX_V_MSR_BITMAP_PAGES * X86_PAGE_SIZE);
+        AssertCompile(sizeof(pCtx->hwvirt.vmx.abMsrBitmap) == VMX_V_MSR_BITMAP_SIZE);
 
         /*
@@ -1135 +1132 @@
 
         /*
-         * Allocate the MSR bitmap.
-         */
-        pCtx->hwvirt.vmx.pvMsrBitmapR3 = SUPR3ContAlloc(VMX_V_MSR_BITMAP_PAGES, &pCtx->hwvirt.vmx.pvMsrBitmapR0, NULL);
-        if (pCtx->hwvirt.vmx.pvMsrBitmapR3)
-        { /* likely */ }
-        else
-        {
-            LogRel(("CPUM%u: Failed to alloc %u pages for the nested-guest's MSR bitmap\n", pVCpu->idCpu,
-                    VMX_V_MSR_BITMAP_PAGES));
-            break;
-        }
-
-        /*
          * Allocate the I/O bitmaps (A and B).
          */
@@ -1164 +1148 @@
          * Zero out all allocated pages (should compress well for saved-state).
          */
+        /** @todo this is and always was unnecessary - they are already zeroed. */
         RT_ZERO(pCtx->hwvirt.vmx.Vmcs);
         RT_ZERO(pCtx->hwvirt.vmx.ShadowVmcs);
@@ -1171 +1156 @@
         RT_ZERO(pCtx->hwvirt.vmx.aExitMsrStoreArea);
         RT_ZERO(pCtx->hwvirt.vmx.aExitMsrLoadArea);
-        memset(pCtx->hwvirt.vmx.CTX_SUFF(pvMsrBitmap),         0, VMX_V_MSR_BITMAP_SIZE);
+        RT_ZERO(pCtx->hwvirt.vmx.abMsrBitmap);
         memset(pCtx->hwvirt.vmx.CTX_SUFF(pvIoBitmap),          0, VMX_V_IO_BITMAP_A_SIZE + VMX_V_IO_BITMAP_B_SIZE);
         memset(pCtx->hwvirt.vmx.CTX_SUFF(pvVirtApicPage),      0, VMX_V_VIRT_APIC_SIZE);
@@ -2485 +2470 @@
             SSMR3PutMem(pSSM,     &pGstCtx->hwvirt.vmx.aExitMsrStoreArea[0], sizeof(pGstCtx->hwvirt.vmx.aExitMsrStoreArea));
             SSMR3PutMem(pSSM,     &pGstCtx->hwvirt.vmx.aExitMsrLoadArea[0],  sizeof(pGstCtx->hwvirt.vmx.aExitMsrLoadArea));
-            SSMR3PutMem(pSSM,      pGstCtx->hwvirt.vmx.pvMsrBitmapR3, VMX_V_MSR_BITMAP_SIZE);
+            SSMR3PutMem(pSSM,     &pGstCtx->hwvirt.vmx.abMsrBitmap[0],       sizeof(pGstCtx->hwvirt.vmx.abMsrBitmap));
             SSMR3PutMem(pSSM,      pGstCtx->hwvirt.vmx.pvIoBitmapR3, VMX_V_IO_BITMAP_A_SIZE + VMX_V_IO_BITMAP_B_SIZE);
             SSMR3PutU64(pSSM,      pGstCtx->hwvirt.vmx.uFirstPauseLoopTick);
@@ -2775 +2760 @@
                         SSMR3GetMem(pSSM,      &pGstCtx->hwvirt.vmx.aExitMsrStoreArea[0], sizeof(pGstCtx->hwvirt.vmx.aExitMsrStoreArea));
                         SSMR3GetMem(pSSM,      &pGstCtx->hwvirt.vmx.aExitMsrLoadArea[0],  sizeof(pGstCtx->hwvirt.vmx.aExitMsrLoadArea));
-                        SSMR3GetMem(pSSM,       pGstCtx->hwvirt.vmx.pvMsrBitmapR3, VMX_V_MSR_BITMAP_SIZE);
+                        SSMR3GetMem(pSSM,      &pGstCtx->hwvirt.vmx.abMsrBitmap[0],       sizeof(pGstCtx->hwvirt.vmx.abMsrBitmap));
                         SSMR3GetMem(pSSM,       pGstCtx->hwvirt.vmx.pvIoBitmapR3, VMX_V_IO_BITMAP_A_SIZE + VMX_V_IO_BITMAP_B_SIZE);
                         SSMR3GetU64(pSSM,      &pGstCtx->hwvirt.vmx.uFirstPauseLoopTick);

trunk/src/VBox/VMM/include/CPUMInternal.mac

@@ -255 +255 @@
     .Guest.hwvirt.vmx.aExitMsrStoreArea     resb        0x2000
     .Guest.hwvirt.vmx.aExitMsrLoadArea      resb        0x2000
+    .Guest.hwvirt.vmx.abMsrBitmap           resb        0x1000
     alignb 8
     .Guest.hwvirt.vmx.GCPhysVmxon           resq        1
@@ -269 +270 @@
     .Guest.hwvirt.vmx.pvVirtApicPageR0      resq        1
     .Guest.hwvirt.vmx.pvVirtApicPageR3      resq        1
-    .Guest.hwvirt.vmx.pvMsrBitmapR0         resq        1
-    .Guest.hwvirt.vmx.pvMsrBitmapR3         resq        1
     .Guest.hwvirt.vmx.pvIoBitmapR0          resq        1
     .Guest.hwvirt.vmx.pvIoBitmapR3          resq        1

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -150 +150 @@
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvVirtApicPageR0);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvVirtApicPageR3);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvMsrBitmapR0);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvMsrBitmapR3);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvIoBitmapR0);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvIoBitmapR3);

trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp

@@ -259 +259 @@
     CHECK_MEMBER_ALIGNMENT(VMCPU, cpum.s.Guest.hwvirt.vmx.aExitMsrStoreArea, 4096);
     CHECK_MEMBER_ALIGNMENT(VMCPU, cpum.s.Guest.hwvirt.vmx.aExitMsrLoadArea, 4096);
+    CHECK_MEMBER_ALIGNMENT(VMCPU, cpum.s.Guest.hwvirt.vmx.abMsrBitmap, 4096);
 
     PVM pVM = NULL; NOREF(pVM);