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

Timestamp:

May 22, 2014 4:42:22 AM (11 years ago)

Author:

vboxsync

Message:

VMM/GIM: Hyper-V provider, work-in-progress.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• GIM.cpp (modified) (6 diffs)
• GIMHv.cpp (modified) (6 diffs)
• GIMMinimal.cpp (modified) (1 diff)

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

@@ -28 +28 @@
  * A GIM provider implements a particular hypervisor interface such as Microsoft
  * Hyper-V, Linux KVM and so on. It hooks into various components in the VMM to
- * ease the guest in running under a recognized virtualized environment. This is
- * also referred to as paravirtualization interfaces.
+ * ease the guest in running under a recognized, virtualized environment. This
+ * is also referred to as paravirtualization interfaces.
  *
  * The idea behind this is primarily for making guests more accurate and
@@ -39 +39 @@
  * itself, resulting in higher accuracy and saving several CPU cycles.
  *
- * Only one provider can be active for a running VM.
+ * At most, only one GIM provider can be active for a running VM and cannot be
+ * changed during the lifetime of the VM.
  */
 
@@ -105 +106 @@
     AssertLogRelRCReturn(rc, rc);
 
+    /** @cfgm{GIM/Version, uint32_t}
+     * The interface version. The default is 0, which means "provide the most
+     * up-to-date implementation". */
+    uint32_t uVersion;
+    rc = CFGMR3QueryU32Def(pCfgNode, "Version", &uVersion, 0 /* default */);
+    AssertLogRelRCReturn(rc, rc);
+
     /*
      * Setup the GIM provider for this VM.
      */
-    LogRel(("GIM: Using provider \"%s\"\n", szProvider));
+    LogRel(("GIM: Using provider \"%s\" version %u\n", szProvider, uVersion));
     if (!RTStrCmp(szProvider, "None"))
     {
         Assert(!pVM->gim.s.fEnabled);
-        pVM->gim.s.enmProvider = GIMPROVIDER_NONE;
+        pVM->gim.s.enmProviderId = GIMPROVIDERID_NONE;
     }
     else
     {
         pVM->gim.s.fEnabled = true;
+        pVM->gim.s.u32Version = uVersion;
         if (!RTStrCmp(szProvider, "Minimal"))
         {
-            pVM->gim.s.enmProvider = GIMPROVIDER_MINIMAL;
+            pVM->gim.s.enmProviderId = GIMPROVIDERID_MINIMAL;
             rc = GIMR3MinimalInit(pVM);
         }
         else if (!RTStrCmp(szProvider, "HyperV"))
         {
-            pVM->gim.s.enmProvider = GIMPROVIDER_HYPERV;
+            pVM->gim.s.enmProviderId = GIMPROVIDERID_HYPERV;
             rc = GIMR3HvInit(pVM);
         }
@@ -157 +166 @@
     }
 
-    switch (pVM->gim.s.enmProvider)
-    {
-        case GIMPROVIDER_MINIMAL:
+    switch (pVM->gim.s.enmProviderId)
+    {
+        case GIMPROVIDERID_MINIMAL:
         {
             GIMR3MinimalRelocate(pVM, offDelta);
@@ -165 +174 @@
         }
 
-        case GIMPROVIDER_HYPERV:
+        case GIMPROVIDERID_HYPERV:
         {
             GIMR3HvRelocate(pVM, offDelta);
@@ -171 +180 @@
         }
 
-        case GIMPROVIDER_KVM:            /** @todo KVM. */
+        case GIMPROVIDERID_KVM:            /** @todo KVM. */
         default:
         {
-            AssertMsgFailed(("Invalid provider id %#x\n", pVM->gim.s.enmProvider));
+            AssertMsgFailed(("Invalid provider Id %#x\n", pVM->gim.s.enmProviderId));
             break;
         }

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

@@ -25 +25 @@
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/string.h>
 
 #include <VBox/vmm/cpum.h>
@@ -30 +31 @@
 #include <VBox/vmm/hm.h>
 #include <VBox/vmm/pdmapi.h>
+#include <VBox/version.h>
 
 /*******************************************************************************
@@ -37 +39 @@
 
 
+/**
+ * Initializes the Hyper-V GIM provider.
+ *
+ * @returns VBox status code.
+ * @param   pVM         Pointer to the VM.
+ * @param   uVersion    The interface version this VM should use.
+ */
 VMMR3_INT_DECL(int) GIMR3HvInit(PVM pVM)
 {
     AssertReturn(pVM, VERR_INVALID_PARAMETER);
-    AssertReturn(pVM->gim.s.enmProvider == GIMPROVIDER_HYPERV, VERR_INTERNAL_ERROR_5);
+    AssertReturn(pVM->gim.s.enmProviderId == GIMPROVIDERID_HYPERV, VERR_INTERNAL_ERROR_5);
 
     int rc;
+#if 0
     pVM->gim.s.pfnHypercallR3 = &GIMHvHypercall;
     if (!HMIsEnabled(pVM))
@@ -51 +61 @@
     rc = PDMR3LdrGetSymbolR0(pVM, NULL /* pszModule */, GIMHV_HYPERCALL, &pVM->gim.s.pfnHypercallR0);
     AssertRCReturn(rc, rc);
+#endif
+
+    /*
+     * Determine interface capabilities based on the version.
+     */
+    uint32_t uBaseFeat    = 0;
+    uint32_t uPartFlags   = 0;
+    uint32_t uPowMgmtFeat = 0;
+    uint32_t uMiscFeat    = 0;
+    uint32_t uHyperHints  = 0;
+    if (!pVM->gim.s.u32Version)
+    {
+        uBaseFeat = GIM_HV_BASE_FEAT_PART_REF_COUNT_MSR;
+        pVM->gim.s.u.hv.u16HyperIdVersionMajor = VBOX_VERSION_MAJOR;
+        pVM->gim.s.u.hv.u16HyperIdVersionMajor = VBOX_VERSION_MINOR;
+        pVM->gim.s.u.hv.u32HyperIdBuildNumber  = VBOX_VERSION_BUILD;
+    }
 
     /*
@@ -57 +84 @@
     CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_HVP);
 
-    /** @todo Register CPUID leaves, MSR ranges with CPUM. */
+    /*
+     * Modify the standard hypervisor leaves for Hyper-V.
+     */
+    CPUMCPUIDLEAF HyperLeaf;
+    RT_ZERO(HyperLeaf);
+    HyperLeaf.uLeaf        = UINT32_C(0x40000000);
+    HyperLeaf.uEax         = UINT32_C(0x40000005); /* Minimum value for Hyper-V */
+    HyperLeaf.uEbx         = 0x7263694D;           /* 'Micr' */
+    HyperLeaf.uEcx         = 0x666F736F;           /* 'osof' */
+    HyperLeaf.uEdx         = 0x76482074;           /* 't Hv' */
+    rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
+    AssertLogRelRCReturn(rc, rc);
+
+    HyperLeaf.uLeaf        = UINT32_C(0x40000001);
+    HyperLeaf.uEax         = 0x31237648;           /* 'Hv#1' */
+    HyperLeaf.uEbx         = 0;                    /* Reserved */
+    HyperLeaf.uEcx         = 0;                    /* Reserved */
+    HyperLeaf.uEdx         = 0;                    /* Reserved */
+    rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
+    AssertLogRelRCReturn(rc, rc);
+
+    /*
+     * Add Hyper-V specific leaves.
+     */
+    HyperLeaf.uLeaf        = UINT32_C(0x40000002); /* MBZ until MSR_HV_GUEST_OS_ID is set by the guest. */
+    HyperLeaf.uEax         = 0;
+    HyperLeaf.uEbx         = 0;
+    HyperLeaf.uEcx         = 0;
+    HyperLeaf.uEdx         = 0;
+    rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
+    AssertLogRelRCReturn(rc, rc);
+
+    HyperLeaf.uLeaf        = UINT32_C(0x40000003);
+    HyperLeaf.uEax         = uBaseFeat;
+    HyperLeaf.uEbx         = uPartFlags;
+    HyperLeaf.uEcx         = uPowMgmtFeat;
+    HyperLeaf.uEdx         = uMiscFeat;
+    rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
+    AssertLogRelRCReturn(rc, rc);
+
+    /*
+     * Register the complete MSR range for Hyper-V.
+     */
+    CPUMMSRRANGE MsrRange;
+    RT_ZERO(MsrRange);
+    MsrRange.uFirst     = UINT32_C(0x40000000);
+    MsrRange.uLast      = UINT32_C(0x40000105);
+    MsrRange.enmRdFn    = kCpumMsrRdFn_Gim;
+    MsrRange.enmWrFn    = kCpumMsrWrFn_Gim;
+    RTStrCopy(MsrRange.szName, sizeof(MsrRange.szName), "Hyper-V");
+    rc = CPUMR3MsrRangesInsert(pVM, &MsrRange);
+    AssertLogRelRCReturn(rc, rc);
+
+
     return VINF_SUCCESS;
 }
@@ -64 +144 @@
 VMMR3_INT_DECL(void) GIMR3HvRelocate(PVM pVM, RTGCINTPTR offDelta)
 {
-    int rc = PDMR3LdrGetSymbolRC(pVM, NULL /* pszModule */, GIMHV_HYPERCALL, &pVM->gim.s.pfnHypercallRC);
-    AssertFatalRC(rc);
+//    int rc = PDMR3LdrGetSymbolRC(pVM, NULL /* pszModule */, GIMHV_HYPERCALL, &pVM->gim.s.pfnHypercallRC);
+//    AssertFatalRC(rc);
 }
 

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

@@ -36 +36 @@
 {
     AssertReturn(pVM, VERR_INVALID_PARAMETER);
-    AssertReturn(pVM->gim.s.enmProvider == GIMPROVIDER_MINIMAL, VERR_INTERNAL_ERROR_5);
+    AssertReturn(pVM->gim.s.enmProviderId == GIMPROVIDERID_MINIMAL, VERR_INTERNAL_ERROR_5);
 
     Assert(CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_HVP));