Changeset 95256 in vbox

Timestamp:

Jun 13, 2022 10:44:19 AM (3 years ago)

Author:

vboxsync

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

151814

Message:

VMM/CFGM,NEM,HM,ConsoleImpl2: Let CPUM take care of enabling 64-bit guest supported in the CPU features, rather than HM, NEM and other main execution engines. bugref:9898

Location:

trunk

Files:

• include/VBox/vmm/cpum.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/HM.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/NEMR3.cpp (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -1591 +1591 @@
 VMMR3_INT_DECL(void)   CPUMR3ClearGuestCpuIdFeature(PVM pVM, CPUMCPUIDFEATURE enmFeature);
 VMMR3_INT_DECL(bool)   CPUMR3GetGuestCpuIdFeature(PVM pVM, CPUMCPUIDFEATURE enmFeature);
-VMMR3_INT_DECL(void)   CPUMR3CpuIdEnable64BitGuests(PVM pVM);
 VMMDECL(bool)          CPUMSetGuestCpuIdPerCpuApicFeature(PVMCPU pVCpu, bool fVisible);
 VMMDECL(void)          CPUMSetGuestCtx(PVMCPU pVCpu, const PCPUMCTX pCtx);

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -853 +853 @@
     hrc = pMachine->COMGETTER(CPUProfile)(bstrCpuProfile.asOutParam());                     H();
 
+    /* Check if long mode is enabled. */
+    BOOL fIsGuest64Bit;
+    hrc = pMachine->GetCPUProperty(CPUPropertyType_LongMode, &fIsGuest64Bit);               H();
+
     /*
      * Figure out the IOMMU config.
@@ -1108 +1112 @@
         BOOL fEnablePAE = false;
         hrc = pMachine->GetCPUProperty(CPUPropertyType_PAE, &fEnablePAE);                   H();
+        fEnablePAE |= fIsGuest64Bit;
         InsertConfigInteger(pRoot, "EnablePAE", fEnablePAE);
+
+        /* 64-bit guests (long mode) */
+        InsertConfigInteger(pCPUM, "Enable64bit", fIsGuest64Bit);
 
         /* APIC/X2APIC configuration */
@@ -1170 +1178 @@
          * Hardware virtualization extensions.
          */
-        BOOL fIsGuest64Bit;
-        hrc = pMachine->GetCPUProperty(CPUPropertyType_LongMode, &fIsGuest64Bit);           H();
-
         /* Sanitize valid/useful APIC combinations, see @bugref{8868}. */
         if (!fEnableAPIC)

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

@@ -3153 +3153 @@
          * unrestricted-guest execution, CR4 feature bits and possibly more in the future.
          */
+        /** @todo r=bird: given that long mode never used to be enabled before the
+         *        VMINITCOMPLETED_RING0 state, and we're a lot earlier here in ring-3
+         *        init, the above comment cannot be entirely accurate. */
         if (pVM->cpum.s.GuestFeatures.fVmx)
         {
@@ -3172 +3175 @@
          */
 
+        /* Check if 64-bit guest supported was enabled. */
+        bool fEnable64bit;
+        rc = CFGMR3QueryBoolDef(pCpumCfg, "Enable64bit", &fEnable64bit, false);
+        AssertRCReturn(rc, rc);
+        if (fEnable64bit)
+        {
+            /* In case of a CPU upgrade: */
+            CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_SEP);
+            CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_SYSCALL);      /* (Long mode only on Intel CPUs.) */
+            CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE);
+            CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_LAHF);
+            CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_NX);
+
+            /* The actual feature: */
+            CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_LONG_MODE);
+        }
+
         /* Check if PAE was explicitely enabled by the user. */
         bool fEnable;
-        rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "EnablePAE", &fEnable, false);
+        rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "EnablePAE", &fEnable, fEnable64bit);
         AssertRCReturn(rc, rc);
-        if (fEnable)
+        if (fEnable && !pVM->cpum.s.GuestFeatures.fPae)
             CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE);
 
         /* We don't normally enable NX for raw-mode, so give the user a chance to force it on. */
-        rc = CFGMR3QueryBoolDef(pCpumCfg, "EnableNX", &fEnable, false);
+        rc = CFGMR3QueryBoolDef(pCpumCfg, "EnableNX", &fEnable, fEnable64bit);
         AssertRCReturn(rc, rc);
-        if (fEnable)
+        if (fEnable && !pVM->cpum.s.GuestFeatures.fNoExecute)
             CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_NX);
 
@@ -3706 +3726 @@
         pVCpu->cpum.s.fChanged |= CPUM_CHANGED_CPUID;
     }
-}
-
-
-/**
- * Enables 64-bit guest support for the CPU.
- *
- * @param   pVM                 The cross context VM structure.
- */
-VMMR3_INT_DECL(void) CPUMR3CpuIdEnable64BitGuests(PVM pVM)
-{
-    /* In case of a CPU upgrade: */
-    CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_SEP);
-    CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_SYSCALL);      /* (Long mode only on Intel CPUs.) */
-    CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE);
-    CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_LAHF);
-    CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_NX);
-
-    /* The actual feature: */
-    CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_LONG_MODE);
 }
 

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

@@ -1739 +1739 @@
 
     /*
-     * Change the CPU features.
-     */
-    if (pVM->hm.s.fAllow64BitGuestsCfg)
-        CPUMR3CpuIdEnable64BitGuests(pVM);
-
-    /*
      * Log configuration details.
      */
@@ -1948 +1942 @@
 
     hmR3DisableRawMode(pVM);
-
-    /*
-     * Change the CPU features.
-     */
-    if (pVM->hm.s.fAllow64BitGuestsCfg)
-        CPUMR3CpuIdEnable64BitGuests(pVM);
 
     LogRel((pVM->hm.s.fTprPatchingAllowed ? "HM: Enabled TPR patching\n"

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

@@ -209 +209 @@
     if (pVM->bMainExecutionEngine == VM_EXEC_ENGINE_NATIVE_API)
     {
-        if (pVM->nem.s.fAllow64BitGuests)
-            CPUMR3CpuIdEnable64BitGuests(pVM);
-
         /*
          * Do native after-CPUM init.