Changeset 91286 in vbox

Timestamp:

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

Author:

vboxsync

Message:

VMM/CPUM: Eliminated a bunch of unused host physical addresses in CPUMCTX. bugref:10093

Location:

trunk

Files:

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

trunk/include/VBox/vmm/cpumctx.h

@@ -615 +615 @@
                 /** 0x3f0 - Guest VMX MSRs. */
                 VMXMSRS                 Msrs;
-                /** 0x4d0 - Host physical address of the VMCS. */
-                RTHCPHYS                HCPhysVmcs;
-                /** 0x4d8 - Host physical address of the shadow VMCS. */
-                RTHCPHYS                HCPhysShadowVmcs;
                 /** 0x4e0 - Host physical address of the virtual-APIC page. */
                 RTHCPHYS                HCPhysVirtApicPage;
-                /** 0x4e8 - Host physical address of the VMREAD bitmap. */
-                RTHCPHYS                HCPhysVmreadBitmap;
-                /** 0x4f0 - Host physical address of the VMWRITE bitmap. */
-                RTHCPHYS                HCPhysVmwriteBitmap;
-                /** 0x4f8 - Host physical address of the VM-entry MSR-load area. */
-                RTHCPHYS                HCPhysEntryMsrLoadArea;
-                /** 0x500 - Host physical address of the VM-exit MSR-store area. */
-                RTHCPHYS                HCPhysExitMsrStoreArea;
-                /** 0x508 - Host physical address of the VM-exit MSR-load area. */
-                RTHCPHYS                HCPhysExitMsrLoadArea;
-                /** 0x510 - Host physical address of the MSR bitmap. */
-                RTHCPHYS                HCPhysMsrBitmap;
-                /** 0x518 - Host physical address of the I/O bitmap. */
-                RTHCPHYS                HCPhysIoBitmap;
             } vmx;
         } CPUM_UNION_NM(s);

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

@@ -1237 +1237 @@
          * Allocate the nested-guest current VMCS.
          */
-        pCtx->hwvirt.vmx.pVmcsR3 = (PVMXVVMCS)SUPR3ContAlloc(VMX_V_VMCS_PAGES,
-                                                             &pCtx->hwvirt.vmx.pVmcsR0,
-                                                             &pCtx->hwvirt.vmx.HCPhysVmcs);
+        pCtx->hwvirt.vmx.pVmcsR3 = (PVMXVVMCS)SUPR3ContAlloc(VMX_V_VMCS_PAGES, &pCtx->hwvirt.vmx.pVmcsR0, NULL);
         if (pCtx->hwvirt.vmx.pVmcsR3)
         { /* likely */ }
@@ -1251 +1249 @@
          * Allocate the nested-guest shadow VMCS.
          */
-        pCtx->hwvirt.vmx.pShadowVmcsR3 = (PVMXVVMCS)SUPR3ContAlloc(VMX_V_VMCS_PAGES,
-                                                                   &pCtx->hwvirt.vmx.pShadowVmcsR0,
-                                                                   &pCtx->hwvirt.vmx.HCPhysShadowVmcs);
+        pCtx->hwvirt.vmx.pShadowVmcsR3 = (PVMXVVMCS)SUPR3ContAlloc(VMX_V_VMCS_PAGES, &pCtx->hwvirt.vmx.pShadowVmcsR0, NULL);
         if (pCtx->hwvirt.vmx.pShadowVmcsR3)
         { /* likely */ }
@@ -1281 +1277 @@
          */
         pCtx->hwvirt.vmx.pvVmreadBitmapR3 = SUPR3ContAlloc(VMX_V_VMREAD_VMWRITE_BITMAP_PAGES,
-                                                           &pCtx->hwvirt.vmx.pvVmreadBitmapR0,
-                                                           &pCtx->hwvirt.vmx.HCPhysVmreadBitmap);
+                                                           &pCtx->hwvirt.vmx.pvVmreadBitmapR0, NULL);
         if (pCtx->hwvirt.vmx.pvVmreadBitmapR3)
         { /* likely */ }
@@ -1296 +1291 @@
          */
         pCtx->hwvirt.vmx.pvVmwriteBitmapR3 = SUPR3ContAlloc(VMX_V_VMREAD_VMWRITE_BITMAP_PAGES,
-                                                            &pCtx->hwvirt.vmx.pvVmwriteBitmapR0,
-                                                            &pCtx->hwvirt.vmx.HCPhysVmwriteBitmap);
+                                                            &pCtx->hwvirt.vmx.pvVmwriteBitmapR0, NULL);
         if (pCtx->hwvirt.vmx.pvVmwriteBitmapR3)
         { /* likely */ }
@@ -1311 +1305 @@
          */
         pCtx->hwvirt.vmx.pEntryMsrLoadAreaR3 = (PVMXAUTOMSR)SUPR3ContAlloc(VMX_V_AUTOMSR_AREA_PAGES,
-                                                                           &pCtx->hwvirt.vmx.pEntryMsrLoadAreaR0,
-                                                                           &pCtx->hwvirt.vmx.HCPhysEntryMsrLoadArea);
+                                                                           &pCtx->hwvirt.vmx.pEntryMsrLoadAreaR0, NULL);
         if (pCtx->hwvirt.vmx.pEntryMsrLoadAreaR3)
         { /* likely */ }
@@ -1326 +1319 @@
          */
         pCtx->hwvirt.vmx.pExitMsrStoreAreaR3 = (PVMXAUTOMSR)SUPR3ContAlloc(VMX_V_AUTOMSR_AREA_PAGES,
-                                                                           &pCtx->hwvirt.vmx.pExitMsrStoreAreaR0,
-                                                                           &pCtx->hwvirt.vmx.HCPhysExitMsrStoreArea);
+                                                                           &pCtx->hwvirt.vmx.pExitMsrStoreAreaR0, NULL);
         if (pCtx->hwvirt.vmx.pExitMsrStoreAreaR3)
         { /* likely */ }
@@ -1341 +1333 @@
          */
         pCtx->hwvirt.vmx.pExitMsrLoadAreaR3 = (PVMXAUTOMSR)SUPR3ContAlloc(VMX_V_AUTOMSR_AREA_PAGES,
-                                                                          &pCtx->hwvirt.vmx.pExitMsrLoadAreaR0,
-                                                                          &pCtx->hwvirt.vmx.HCPhysExitMsrLoadArea);
+                                                                          &pCtx->hwvirt.vmx.pExitMsrLoadAreaR0, NULL);
         if (pCtx->hwvirt.vmx.pExitMsrLoadAreaR3)
         { /* likely */ }
@@ -1355 +1346 @@
          * Allocate the MSR bitmap.
          */
-        pCtx->hwvirt.vmx.pvMsrBitmapR3 = SUPR3ContAlloc(VMX_V_MSR_BITMAP_PAGES,
-                                                        &pCtx->hwvirt.vmx.pvMsrBitmapR0,
-                                                        &pCtx->hwvirt.vmx.HCPhysMsrBitmap);
+        pCtx->hwvirt.vmx.pvMsrBitmapR3 = SUPR3ContAlloc(VMX_V_MSR_BITMAP_PAGES, &pCtx->hwvirt.vmx.pvMsrBitmapR0, NULL);
         if (pCtx->hwvirt.vmx.pvMsrBitmapR3)
         { /* likely */ }
@@ -1371 +1360 @@
          */
         pCtx->hwvirt.vmx.pvIoBitmapR3 = SUPR3ContAlloc(VMX_V_IO_BITMAP_A_PAGES + VMX_V_IO_BITMAP_B_PAGES,
-                                                       &pCtx->hwvirt.vmx.pvIoBitmapR0,
-                                                       &pCtx->hwvirt.vmx.HCPhysIoBitmap);
+                                                       &pCtx->hwvirt.vmx.pvIoBitmapR0, NULL);
         if (pCtx->hwvirt.vmx.pvIoBitmapR3)
         { /* likely */ }

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

@@ -178 +178 @@
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.fVirtNmiBlocking);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.Msrs);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.HCPhysVmcs);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.HCPhysShadowVmcs);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.HCPhysVmreadBitmap);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.HCPhysVmwriteBitmap);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.HCPhysEntryMsrLoadArea);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.HCPhysExitMsrStoreArea);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.HCPhysExitMsrLoadArea);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.HCPhysMsrBitmap);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.HCPhysIoBitmap);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.enmHwvirt);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.fGif);