Changeset 62591 in vbox for trunk

Timestamp:

Jul 27, 2016 1:19:55 PM (8 years ago)

Author:

vboxsync

Message:

VMM/GIM, CPUM: Retire "EnableHVP" CFGM option and the unconditional insertion of hypervisor-specific CPUID leaves. Rather, this
is now tied to the HVP (Hypervisor Present) bit through the "Minimal" GIM provider. The other GIM providers (HyperV, KVM) already
do their own insertion and setting of the HVP bit as necessary.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUMR3CpuId.cpp (modified) (3 diffs)
• GIMMinimal.cpp (modified) (3 diffs)

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

@@ -2239 +2239 @@
 
 /**
- * Insert hypervisor identification leaves.
- *
- * We only return minimal information, primarily ensuring that the
- * 0x40000000 function returns 0x40000001 and identifying ourselves.
- * Hypervisor-specific interface is supported through GIM which will
- * modify these leaves if required depending on the GIM provider.
- *
- * @returns VBox status code.
- * @param   pCpum       The CPUM instance data.
- * @param   pConfig     The CPUID configuration we've read from CFGM.
- */
-static int cpumR3CpuIdPlantHypervisorLeaves(PCPUM pCpum, PCPUMCPUIDCONFIG pConfig)
-{
-    CPUMCPUIDLEAF NewLeaf;
-    NewLeaf.uLeaf        = UINT32_C(0x40000000);
-    NewLeaf.uSubLeaf     = 0;
-    NewLeaf.fSubLeafMask = 0;
-    NewLeaf.uEax         = UINT32_C(0x40000001);
-    NewLeaf.uEbx         = 0x786f4256 /* 'VBox' */;
-    NewLeaf.uEcx         = 0x786f4256 /* 'VBox' */;
-    NewLeaf.uEdx         = 0x786f4256 /* 'VBox' */;
-    NewLeaf.fFlags       = 0;
-    int rc = cpumR3CpuIdInsert(NULL /* pVM */, &pCpum->GuestInfo.paCpuIdLeavesR3, &pCpum->GuestInfo.cCpuIdLeaves, &NewLeaf);
-    AssertLogRelRCReturn(rc, rc);
-
-    NewLeaf.uLeaf        = UINT32_C(0x40000001);
-    NewLeaf.uEax         = 0x656e6f6e;                            /* 'none' */
-    NewLeaf.uEbx         = 0;
-    NewLeaf.uEcx         = 0;
-    NewLeaf.uEdx         = 0;
-    NewLeaf.fFlags       = 0;
-    rc = cpumR3CpuIdInsert(NULL /* pVM */, &pCpum->GuestInfo.paCpuIdLeavesR3, &pCpum->GuestInfo.cCpuIdLeaves, &NewLeaf);
-    AssertLogRelRCReturn(rc, rc);
-
-    return VINF_SUCCESS;
-}
-
-
-/**
  * Mini CPU selection support for making Mac OS X happy.
  *
@@ -4033 +3994 @@
 
     /*
-     * Plant our own hypervisor CPUID leaves.
-     */
-    if (RT_SUCCESS(rc))
-        rc = cpumR3CpuIdPlantHypervisorLeaves(pCpum, &Config);
-
-    /*
      * MSR fudging.
      */
@@ -4095 +4050 @@
         if (fEnable)
             CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_NX);
-
-        /* We don't enable the Hypervisor Present bit by default, but it may be needed by some guests. */
-        rc = CFGMR3QueryBoolDef(pCpumCfg, "EnableHVP", &fEnable, false);
-        AssertRCReturn(rc, rc);
-        if (fEnable)
-            CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_HVP);
 
         return VINF_SUCCESS;

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

@@ -50 +50 @@
 
     /*
-     * Enable the Hypervisor Present.
+     * Expose HVP (Hypervisor Present) bit to the guest.
      */
     CPUMR3SetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_HVP);
 
-    return VINF_SUCCESS;
+    /*
+     * Insert the hypervisor leaf range.
+     */
+    CPUMCPUIDLEAF HyperLeaf;
+    RT_ZERO(HyperLeaf);
+    HyperLeaf.uLeaf = UINT32_C(0x40000000);
+    HyperLeaf.uEax  = UINT32_C(0x40000010); /* Maximum leaf we implement. */
+    int rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
+    if (RT_SUCCESS(rc))
+    {
+        /*
+         * Insert missing zero leaves (you never know what missing leaves are
+         * going to return when read).
+         */
+        RT_ZERO(HyperLeaf);
+        for (uint32_t uLeaf = UINT32_C(0x40000001); uLeaf <= UINT32_C(0x40000010); uLeaf++)
+        {
+            HyperLeaf.uLeaf = uLeaf;
+            rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
+            AssertLogRelRCReturn(rc, rc);
+        }
+    }
+    else
+        LogRel(("GIM: Minimal: Failed to insert hypervisor leaf %#RX32. rc=%Rrc\n", HyperLeaf.uLeaf, rc));
+
+    return rc;
 }
 
@@ -78 +103 @@
     if (RT_SUCCESS(rc))
     {
-        HyperLeaf.uEax         = UINT32_C(0x40000010);  /* Maximum leaf we implement. */
-        rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
-        AssertLogRelRCReturn(rc, rc);
-
-        /*
-         * Insert missing zero leaves (you never know what missing leaves are
-         * going to return when read).
-         */
-        for (uint32_t uLeaf = UINT32_C(0x40000001); uLeaf < UINT32_C(0x40000010); uLeaf++)
-        {
-            rc = CPUMR3CpuIdGetLeaf(pVM, &HyperLeaf, uLeaf, 0 /* uSubLeaf */);
-            if (RT_FAILURE(rc))
-            {
-                RT_ZERO(HyperLeaf);
-                HyperLeaf.uLeaf = uLeaf;
-                rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
-                AssertLogRelRCReturn(rc, rc);
-            }
-        }
+        Assert(HyperLeaf.uEax >= 0x40000010);
 
         /*
@@ -118 +125 @@
     }
     else
-        LogRel(("GIM: Minimal: failed to get hypervisor leaf 0x40000000.\n"));
+        LogRel(("GIM: Minimal: failed to get hypervisor leaf 0x40000000. rc=%Rrc\n", rc));
 
     return VINF_SUCCESS;