Changeset 74488 in vbox

Timestamp:

Sep 27, 2018 6:04:58 AM (6 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Nested SVM, VMX: bugref:7243 bugref:9180 Initialize and re-initialize VMX and SVM hwvirt state. Esp. important for VMX
where the guest-physical addresses need to be NIL_RTGCPHYS as VMX instruction rely on it.

File:

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

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

@@ -902 +902 @@
 
 /**
+ * Initializes (or re-initializes) per-VCPU SVM hardware virtualization state.
+ *
+ * @param   pVCpu   The cross context virtual CPU structure.
+ */
+DECLINLINE(void) cpumR3InitSvmHwVirtState(PVMCPU pVCpu)
+{
+    PCPUMCTX pCtx = &pVCpu->cpum.s.Guest;
+    Assert(pCtx->hwvirt.enmHwvirt == CPUMHWVIRT_SVM);
+    Assert(pCtx->hwvirt.svm.CTX_SUFF(pVmcb));
+
+    memset(pCtx->hwvirt.svm.CTX_SUFF(pVmcb), 0, SVM_VMCB_PAGES << PAGE_SHIFT);
+    pCtx->hwvirt.svm.uMsrHSavePa    = 0;
+    pCtx->hwvirt.svm.uPrevPauseTick = 0;
+}
+
+
+/**
  * Frees memory allocated for the VMX hardware virtualization state.
  *
@@ -1036 +1053 @@
 
     return rc;
+}
+
+
+/**
+ * Initializes (or re-initializes) per-VCPU VMX hardware virtualization state.
+ *
+ * @param   pVCpu   The cross context virtual CPU structure.
+ */
+DECLINLINE(void) cpumR3InitVmxHwVirtState(PVMCPU pVCpu)
+{
+    PCPUMCTX pCtx = &pVCpu->cpum.s.Guest;
+    Assert(pCtx->hwvirt.enmHwvirt == CPUMHWVIRT_VMX);
+    Assert(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs));
+    Assert(pCtx->hwvirt.vmx.CTX_SUFF(pShadowVmcs));
+
+    memset(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs),       0, VMX_V_VMCS_SIZE);
+    memset(pCtx->hwvirt.vmx.CTX_SUFF(pShadowVmcs), 0, VMX_V_VMCS_SIZE);
+    pCtx->hwvirt.vmx.GCPhysVmxon       = NIL_RTGCPHYS;
+    pCtx->hwvirt.vmx.GCPhysShadowVmcs  = NIL_RTGCPHYS;
+    pCtx->hwvirt.vmx.GCPhysVmxon       = NIL_RTGCPHYS;
+    pCtx->hwvirt.vmx.fInVmxRootMode    = false;
+    pCtx->hwvirt.vmx.fInVmxNonRootMode = false;
+    /* Don't reset diagnostics here. */
 }
 
@@ -1578 +1618 @@
     else if (pVM->cpum.ro.GuestFeatures.fSvm)
         rc = cpumR3AllocSvmHwVirtState(pVM);
+    else
+        Assert(pVM->aCpus[0].cpum.s.Guest.hwvirt.enmHwvirt == CPUMHWVIRT_NONE);
     if (RT_FAILURE(rc))
         return rc;
+
+    /*
+     * Initialize guest hardware virtualization state.
+     */
+    CPUMHWVIRT const enmHwvirt = pVM->aCpus[0].cpum.s.Guest.hwvirt.enmHwvirt;
+    if (enmHwvirt == CPUMHWVIRT_VMX)
+    {
+        for (VMCPUID i = 0; i < pVM->cCpus; i++)
+            cpumR3InitVmxHwVirtState(&pVM->aCpus[i]);
+    }
+    else if (enmHwvirt == CPUMHWVIRT_SVM)
+    {
+        for (VMCPUID i = 0; i < pVM->cCpus; i++)
+            cpumR3InitSvmHwVirtState(&pVM->aCpus[i]);
+    }
 
     /*
@@ -1816 +1873 @@
      */
     pCtx->hwvirt.fGif = true;
-
-    /* SVM. */
-    if (pCtx->hwvirt.svm.CTX_SUFF(pVmcb))
-    {
-        memset(pCtx->hwvirt.svm.CTX_SUFF(pVmcb), 0, SVM_VMCB_PAGES << PAGE_SHIFT);
-        pCtx->hwvirt.svm.uMsrHSavePa    = 0;
-        pCtx->hwvirt.svm.uPrevPauseTick = 0;
-    }
+    Assert(!pVM->cpum.ro.GuestFeatures.fVmx || !pVM->cpum.ro.GuestFeatures.fSvm);   /* Paranoia. */
+    if (pVM->cpum.ro.GuestFeatures.fVmx)
+        cpumR3InitVmxHwVirtState(pVCpu);
+    else if (pVM->cpum.ro.GuestFeatures.fSvm)
+        cpumR3InitSvmHwVirtState(pVCpu);
 }