Changeset 97264 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 21, 2022 12:08:51 PM (2 years ago)

Author:

vboxsync

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

154250

Message:

VMM/CPUM: Nested VMX: bugref:10092 Addressed todo regarding keeping extra memebers in VM::CPUM just for passing on VMX features to cpumR3InitVmxGuestFeaturesAndMsrs.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUM.cpp (modified) (9 diffs)
• CPUMR3CpuId.cpp (modified) (3 diffs)

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

@@ -1728 +1728 @@
  *
  * @param   pVM             The cross context VM structure.
+ * @param   pCpumCfg        The CPUM CFGM configuration node.
  * @param   pHostVmxMsrs    The host VMX MSRs. Pass NULL when fully emulating VMX
  *                          and no hardware-assisted nested-guest execution is
@@ -1733 +1734 @@
  * @param   pGuestVmxMsrs   Where to store the initialized guest VMX MSRs.
  */
-void cpumR3InitVmxGuestFeaturesAndMsrs(PVM pVM, PCVMXMSRS pHostVmxMsrs, PVMXMSRS pGuestVmxMsrs)
+void cpumR3InitVmxGuestFeaturesAndMsrs(PVM pVM, PCFGMNODE pCpumCfg, PCVMXMSRS pHostVmxMsrs, PVMXMSRS pGuestVmxMsrs)
 {
     Assert(pVM);
+    Assert(pCpumCfg);
     Assert(pGuestVmxMsrs);
 
     /*
-     * While it would be nice to check this earlier while initializing
-     * fNestedVmxEpt but we would not have enumearted host features then, so do
-     * it at least now.
+     * Query VMX features from CFGM.
      */
-    /** @todo r=bird: Why don't we just ditch the fNestedVmxEpt and
-     *        fNestedVmxUnrestrictedGuest state members and read the CFGM stuff
-     *        here?  Neither of them have any purpose beyond keeping the two value
-     *        read in cpumR3CpuIdReadConfig for use here.  They aren't even
-     *        necessarily correct after the feature merging has taken place.  */
-    if (pVM->cpum.s.fNestedVmxEpt)
+    bool fVmxPreemptTimer;
+    bool fVmxEpt;
+    bool fVmxUnrestrictedGuest;
+    {
+        /** @cfgm{/CPUM/NestedVmxPreemptTimer, bool, true}
+         * Whether to expose the VMX-preemption timer feature to the guest (if also
+         * supported by the host hardware). When disabled will prevent exposing the
+         * VMX-preemption timer feature to the guest even if the host supports it.
+         *
+         * @todo Currently disabled, see @bugref{9180#c108}.
+         */
+        int rc = CFGMR3QueryBoolDef(pCpumCfg, "NestedVmxPreemptTimer", &fVmxPreemptTimer, false);
+        AssertLogRelRCReturnVoid(rc);
+
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+        /** @cfgm{/CPUM/NestedVmxEpt, bool, true}
+         * Whether to expose the EPT feature to the guest. The default is true.
+         * When disabled will automatically prevent exposing features that rely
+         * on it.  This is dependent upon nested paging being enabled for the VM.
+         */
+        rc = CFGMR3QueryBoolDef(pCpumCfg, "NestedVmxEpt", &fVmxEpt, true);
+        AssertLogRelRCReturnVoid(rc);
+
+        /** @cfgm{/CPUM/NestedVmxUnrestrictedGuest, bool, true}
+         * Whether to expose the Unrestricted Guest feature to the guest. The
+         * default is the same a /CPUM/Nested/VmxEpt. When disabled will
+         * automatically prevent exposing features that rely on it.
+         */
+        rc = CFGMR3QueryBoolDef(pCpumCfg, "NestedVmxUnrestrictedGuest", &fVmxUnrestrictedGuest, fVmxEpt);
+        AssertLogRelRCReturnVoid(rc);
+#endif
+    }
+
+    if (fVmxEpt)
     {
         const char *pszWhy = NULL;
@@ -1759 +1787 @@
         if (pszWhy)
         {
-            LogRel(("CPUM: Warning! EPT not exposed to the guest because %s.\n", pszWhy));
-            pVM->cpum.s.fNestedVmxEpt = false;
+            LogRel(("CPUM: Warning! EPT not exposed to the guest because %s\n", pszWhy));
+            fVmxEpt = false;
         }
     }
-    if (    pVM->cpum.s.fNestedVmxUnrestrictedGuest
-        && !pVM->cpum.s.fNestedVmxEpt)
+    else if (fVmxUnrestrictedGuest)
     {
         LogRel(("CPUM: Warning! Can't expose \"Unrestricted Guest\" to the guest when EPT is not exposed!\n"));
-        pVM->cpum.s.fNestedVmxUnrestrictedGuest = false;
+        fVmxUnrestrictedGuest = false;
     }
 
@@ -1783 +1810 @@
     EmuFeat.fVmxNmiExit               = 1;
     EmuFeat.fVmxVirtNmi               = 1;
-    EmuFeat.fVmxPreemptTimer          = pVM->cpum.s.fNestedVmxPreemptTimer;
+    EmuFeat.fVmxPreemptTimer          = fVmxPreemptTimer;
     EmuFeat.fVmxPostedInt             = 0;
     EmuFeat.fVmxIntWindowExit         = 1;
@@ -1808 +1835 @@
     EmuFeat.fVmxSecondaryExecCtls     = 1;
     EmuFeat.fVmxVirtApicAccess        = 1;
-    EmuFeat.fVmxEpt                   = pVM->cpum.s.fNestedVmxEpt;
+    EmuFeat.fVmxEpt                   = fVmxEpt;
     EmuFeat.fVmxDescTableExit         = 1;
     EmuFeat.fVmxRdtscp                = 1;
@@ -1814 +1841 @@
     EmuFeat.fVmxVpid                  = 0;  /** @todo Consider enabling this when EPT works. */
     EmuFeat.fVmxWbinvdExit            = 1;
-    EmuFeat.fVmxUnrestrictedGuest     = pVM->cpum.s.fNestedVmxUnrestrictedGuest;
+    EmuFeat.fVmxUnrestrictedGuest     = fVmxUnrestrictedGuest;
     EmuFeat.fVmxApicRegVirt           = 0;
     EmuFeat.fVmxVirtIntDelivery       = 0;
@@ -1939 +1966 @@
         && HMIsSubjectToVmxPreemptTimerErratum())
     {
-        LogRel(("CPUM: Warning! VMX-preemption timer not exposed to guest due to host CPU erratum.\n"));
+        LogRel(("CPUM: Warning! VMX-preemption timer not exposed to guest due to host CPU erratum\n"));
         pGuestFeat->fVmxPreemptTimer     = 0;
         pGuestFeat->fVmxSavePreemptTimer = 0;
@@ -2027 +2054 @@
         return VERR_INTERNAL_ERROR_5;
     }
+
     LogRel(("CPUM: No hardware-virtualization capability detected\n"));
     return VINF_SUCCESS;
@@ -3954 +3982 @@
         pHlp->pfnPrintf(pHlp, "  %sSSP                        = %#RX64\n",   pszPrefix, pVmcs->u64HostSsp.u);
         pHlp->pfnPrintf(pHlp, "  %sINTERRUPT_SSP_TABLE_ADDR   = %#RX64\n",   pszPrefix, pVmcs->u64HostIntrSspTableAddrMsr.u);
-
     }
 

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

@@ -2716 +2716 @@
             if (VM_IS_NEM_ENABLED(pVM))
             {
-                LogRel(("CPUM: WARNING! Can't turn on nested VT-x/AMD-V when NEM is used! (later)\n"));
+                LogRel(("CPUM: Warning! Can't turn on nested VT-x/AMD-V when NEM is used! (later)\n"));
                 pConfig->fNestedHWVirt = false;
             }
@@ -2722 +2722 @@
                 return VMSetError(pVM, VERR_CPUM_INVALID_HWVIRT_CONFIG, RT_SRC_POS,
                                   "Cannot enable nested VT-x/AMD-V without nested-paging and unrestricted guest execution!\n");
-        }
-
-        if (pConfig->fNestedHWVirt)
-        {
-            /** @cfgm{/CPUM/NestedVmxPreemptTimer, bool, true}
-             * Whether to expose the VMX-preemption timer feature to the guest (if also
-             * supported by the host hardware). When disabled will prevent exposing the
-             * VMX-preemption timer feature to the guest even if the host supports it.
-             *
-             * @todo Currently disabled, see @bugref{9180#c108}.
-             */
-            rc = CFGMR3QueryBoolDef(pCpumCfg, "NestedVmxPreemptTimer", &pVM->cpum.s.fNestedVmxPreemptTimer, false);
-            AssertLogRelRCReturn(rc, rc);
-
-#ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
-            /** @cfgm{/CPUM/NestedVmxEpt, bool, true}
-             * Whether to expose the EPT feature to the guest. The default is true.
-             * When disabled will automatically prevent exposing features that rely
-             * on it.  This is dependent upon nested paging being enabled for the. */
-            rc = CFGMR3QueryBoolDef(pCpumCfg, "NestedVmxEpt", &pVM->cpum.s.fNestedVmxEpt, true);
-            AssertLogRelRCReturn(rc, rc);
-
-            /** @cfgm{/CPUM/NestedVmxUnrestrictedGuest, bool, true}
-             * Whether to expose the Unrestricted Guest feature to the guest. The
-             * default is the same a /CPUM/Nested/VmxEpt. When disabled will
-             * automatically prevent exposing features that rely on it.
-             */
-            rc = CFGMR3QueryBoolDef(pCpumCfg, "NestedVmxUnrestrictedGuest", &pVM->cpum.s.fNestedVmxUnrestrictedGuest,
-                                    pVM->cpum.s.fNestedVmxEpt);
-            AssertLogRelRCReturn(rc, rc);
-#endif
         }
     }
@@ -3159 +3128 @@
         {
             Assert(Config.fNestedHWVirt);
-            cpumR3InitVmxGuestFeaturesAndMsrs(pVM, &pHostMsrs->hwvirt.vmx, &GuestMsrs.hwvirt.vmx);
+            cpumR3InitVmxGuestFeaturesAndMsrs(pVM, pCpumCfg, &pHostMsrs->hwvirt.vmx, &GuestMsrs.hwvirt.vmx);
 
             /* Copy MSRs to all VCPUs */