Changeset 76310 in vbox for trunk/src

Timestamp:

Dec 20, 2018 9:57:15 AM (6 years ago)

Author:

vboxsync

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

127598

Message:

VMM/CPUM: Nested VMX: bugref:9180 Initialize VMX CPU features as part of CPUMR3Init now.

File:

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

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

@@ -802 +802 @@
 static void cpumR3FreeSvmHwVirtState(PVM pVM)
 {
-    Assert(pVM->cpum.ro.GuestFeatures.fSvm);
+    Assert(pVM->cpum.s.GuestFeatures.fSvm);
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
     {
@@ -836 +836 @@
 static int cpumR3AllocSvmHwVirtState(PVM pVM)
 {
-    Assert(pVM->cpum.ro.GuestFeatures.fSvm);
+    Assert(pVM->cpum.s.GuestFeatures.fSvm);
 
     int rc = VINF_SUCCESS;
@@ -925 +925 @@
 static void cpumR3FreeVmxHwVirtState(PVM pVM)
 {
-    Assert(pVM->cpum.ro.GuestFeatures.fVmx);
+    Assert(pVM->cpum.s.GuestFeatures.fVmx);
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
     {
@@ -1674 +1674 @@
     PCPUMFEATURES pHostFeat = &pVM->cpum.s.HostFeatures;
     VMXMSRS VmxMsrs;
-    int rc = HMVmxGetHostMsrs(pVM, &VmxMsrs);
-    if (RT_SUCCESS(rc))
-        cpumR3ExplodeVmxFeatures(&VmxMsrs, pHostFeat);
+    if (cpumR3IsHwAssistVmxNstGstExecAllowed(pVM))
+    {
+        /** @todo NSTVMX: When NEM support for nested-VMX is there, we'll need to fetch
+         *        the MSRs from NEM or do the support driver IOCTL route, see patch in
+         *        @bugref{9180}. */
+        if (HMIsEnabled(pVM))
+        {
+            int rc = HMVmxGetHostMsrs(pVM, &VmxMsrs);
+            if (RT_SUCCESS(rc))
+                cpumR3ExplodeVmxFeatures(&VmxMsrs, pHostFeat);
+        }
+        else
+            AssertMsgFailed(("NEM support for nested-VMX is not implemented yet\n"));
+    }
 
     /*
@@ -2038 +2049 @@
      * Allocate memory required by the guest hardware virtualization state.
      */
-    if (pVM->cpum.ro.GuestFeatures.fVmx)
+    if (pVM->cpum.s.GuestFeatures.fVmx)
         rc = cpumR3AllocVmxHwVirtState(pVM);
-    else if (pVM->cpum.ro.GuestFeatures.fSvm)
+    else if (pVM->cpum.s.GuestFeatures.fSvm)
         rc = cpumR3AllocSvmHwVirtState(pVM);
     else
@@ -2055 +2066 @@
         for (VMCPUID i = 0; i < pVM->cCpus; i++)
             cpumR3InitVmxHwVirtState(&pVM->aCpus[i]);
+
+        /* Initialize VMX features. */
+        cpumR3InitVmxCpuFeatures(pVM);
+        DBGFR3Info(pVM->pUVM, "cpumvmxfeat", "default", DBGFR3InfoLogRelHlp());
     }
     else if (enmHwvirt == CPUMHWVIRT_SVM)
@@ -2137 +2152 @@
 #endif
 
-    if (pVM->cpum.ro.GuestFeatures.fVmx)
+    if (pVM->cpum.s.GuestFeatures.fVmx)
         cpumR3FreeVmxHwVirtState(pVM);
-    else if (pVM->cpum.ro.GuestFeatures.fSvm)
+    else if (pVM->cpum.s.GuestFeatures.fSvm)
         cpumR3FreeSvmHwVirtState(pVM);
     return VINF_SUCCESS;
@@ -2297 +2312 @@
      */
     CPUMSetGuestGif(pCtx, true);
-    Assert(!pVM->cpum.ro.GuestFeatures.fVmx || !pVM->cpum.ro.GuestFeatures.fSvm);   /* Paranoia. */
-    if (pVM->cpum.ro.GuestFeatures.fVmx)
+    Assert(!pVM->cpum.s.GuestFeatures.fVmx || !pVM->cpum.s.GuestFeatures.fSvm);   /* Paranoia. */
+    if (pVM->cpum.s.GuestFeatures.fVmx)
         cpumR3InitVmxHwVirtState(pVCpu);
-    else if (pVM->cpum.ro.GuestFeatures.fSvm)
+    else if (pVM->cpum.s.GuestFeatures.fSvm)
         cpumR3InitSvmHwVirtState(pVCpu);
 }
@@ -2397 +2412 @@
             SSMR3PutStructEx(pSSM, pZmm16Hi, sizeof(*pZmm16Hi), SSMSTRUCT_FLAGS_FULL_STRUCT, g_aCpumZmm16HiFields, NULL);
         }
-        if (pVM->cpum.ro.GuestFeatures.fSvm)
+        if (pVM->cpum.s.GuestFeatures.fSvm)
         {
             Assert(pGstCtx->hwvirt.svm.CTX_SUFF(pVmcb));
@@ -2637 +2652 @@
                 if (uVersion >= CPUM_SAVED_STATE_VERSION_HWVIRT_SVM)
                 {
-                    if (pVM->cpum.ro.GuestFeatures.fSvm)
+                    if (pVM->cpum.s.GuestFeatures.fSvm)
                     {
                         Assert(pGstCtx->hwvirt.svm.CTX_SUFF(pVmcb));
@@ -3455 +3470 @@
     PCPUMCTX pCtx = &pVCpu->cpum.s.Guest;
     static const char *const s_aHwvirtModes[] = { "No/inactive", "SVM", "VMX", "Common" };
-    bool const fSvm = pVM->cpum.ro.GuestFeatures.fSvm;
-    bool const fVmx = pVM->cpum.ro.GuestFeatures.fVmx;
+    bool const fSvm = pVM->cpum.s.GuestFeatures.fSvm;
+    bool const fVmx = pVM->cpum.s.GuestFeatures.fVmx;
     uint8_t const idxHwvirtState = fSvm ? CPUMHWVIRTDUMP_SVM : (fVmx ? CPUMHWVIRTDUMP_VMX : CPUMHWVIRTDUMP_NONE);
     AssertCompile(CPUMHWVIRTDUMP_LAST <= RT_ELEMENTS(s_aHwvirtModes));
@@ -3986 +4001 @@
         }
 
-        case VMINITCOMPLETED_HM:
-        {
-            /*
-             * Currently, nested VMX/SVM both derives their guest VMX/SVM CPUID bit from the host
-             * CPUID bit. This could be later changed if we need to support nested-VMX on CPUs
-             * that are not capable of VMX.
-             */
-            if (pVM->cpum.s.GuestFeatures.fVmx)
-            {
-                Assert(   pVM->cpum.s.GuestFeatures.enmCpuVendor == CPUMCPUVENDOR_INTEL
-                       || pVM->cpum.s.GuestFeatures.enmCpuVendor == CPUMCPUVENDOR_VIA);
-                cpumR3InitVmxCpuFeatures(pVM);
-                DBGFR3Info(pVM->pUVM, "cpumvmxfeat", "default", DBGFR3InfoLogRelHlp());
-            }
-
-            if (pVM->cpum.s.GuestFeatures.fVmx)
-                LogRel(("CPUM: Enabled guest VMX support\n"));
-            else if (pVM->cpum.s.GuestFeatures.fSvm)
-                LogRel(("CPUM: Enabled guest SVM support\n"));
-            break;
-        }
-
         default:
             break;