Changeset 91298 in vbox

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

Files:

• include/VBox/vmm/cpum.mac (modified) (2 diffs)
• include/VBox/vmm/cpumctx.h (modified) (3 diffs)
• src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (5 diffs)
• src/VBox/VMM/VMMR3/CPUM.cpp (modified) (6 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

@@ -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);

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

@@ -6719 +6719 @@
         /* Read the VMCS-link pointer from guest memory. */
         RTGCPHYS const GCPhysShadowVmcs = pVmcs->u64VmcsLinkPtr.u;
-        Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pShadowVmcs));
-        int rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pShadowVmcs),
-                                         GCPhysShadowVmcs, VMX_V_SHADOW_VMCS_SIZE);
+        int rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), &pVCpu->cpum.GstCtx.hwvirt.vmx.ShadowVmcs,
+                                         GCPhysShadowVmcs, sizeof(pVCpu->cpum.GstCtx.hwvirt.vmx.ShadowVmcs));
         if (RT_SUCCESS(rc))
         { /* likely */ }
@@ -6731 +6730 @@
 
         /* Verify the VMCS revision specified by the guest matches what we reported to the guest. */
-        if (pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pShadowVmcs)->u32VmcsRevId.n.u31RevisionId == VMX_V_VMCS_REVISION_ID)
+        if (pVCpu->cpum.GstCtx.hwvirt.vmx.ShadowVmcs.u32VmcsRevId.n.u31RevisionId == VMX_V_VMCS_REVISION_ID)
         { /* likely */ }
         else
@@ -6741 +6740 @@
         /* Verify the shadow bit is set if VMCS shadowing is enabled . */
         if (   !(pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_VMCS_SHADOWING)
-            || pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pShadowVmcs)->u32VmcsRevId.n.fIsShadowVmcs)
+            || pVCpu->cpum.GstCtx.hwvirt.vmx.ShadowVmcs.u32VmcsRevId.n.fIsShadowVmcs)
         { /* likely */ }
         else
@@ -7592 +7591 @@
     PCVMXVVMCS pVmcs = !IEM_VMX_IS_NON_ROOT_MODE(pVCpu)
                      ? &pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs
-                     : pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pShadowVmcs);
-    Assert(pVmcs);
+                     : &pVCpu->cpum.GstCtx.hwvirt.vmx.ShadowVmcs;
     iemVmxVmreadNoCheck(pVmcs, pu64Dst, u64VmcsField);
     return VINF_SUCCESS;
@@ -7862 +7860 @@
     PVMXVVMCS pVmcs = !fInVmxNonRootMode
                     ? &pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs
-                    : pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pShadowVmcs);
-    Assert(pVmcs);
+                    : &pVCpu->cpum.GstCtx.hwvirt.vmx.ShadowVmcs;
     iemVmxVmwriteNoCheck(pVmcs, u64Val, u64VmcsField);
 

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

@@ -1062 +1062 @@
         PCPUMCTX pCtx  = &pVCpu->cpum.s.Guest;
 
-        if (pCtx->hwvirt.vmx.pShadowVmcsR3)
-        {
-            SUPR3ContFree(pCtx->hwvirt.vmx.pShadowVmcsR3, VMX_V_VMCS_PAGES);
-            pCtx->hwvirt.vmx.pShadowVmcsR3 = NULL;
-        }
         if (pCtx->hwvirt.vmx.pvVirtApicPageR3)
         {
@@ -1135 +1130 @@
 
         AssertCompile(sizeof(pCtx->hwvirt.vmx.Vmcs) == VMX_V_VMCS_PAGES * X86_PAGE_SIZE);
-
-        /*
-         * Allocate the nested-guest shadow VMCS.
-         */
-        pCtx->hwvirt.vmx.pShadowVmcsR3 = (PVMXVVMCS)SUPR3ContAlloc(VMX_V_VMCS_PAGES, &pCtx->hwvirt.vmx.pShadowVmcsR0, NULL);
-        if (pCtx->hwvirt.vmx.pShadowVmcsR3)
-        { /* likely */ }
-        else
-        {
-            LogRel(("CPUM%u: Failed to alloc %u pages for the nested-guest's shadow VMCS\n", pVCpu->idCpu, VMX_V_VMCS_PAGES));
-            break;
-        }
+        AssertCompile(sizeof(pCtx->hwvirt.vmx.Vmcs) == VMX_V_VMCS_SIZE);
+        AssertCompile(sizeof(pCtx->hwvirt.vmx.ShadowVmcs) == VMX_V_SHADOW_VMCS_PAGES * X86_PAGE_SIZE);
+        AssertCompile(sizeof(pCtx->hwvirt.vmx.ShadowVmcs) == VMX_V_SHADOW_VMCS_SIZE);
 
         /*
@@ -1264 +1250 @@
          */
         RT_ZERO(pCtx->hwvirt.vmx.Vmcs);
-        memset(pCtx->hwvirt.vmx.CTX_SUFF(pShadowVmcs),         0, VMX_V_SHADOW_VMCS_SIZE);
+        RT_ZERO(pCtx->hwvirt.vmx.ShadowVmcs);
         memset(pCtx->hwvirt.vmx.CTX_SUFF(pvVirtApicPage),      0, VMX_V_VIRT_APIC_SIZE);
         memset(pCtx->hwvirt.vmx.CTX_SUFF(pvVmreadBitmap),      0, VMX_V_VMREAD_VMWRITE_BITMAP_SIZE);
@@ -1292 +1278 @@
     PCPUMCTX pCtx = &pVCpu->cpum.s.Guest;
     Assert(pCtx->hwvirt.enmHwvirt == CPUMHWVIRT_VMX);
-    Assert(pCtx->hwvirt.vmx.CTX_SUFF(pShadowVmcs));
 
     RT_ZERO(pCtx->hwvirt.vmx.Vmcs);
-    memset(pCtx->hwvirt.vmx.CTX_SUFF(pShadowVmcs), 0, VMX_V_SHADOW_VMCS_SIZE);
+    RT_ZERO(pCtx->hwvirt.vmx.ShadowVmcs);
     pCtx->hwvirt.vmx.GCPhysVmxon       = NIL_RTGCPHYS;
     pCtx->hwvirt.vmx.GCPhysShadowVmcs  = NIL_RTGCPHYS;
@@ -2578 +2563 @@
             SSMR3PutBool(pSSM,     pGstCtx->hwvirt.vmx.fNmiUnblockingIret);
             SSMR3PutStructEx(pSSM, &pGstCtx->hwvirt.vmx.Vmcs, sizeof(pGstCtx->hwvirt.vmx.Vmcs), 0, g_aVmxHwvirtVmcs, NULL);
-            SSMR3PutStructEx(pSSM, pGstCtx->hwvirt.vmx.pShadowVmcsR3, sizeof(VMXVVMCS), 0, g_aVmxHwvirtVmcs, NULL);
+            SSMR3PutStructEx(pSSM, &pGstCtx->hwvirt.vmx.ShadowVmcs, sizeof(pGstCtx->hwvirt.vmx.ShadowVmcs),
+                             0, g_aVmxHwvirtVmcs, NULL);
             SSMR3PutMem(pSSM,      pGstCtx->hwvirt.vmx.pvVmreadBitmapR3, VMX_V_VMREAD_VMWRITE_BITMAP_SIZE);
             SSMR3PutMem(pSSM,      pGstCtx->hwvirt.vmx.pvVmwriteBitmapR3, VMX_V_VMREAD_VMWRITE_BITMAP_SIZE);
@@ -2867 +2853 @@
                         SSMR3GetStructEx(pSSM, &pGstCtx->hwvirt.vmx.Vmcs, sizeof(pGstCtx->hwvirt.vmx.Vmcs),
                                          0, g_aVmxHwvirtVmcs, NULL);
-                        SSMR3GetStructEx(pSSM,  pGstCtx->hwvirt.vmx.pShadowVmcsR3, sizeof(VMXVVMCS), 0, g_aVmxHwvirtVmcs, NULL);
+                        SSMR3GetStructEx(pSSM, &pGstCtx->hwvirt.vmx.ShadowVmcs, sizeof(pGstCtx->hwvirt.vmx.ShadowVmcs),
+                                         0, g_aVmxHwvirtVmcs, NULL);
                         SSMR3GetMem(pSSM,       pGstCtx->hwvirt.vmx.pvVmreadBitmapR3, VMX_V_VMREAD_VMWRITE_BITMAP_SIZE);
                         SSMR3GetMem(pSSM,       pGstCtx->hwvirt.vmx.pvVmwriteBitmapR3, VMX_V_VMREAD_VMWRITE_BITMAP_SIZE);

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

@@ -231 +231 @@
 
     alignb 4096
+    .Guest.hwvirt                           resb        0
+    .Guest.hwvirt.svm                       resb        0
+    .Guest.hwvirt.vmx                       resb        0
+
     .Guest.hwvirt.svm.Vmcb                  resb        4096
     .Guest.hwvirt.svm.abMsrBitmap           resb        8192
@@ -243 +247 @@
     .Guest.hwvirt.svm.fInterceptEvents       resb         1
 
-    .Guest.hwvirt.vmx.Vmcs EQU .Guest.hwvirt.svm.Vmcb
+    .Guest.hwvirt.vmx.Vmcs                  EQU (.Guest.hwvirt.vmx )
+    .Guest.hwvirt.vmx.ShadowVmcs            EQU (.Guest.hwvirt.vmx + 0x1000)
 
     ;.unnamed_padding.1 resb 0

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.pShadowVmcsR0);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pShadowVmcsR3);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvVirtApicPageR0);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvVirtApicPageR3);

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

@@ -253 +253 @@
     CHECK_MEMBER_ALIGNMENT(VMCPU, cpum.s.Guest.hwvirt.svm.abIoBitmap, 4096);
     CHECK_MEMBER_ALIGNMENT(VMCPU, cpum.s.Guest.hwvirt.vmx.Vmcs, 4096);
+    CHECK_MEMBER_ALIGNMENT(VMCPU, cpum.s.Guest.hwvirt.vmx.ShadowVmcs, 4096);
 
     PVM pVM = NULL; NOREF(pVM);