Changeset 73739 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 17, 2018 4:34:25 PM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Use GCPhysVmcs to keep track of whether the current VMCS is valid.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (3 diffs)
• VMMR3/CPUM.cpp (modified) (4 diffs)

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

@@ -452 +452 @@
 DECLINLINE(void) iemVmxVmFailValid(PVMCPU pVCpu, VMXINSTRERR enmInsErr)
 {
-    if (pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs))
+    if (pVCpu->cpum.GstCtx.hwvirt.vmx.GCPhysVmcs != NIL_RTGCPHYS)
     {
         pVCpu->cpum.GstCtx.eflags.u32 &= ~(X86_EFL_CF | X86_EFL_PF | X86_EFL_AF | X86_EFL_ZF | X86_EFL_SF | X86_EFL_OF);
@@ -470 +470 @@
 DECLINLINE(void) iemVmxVmFail(PVMCPU pVCpu, VMXINSTRERR enmInsErr)
 {
-    if (pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs))
+    if (pVCpu->cpum.GstCtx.hwvirt.vmx.GCPhysVmcs != NIL_RTGCPHYS)
     {
         iemVmxVmFailValid(pVCpu, enmInsErr);
@@ -622 +622 @@
          */
         pVCpu->cpum.GstCtx.hwvirt.vmx.GCPhysVmxon    = GCPhysVmxon;
+        pVCpu->cpum.GstCtx.hwvirt.vmx.GCPhysVmcs     = NIL_RTGCPHYS;
         pVCpu->cpum.GstCtx.hwvirt.vmx.fInVmxRootMode = true;
-        pVCpu->cpum.GstCtx.hwvirt.vmx.GCPhysVmcs     = NIL_RTGCPHYS;
         /** @todo NSTVMX: clear address-range monitoring. */
         /** @todo NSTVMX: Intel PT. */

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

@@ -810 +810 @@
             SUPR3PageFreeEx(pVCpu->cpum.s.Guest.hwvirt.svm.pVmcbR3, SVM_VMCB_PAGES);
             pVCpu->cpum.s.Guest.hwvirt.svm.pVmcbR3 = NULL;
+            pVCpu->cpum.s.Guest.hwvirt.svm.pVmcbR0 = NULL;
         }
         pVCpu->cpum.s.Guest.hwvirt.svm.HCPhysVmcb = NIL_RTHCPHYS;
@@ -817 +818 @@
             SUPR3PageFreeEx(pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR3, SVM_MSRPM_PAGES);
             pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR3 = NULL;
+            pVCpu->cpum.s.Guest.hwvirt.svm.pvMsrBitmapR0 = NULL;
         }
 
@@ -823 +825 @@
             SUPR3PageFreeEx(pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR3, SVM_IOPM_PAGES);
             pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR3 = NULL;
+            pVCpu->cpum.s.Guest.hwvirt.svm.pvIoBitmapR0 = NULL;
         }
     }
@@ -895 +898 @@
     if (RT_FAILURE(rc))
         cpumR3FreeSvmHwVirtState(pVM);
+
+    return rc;
+}
+
+
+/**
+ * Frees memory allocated for the VMX hardware virtualization state.
+ *
+ * @param   pVM     The cross context VM structure.
+ */
+static void cpumR3FreeVmxHwVirtState(PVM pVM)
+{
+    Assert(pVM->cpum.ro.GuestFeatures.fVmx);
+    for (VMCPUID i = 0; i < pVM->cCpus; i++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[i];
+        if (pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR3)
+        {
+            SUPR3PageFreeEx(pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR3, VMX_V_VMCS_PAGES);
+            pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR3 = NULL;
+            pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR0 = 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;
+    LogRel(("CPUM: Allocating %u pages for the nested-guest VMCS\n", pVM->cCpus * VMX_V_VMCS_SIZE));
+    for (VMCPUID i = 0; i < pVM->cCpus; i++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[i];
+
+        /*
+         * Allocate the nested-guest current VMCS.
+         */
+        SUPPAGE SupNstGstVmcsPage;
+        RT_ZERO(SupNstGstVmcsPage);
+        SupNstGstVmcsPage.Phys = NIL_RTHCPHYS;
+        Assert(VMX_V_VMCS_PAGES == 1);
+        Assert(!pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR3);
+        rc = SUPR3PageAllocEx(VMX_V_VMCS_PAGES, 0 /* fFlags */, (void **)&pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR3,
+                              &pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR0, &SupNstGstVmcsPage);
+        if (RT_FAILURE(rc))
+        {
+            Assert(!pVCpu->cpum.s.Guest.hwvirt.vmx.pVmcsR3);
+            LogRel(("CPUM%u: Failed to alloc %u pages for the nested-guest's VMCS\n", pVCpu->idCpu, VMX_V_VMCS_PAGES));
+            break;
+        }
+    }
+
+    /* On any failure, cleanup. */
+    if (RT_FAILURE(rc))
+        cpumR3FreeVmxHwVirtState(pVM);
 
     return rc;