Changeset 91306 in vbox

Timestamp:

Sep 17, 2021 9:11:01 PM (3 years ago)

Author:

vboxsync

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

146966

Message:

VMM/CPUM,++: Moved the nested VT-X virtual apic page allocation into CPUMCTX. bugref:10093

Location:

trunk

Files:

• include/VBox/vmm/cpum.h (modified) (1 diff)
• include/VBox/vmm/cpum.mac (modified) (3 diffs)
• include/VBox/vmm/cpumctx.h (modified) (5 diffs)
• include/VBox/vmm/vm.h (modified) (1 diff)
• include/VBox/vmm/vm.mac (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/CPUM.cpp (modified) (8 diffs)
• src/VBox/VMM/include/CPUMInternal.mac (modified) (3 diffs)
• src/VBox/VMM/testcase/tstVMStruct.h (modified) (1 diff)
• src/VBox/VMM/testcase/tstVMStructSize.cpp (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -2441 +2441 @@
 }
 
-/**
- * Gets the nested-guest virtual-APIC page.
- *
- * @returns The virtual-APIC page.
- * @param   pCtx        Pointer to the context.
- * @param   pHCPhys     Where to store the host-physical address of the virtual-APIC
- *                      page.
- */
-DECLINLINE(void *) CPUMGetGuestVmxVirtApicPage(PCCPUMCTX pCtx, PRTHCPHYS pHCPhysVirtApicPage)
-{
-    Assert(pHCPhysVirtApicPage);
-    Assert(pCtx->hwvirt.enmHwvirt == CPUMHWVIRT_VMX);
-    *pHCPhysVirtApicPage = pCtx->hwvirt.vmx.HCPhysVirtApicPage;
-    return pCtx->hwvirt.vmx.CTX_SUFF(pvVirtApicPage);
-}
-
 # endif /* !IN_RC */
 

trunk/include/VBox/vmm/cpum.mac

@@ -290 +290 @@
     .hwvirt.vmx.abMsrBitmap             resb        0x1000
     .hwvirt.vmx.abIoBitmap              resb        0x1000+0x1000
+    .hwvirt.vmx.abVirtApicPage          resb        0x1000
     alignb 8
     .hwvirt.vmx.GCPhysVmxon             resq        1
@@ -302 +303 @@
     .hwvirt.vmx.fInterceptEvents        resb        1
     .hwvirt.vmx.fNmiUnblockingIret      resb        1
-    .hwvirt.vmx.pvVirtApicPageR0        resq        1
-    .hwvirt.vmx.pvVirtApicPageR3        resq        1
     .hwvirt.vmx.uFirstPauseLoopTick     resq        1
     .hwvirt.vmx.uPrevPauseTick          resq        1
@@ -311 +310 @@
     alignb 8
     .hwvirt.vmx.Msrs                    resb        224
-    .hwvirt.vmx.HCPhysVirtApicPage      resq        1
 
     alignb 8

trunk/include/VBox/vmm/cpumctx.h

@@ -557 +557 @@
                 /** 0x10000 - The I/O permission bitmap. */
                 uint8_t                 abIoBitmap[VMX_V_IO_BITMAP_A_SIZE + VMX_V_IO_BITMAP_B_SIZE];
+                /** 0x12000 - The virtual-APIC page.
+                 * @note This is used by VT-x hardware... */
+                uint8_t                 abVirtApicPage[VMX_V_VIRT_APIC_SIZE];
 
                 /** 0x300 - Guest physical address of the VMXON region. */
@@ -582 +585 @@
                  *  mode before execution of IRET. */
                 bool                    fNmiUnblockingIret;
-                /** 0x350 - The virtual-APIC page - R0 ptr. */
-                R0PTRTYPE(void *)       pvVirtApicPageR0;
-                /** 0x358 - The virtual-APIC page - R3 ptr. */
-                R3PTRTYPE(void *)       pvVirtApicPageR3;
                 /** 0x3d0 - Guest TSC timestamp of the first PAUSE instruction that is considered to
                  *  be the first in a loop. */
@@ -601 +600 @@
                 /** 0x3f0 - Guest VMX MSRs. */
                 VMXMSRS                 Msrs;
-                /** 0x4e0 - Host physical address of the virtual-APIC page. */
-                RTHCPHYS                HCPhysVirtApicPage;
             } vmx;
         } CPUM_UNION_NM(s);
@@ -619 +616 @@
         uint32_t                fPadding;
 #endif
+#if 0
         /** 0x530 - Pad to 64 byte boundary. */
-        uint8_t                 abPadding0[8+32];
+        uint8_t                 abPadding0[8+16+32];
+#endif
     } hwvirt;
 } CPUMCTX;
@@ -838 +837 @@
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.abMsrBitmap,           X86_PAGE_SIZE);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.abIoBitmap,            X86_PAGE_SIZE);
+AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.abVirtApicPage,        X86_PAGE_SIZE);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.Msrs,                  8);
 

trunk/include/VBox/vmm/vm.h

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

trunk/include/VBox/vmm/vm.mac

@@ -91 +91 @@
     .pgm                    resb 4096+28672
     alignb 4096
-    .cpum                   resb 98304
+    .cpum                   resb 102400
 %define VMCPU.cpum.GstCtx   VMCPU.cpum
     alignb 4096

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

@@ -1972 +1972 @@
         else
         {
-            pVmcsInfo->pbVirtApic = (uint8_t *)CPUMGetGuestVmxVirtApicPage(&pVCpu->cpum.GstCtx, &pVmcsInfo->HCPhysVirtApic);
-            Assert(pVmcsInfo->pbVirtApic);
+            pVmcsInfo->pbVirtApic     = &pVCpu->cpum.GstCtx.hwvirt.vmx.abVirtApicPage[0];
+            pVmcsInfo->HCPhysVirtApic = GVMMR0ConvertGVMPtr2HCPhys(pVM, pVmcsInfo->pbVirtApic);
             Assert(pVmcsInfo->HCPhysVirtApic && pVmcsInfo->HCPhysVirtApic != NIL_RTHCPHYS);
         }

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

@@ -1019 +1019 @@
     Assert(pVM->cpum.s.GuestFeatures.fSvm);
 
-    LogRel(("CPUM: Allocating %u pages for the nested-guest SVM MSR and IO permission bitmaps\n",
-            pVM->cCpus * (SVM_MSRPM_PAGES + SVM_IOPM_PAGES)));
+    LogRel(("CPUM: AMD-V nested-guest init\n"));
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
     {
@@ -1050 +1049 @@
 
 /**
- * Frees memory allocated for the VMX hardware virtualization state.
+ * Allocates memory for the VMX hardware virtualization state.
  *
  * @param   pVM     The cross context VM structure.
  */
-static void cpumR3FreeVmxHwVirtState(PVM pVM)
-{
-    Assert(pVM->cpum.s.GuestFeatures.fVmx);
+static void cpumR3InitVmxHwVirtState(PVM pVM)
+{
+    LogRel(("CPUM: VT-x nested-guest init\n"));
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
     {
@@ -1062 +1061 @@
         PCPUMCTX pCtx  = &pVCpu->cpum.s.Guest;
 
-        if (pCtx->hwvirt.vmx.pvVirtApicPageR3)
-        {
-            SUPR3ContFree(pCtx->hwvirt.vmx.pvVirtApicPageR3, VMX_V_VIRT_APIC_PAGES);
-            pCtx->hwvirt.vmx.pvVirtApicPageR3 = NULL;
-        }
-    }
-}
-
-
-/**
- * Allocates memory for the VMX hardware virtualization state.
- *
- * @returns VBox status code.
- * @param   pVM     The cross context VM structure.
- */
-static int cpumR3AllocVmxHwVirtState(PVM pVM)
-{
-    int rc = VINF_SUCCESS;
-    uint32_t const cPages = VMX_V_VMCS_PAGES
-                          + VMX_V_SHADOW_VMCS_PAGES
-                          + VMX_V_VIRT_APIC_PAGES
-                          + (2 * VMX_V_VMREAD_VMWRITE_BITMAP_PAGES)
-                          + (3 * VMX_V_AUTOMSR_AREA_PAGES)
-                          + VMX_V_MSR_BITMAP_PAGES
-                          + (VMX_V_IO_BITMAP_A_PAGES + VMX_V_IO_BITMAP_B_PAGES);
-    LogRel(("CPUM: Allocating %u pages for the nested-guest VMCS and related structures\n", pVM->cCpus * cPages));
-    for (VMCPUID i = 0; i < pVM->cCpus; i++)
-    {
-        PVMCPU   pVCpu = pVM->apCpusR3[i];
-        PCPUMCTX pCtx  = &pVCpu->cpum.s.Guest;
         pCtx->hwvirt.enmHwvirt = CPUMHWVIRT_VMX;
 
@@ -1112 +1081 @@
         AssertCompile(sizeof(pCtx->hwvirt.vmx.abIoBitmap) == (VMX_V_IO_BITMAP_A_PAGES + VMX_V_IO_BITMAP_B_PAGES) * X86_PAGE_SIZE);
         AssertCompile(sizeof(pCtx->hwvirt.vmx.abIoBitmap) == VMX_V_IO_BITMAP_A_SIZE + VMX_V_IO_BITMAP_B_SIZE);
-
-        /*
-         * Allocate the virtual-APIC page.
-         */
-        pCtx->hwvirt.vmx.pvVirtApicPageR3 = SUPR3ContAlloc(VMX_V_VIRT_APIC_PAGES,
-                                                           &pCtx->hwvirt.vmx.pvVirtApicPageR0,
-                                                           &pCtx->hwvirt.vmx.HCPhysVirtApicPage);
-        if (pCtx->hwvirt.vmx.pvVirtApicPageR3)
-        { /* likely */ }
-        else
-        {
-            LogRel(("CPUM%u: Failed to alloc %u pages for the nested-guest's virtual-APIC page\n", pVCpu->idCpu,
-                    VMX_V_VIRT_APIC_PAGES));
-            break;
-        }
+        AssertCompile(sizeof(pCtx->hwvirt.vmx.abVirtApicPage) == VMX_V_VIRT_APIC_PAGES * X86_PAGE_SIZE);
+        AssertCompile(sizeof(pCtx->hwvirt.vmx.abVirtApicPage) == VMX_V_VIRT_APIC_SIZE);
 
         /*
@@ -1141 +1097 @@
         RT_ZERO(pCtx->hwvirt.vmx.abMsrBitmap);
         RT_ZERO(pCtx->hwvirt.vmx.abIoBitmap);
-        memset(pCtx->hwvirt.vmx.CTX_SUFF(pvVirtApicPage),      0, VMX_V_VIRT_APIC_SIZE);
-    }
-
-    /* On any failure, cleanup. */
-    if (RT_FAILURE(rc))
-        cpumR3FreeVmxHwVirtState(pVM);
-
-    return rc;
+        RT_ZERO(pCtx->hwvirt.vmx.abVirtApicPage);
+    }
 }
 
@@ -2089 +2039 @@
 
     /*
-     * Allocate memory required by the guest hardware-virtualization structures.
+     * Init the VMX/SVM state.
+     *
      * This must be done after initializing CPUID/MSR features as we access the
      * the VMX/SVM guest features below.
@@ -2097 +2048 @@
      */
     if (pVM->cpum.s.GuestFeatures.fVmx)
-        rc = cpumR3AllocVmxHwVirtState(pVM);
+        cpumR3InitVmxHwVirtState(pVM);
     else if (pVM->cpum.s.GuestFeatures.fSvm)
         cpumR3InitSvmHwVirtState(pVM);
     else
         Assert(pVM->apCpusR3[0]->cpum.s.Guest.hwvirt.enmHwvirt == CPUMHWVIRT_NONE);
-    if (RT_FAILURE(rc))
-        return rc;
 
     CPUMR3Reset(pVM);
@@ -2157 +2106 @@
             }
         }
-
-        cpumR3FreeVmxHwVirtState(pVM);
     }
     return VINF_SUCCESS;

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

@@ -257 +257 @@
     .Guest.hwvirt.vmx.abMsrBitmap           resb        0x1000
     .Guest.hwvirt.vmx.abIoBitmap            resb        0x1000+0x1000
+    .Guest.hwvirt.vmx.abVirtApicPage        resb        0x1000
     alignb 8
     .Guest.hwvirt.vmx.GCPhysVmxon           resq        1
@@ -269 +270 @@
     .Guest.hwvirt.vmx.fInterceptEvents      resb        1
     .Guest.hwvirt.vmx.fNmiUnblockingIret    resb        1
-    .Guest.hwvirt.vmx.pvVirtApicPageR0      resq        1
-    .Guest.hwvirt.vmx.pvVirtApicPageR3      resq        1
     .Guest.hwvirt.vmx.uFirstPauseLoopTick   resq        1
     .Guest.hwvirt.vmx.uPrevPauseTick        resq        1
@@ -278 +277 @@
     alignb 8
     .Guest.hwvirt.vmx.Msrs                  resb        224
-    .Guest.hwvirt.vmx.HCPhysVirtApicPage    resq        1
 
     alignb 8

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

@@ -148 +148 @@
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.fInterceptEvents);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.fNmiUnblockingIret);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvVirtApicPageR0);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvVirtApicPageR3);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uFirstPauseLoopTick);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uPrevPauseTick);

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

@@ -261 +261 @@
     CHECK_MEMBER_ALIGNMENT(VMCPU, cpum.s.Guest.hwvirt.vmx.abMsrBitmap, 4096);
     CHECK_MEMBER_ALIGNMENT(VMCPU, cpum.s.Guest.hwvirt.vmx.abIoBitmap, 4096);
+    CHECK_MEMBER_ALIGNMENT(VMCPU, cpum.s.Guest.hwvirt.vmx.abVirtApicPage, 4096);
 
     PVM pVM = NULL; NOREF(pVM);