Changeset 79344 in vbox

Timestamp:

Jun 26, 2019 9:06:36 AM (6 years ago)

Author:

vboxsync

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

131576

Message:

VMM/CPUM: Nested VMX: bugref:9180 Fix logging that calculates pages allocated for VMCS and related structures. Logging nits.

File:

• trunk/src/VBox/VMM/VMMR3/CPUM.cpp (modified) (8 diffs)

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

@@ -1188 +1188 @@
 {
     int rc = VINF_SUCCESS;
-    uint32_t const cPages = (2 * VMX_V_VMCS_PAGES)
+    uint32_t const cPages = VMX_V_VMCS_PAGES
+                          + VMX_V_SHADOW_VMCS_PAGES
                           + VMX_V_VIRT_APIC_PAGES
-                          + (2 * VMX_V_VMREAD_VMWRITE_BITMAP_SIZE)
-                          + (3 * VMX_V_AUTOMSR_AREA_SIZE)
-                          + VMX_V_MSR_BITMAP_SIZE
-                          + (VMX_V_IO_BITMAP_A_SIZE + VMX_V_IO_BITMAP_B_SIZE);
+                          + (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++)
@@ -1204 +1205 @@
          * Allocate the nested-guest current VMCS.
          */
-        Assert(VMX_V_VMCS_PAGES == 1);
         pCtx->hwvirt.vmx.pVmcsR3 = (PVMXVVMCS)SUPR3ContAlloc(VMX_V_VMCS_PAGES,
                                                              &pCtx->hwvirt.vmx.pVmcsR0,
@@ -1219 +1219 @@
          * Allocate the nested-guest shadow VMCS.
          */
-        Assert(VMX_V_VMCS_PAGES == 1);
         pCtx->hwvirt.vmx.pShadowVmcsR3 = (PVMXVVMCS)SUPR3ContAlloc(VMX_V_VMCS_PAGES,
                                                                    &pCtx->hwvirt.vmx.pShadowVmcsR0,
@@ -1340 +1339 @@
          */
         memset(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs),               0, VMX_V_VMCS_SIZE);
-        memset(pCtx->hwvirt.vmx.CTX_SUFF(pShadowVmcs),         0, VMX_V_VMCS_SIZE);
+        memset(pCtx->hwvirt.vmx.CTX_SUFF(pShadowVmcs),         0, VMX_V_SHADOW_VMCS_SIZE);
         memset(pCtx->hwvirt.vmx.CTX_SUFF(pvVmreadBitmap),      0, VMX_V_VMREAD_VMWRITE_BITMAP_SIZE);
         memset(pCtx->hwvirt.vmx.CTX_SUFF(pvVmwriteBitmap),     0, VMX_V_VMREAD_VMWRITE_BITMAP_SIZE);
@@ -1371 +1370 @@
 
     memset(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs),       0, VMX_V_VMCS_SIZE);
-    memset(pCtx->hwvirt.vmx.CTX_SUFF(pShadowVmcs), 0, VMX_V_VMCS_SIZE);
+    memset(pCtx->hwvirt.vmx.CTX_SUFF(pShadowVmcs), 0, VMX_V_SHADOW_VMCS_SIZE);
     pCtx->hwvirt.vmx.GCPhysVmxon       = NIL_RTGCPHYS;
     pCtx->hwvirt.vmx.GCPhysShadowVmcs  = NIL_RTGCPHYS;
@@ -1428 +1427 @@
         VMXFEATDUMP("UncondIoExit - Unconditional I/O exiting               ", fVmxUncondIoExit);
         VMXFEATDUMP("UseIoBitmaps - Use I/O bitmaps                         ", fVmxUseIoBitmaps);
-        VMXFEATDUMP("MonitorTrapFlag - Monitor trap flag                    ", fVmxMonitorTrapFlag);
+        VMXFEATDUMP("MonitorTrapFlag - Monitor Trap Flag                    ", fVmxMonitorTrapFlag);
         VMXFEATDUMP("UseMsrBitmaps - MSR bitmaps                            ", fVmxUseMsrBitmaps);
         VMXFEATDUMP("MonitorExit - MONITOR exiting                          ", fVmxMonitorExit);
@@ -1470 +1469 @@
         VMXFEATDUMP("ExitSaveEferLma - Save IA32_EFER.LMA on VM-exit        ", fVmxExitSaveEferLma);
         VMXFEATDUMP("IntelPt - Intel PT (Processor Trace) in VMX operation  ", fVmxIntelPt);
-        VMXFEATDUMP("VmwriteAll - Write allowed to read-only VMCS fields    ", fVmxVmwriteAll);
+        VMXFEATDUMP("VmwriteAll - VMWRITE to any supported VMCS field       ", fVmxVmwriteAll);
         VMXFEATDUMP("EntryInjectSoftInt - Inject softint. with 0-len instr. ", fVmxEntryInjectSoftInt);
 #undef VMXFEATDUMP
@@ -1894 +1893 @@
     EmuFeat.fVmxExitSaveEferLma       = 1;
     EmuFeat.fVmxIntelPt               = 0;
-    EmuFeat.fVmxVmwriteAll            = 0;
+    EmuFeat.fVmxVmwriteAll            = 0;  /** @todo NSTVMX: enable this. */
     EmuFeat.fVmxEntryInjectSoftInt    = 0;