Changeset 51797 in vbox for trunk/src

Timestamp:

Jul 2, 2014 6:09:31 AM (11 years ago)

Author:

vboxsync

Message:

VMM/GIM/Minimal: OS X bits.

Location:

trunk/src/VBox

Files:

• Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• VMM/VMMR3/CPUMR3CpuId.cpp (modified) (1 diff)
• VMM/VMMR3/GIM.cpp (modified) (3 diffs)
• VMM/VMMR3/GIMMinimal.cpp (modified) (3 diffs)
• VMM/include/GIMInternal.h (modified) (2 diffs)
• VMM/include/GIMMinimalInternal.h (modified) (1 diff)

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

@@ -1002 +1002 @@
         }
 
+#if 0
         /* Expose extended MWAIT features to Mac OS X guests. */
         if (fOsXGuest)
@@ -1039 +1040 @@
                 InsertConfigInteger(pCPUM, "MaxIntelFamilyModelStep", uMaxIntelFamilyModelStep);
         }
-
+#endif
 
         /* Synthetic CPU */

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

@@ -939 +939 @@
 
 /**
+ * Gets a CPU ID leaf.
+ *
+ * @returns VBox status code.
+ * @param   pVM         Pointer to the VM.
+ * @param   pLeaf       Where to store the found leaf.
+ * @param   uLeaf       The leaf to locate.
+ * @param   uSubLeaf    The subleaf to locate.  Pass 0 if no subleaves.
+ */
+VMMR3DECL(int) CPUMR3CpuIdGetLeaf(PVM pVM, PCPUMCPUIDLEAF pLeaf, uint32_t uLeaf, uint32_t uSubLeaf)
+{
+    PCPUMCPUIDLEAF pcLeaf = cpumR3CpuIdGetLeaf(pVM->cpum.s.GuestInfo.paCpuIdLeavesR3, pVM->cpum.s.GuestInfo.cCpuIdLeaves,
+                                               uLeaf, uSubLeaf);
+    if (pcLeaf)
+    {
+        memcpy(pLeaf, pcLeaf, sizeof(*pLeaf));
+        return VINF_SUCCESS;
+    }
+
+    return VERR_NOT_FOUND;
+}
+
+
+/**
  * Inserts a CPU ID leaf, replacing any existing ones.
  *

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

@@ -115 +115 @@
     AssertLogRelRCReturn(rc, rc);
 
+    /** @cfgm{GIM/GuestOsId, uint32_t}
+     * The guest OS identifier. The default is 0, implying an unknown Guest OS. */
+    GIMOSID GuestOsId = GIMOSID_END;
+    uint32_t uGuestOsId;
+    rc = CFGMR3QueryU32Def(pCfgNode, "GuestOsId", &uGuestOsId, GIMOSID_UNKNOWN);
+    AssertLogRelRCReturn(rc, rc);
+    if (uGuestOsId < GIMOSID_END)
+        GuestOsId = (GIMOSID)uGuestOsId;
+    else
+    {
+        LogRel(("GIM: GuestOsId %u invalid.", uGuestOsId));
+        return VERR_GIM_INVALID_GUESTOS_ID;
+    }
+
     /*
      * Setup the GIM provider for this VM.
@@ -131 +145 @@
         {
             pVM->gim.s.enmProviderId = GIMPROVIDERID_MINIMAL;
-            rc = GIMR3MinimalInit(pVM);
+            rc = GIMR3MinimalInit(pVM, GuestOsId);
         }
         else if (!RTStrCmp(szProvider, "HyperV"))
@@ -587 +601 @@
 #endif
 
+
+/**
+ * Checks if the given Guest OS identifier implies an OS X family of guests.
+ *
+ * @returns true if it's an OS X guest, false otherwise.
+ * @param   enmGuestOs      The Guest OS Id.
+ */
+VMMR3_INT_DECL(bool) GIMR3IsOSXGuest(GIMOSID enmGuestOs)
+{
+    switch (enmGuestOs)
+    {
+        case GIMOSID_OSX:
+        case GIMOSID_OSX_64:
+        case GIMOSID_OSX_106:
+        case GIMOSID_OSX_106_64:
+        case GIMOSID_OSX_107:
+        case GIMOSID_OSX_107_64:
+        case GIMOSID_OSX_108:
+        case GIMOSID_OSX_108_64:
+        case GIMOSID_OSX_109:
+        case GIMOSID_OSX_109_64:
+        {
+            return true;
+        }
+
+        default:    /* shut up gcc */
+            break;
+    }
+    return false;
+}
+

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

@@ -20 +20 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_GIM
-#include "GIMMinimalInternal.h"
 #include "GIMInternal.h"
 
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/asm-amd64-x86.h>
 
 #include <VBox/vmm/cpum.h>
@@ -33 +33 @@
 *******************************************************************************/
 
-VMMR3_INT_DECL(int) GIMR3MinimalInit(PVM pVM)
+VMMR3_INT_DECL(int) GIMR3MinimalInit(PVM pVM, GIMOSID enmGuest)
 {
     AssertReturn(pVM, VERR_INVALID_PARAMETER);
@@ -39 +39 @@
 
     /*
-     * Enable the Hypervisor Present and MWait Extensions bits.
+     * Enable the Hypervisor Present.
      */
     CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_HVP);
-    CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_MWAIT_EXTS);
+
+    if (GIMR3IsOSXGuest(enmGuest))
+    {
+        /*
+         * Enable MWAIT Extensions for OS X Guests.
+         */
+        CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_MWAIT_EXTS);
+
+        /*
+         * Fake the CPU family/model so the guest works. This is partly because older
+         * Mac releases really doesn't work on newer CPUs, and partly because OS X
+         * expects more from systems with newer CPUs (MSRs, power features etc.)
+         */
+        if (CPUMGetGuestCpuVendor(pVM) == CPUMCPUVENDOR_INTEL)
+        {
+            uint32_t uMaxIntelFamilyModelStep = UINT32_MAX;
+            switch (enmGuest)
+            {
+                case GIMOSID_OSX:
+                case GIMOSID_OSX_64:
+                    uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482. */
+                    break;
+                case GIMOSID_OSX_106:
+                case GIMOSID_OSX_106_64:
+                    uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */
+                    break;
+                case GIMOSID_OSX_107:
+                case GIMOSID_OSX_107_64:
+                    /** @todo Figure out what is required here. */
+                    uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */
+                    break;
+                case GIMOSID_OSX_108:
+                case GIMOSID_OSX_108_64:
+                    /** @todo Figure out what is required here. */
+                    uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */
+                    break;
+                case GIMOSID_OSX_109:
+                case GIMOSID_OSX_109_64:
+                    /** @todo Figure out what is required here. */
+                    uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */
+                    break;
+
+                default:    /* shut up gcc */
+                    break;
+            }
+
+            if (uMaxIntelFamilyModelStep != UINT32_MAX)
+            {
+                CPUMCPUIDLEAF Leaf;
+                int rc = CPUMR3CpuIdGetLeaf(pVM, &Leaf, 1, 0);
+                if (RT_SUCCESS(rc))
+                {
+                    uint32_t uCurIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(ASMGetCpuStepping(Leaf.uEax),
+                                                                            ASMGetCpuModelIntel(Leaf.uEax),
+                                                                            ASMGetCpuFamily(Leaf.uEax),
+                                                                            0);
+                    if (uMaxIntelFamilyModelStep < uCurIntelFamilyModelStep)
+                    {
+                        uint32_t uNew = Leaf.uEax & UINT32_C(0xf0003000);
+                        uNew |=  RT_BYTE1(uMaxIntelFamilyModelStep) & 0xf;       /* stepping */
+                        uNew |= (RT_BYTE2(uMaxIntelFamilyModelStep) & 0xf) << 4; /* 4 low model bits */
+                        uNew |= (RT_BYTE2(uMaxIntelFamilyModelStep) >> 4) << 16; /* 4 high model bits */
+                        uNew |= (RT_BYTE3(uMaxIntelFamilyModelStep) & 0xf) << 8; /* 4 low family bits */
+                        /* 8 high family bits, Intel's suggested calculation. */
+                        if (RT_BYTE3(uMaxIntelFamilyModelStep) > 0xf)
+                        {
+                            uNew |= (  (RT_BYTE3(uMaxIntelFamilyModelStep)
+                                     - (RT_BYTE3(uMaxIntelFamilyModelStep) & 0xf)) & 0xff ) << 20;
+                        }
+
+                        LogRel(("GIM: Minimal: CPUID(0).EAX %#x -> %#x (uMaxIntelFamilyModelStep=%#x, uCurIntelFamilyModelStep=%#x\n",
+                                Leaf.uEax, uNew, uMaxIntelFamilyModelStep, uCurIntelFamilyModelStep));
+                        Leaf.uEax = uNew;
+                    }
+
+                    rc = CPUMR3CpuIdInsert(pVM, &Leaf);
+                    if (RT_FAILURE(rc))
+                    {
+                        LogRel(("GIM: Minimal: Failed to insert CPUID leaf for OS X guest. rc=%Rrc\n", rc));
+                        return rc;
+                    }
+                }
+                else
+                {
+                    LogRel(("GIM: Minimal: Failed to retreive std. CPUID leaf. rc=%Rrc\n", rc));
+                    return rc;
+                }
+            }
+        }
+    }
 
     /** @todo Register CPUID leaves, MSR ranges with CPUM. */
+    /** -XXX_ CPUMGetGuestCpuId CPUMGetGuestCpuVendor CPUMR3CpuIdInsert  */
     return VINF_SUCCESS;
 }

trunk/src/VBox/VMM/include/GIMInternal.h

@@ -21 +21 @@
 #include <VBox/vmm/gim.h>
 #include "GIMHvInternal.h"
+#include "GIMMinimalInternal.h"
 
 RT_C_DECLS_BEGIN
@@ -96 +97 @@
 VMMR3_INT_DECL(int)           GIMR3Mmio2HandlerPhysicalRegister(PVM pVM, PGIMMMIO2REGION pRegion);
 VMMR3_INT_DECL(int)           GIMR3Mmio2HandlerPhysicalDeregister(PVM pVM, PGIMMMIO2REGION pRegion);
+VMMR3_INT_DECL(bool)          GIMR3IsOSXGuest(GIMOSID enmGuestOs);
 #endif /* IN_RING3 */
 

trunk/src/VBox/VMM/include/GIMMinimalInternal.h

@@ -25 +25 @@
 
 #ifdef IN_RING3
-VMMR3_INT_DECL(int)         GIMR3MinimalInit(PVM pVM);
+VMMR3_INT_DECL(int)         GIMR3MinimalInit(PVM pVM, GIMOSID enmGuest);
 VMMR3_INT_DECL(void)        GIMR3MinimalRelocate(PVM pVM, RTGCINTPTR offDelta);
 #endif /* IN_RING3 */