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

Timestamp:

Sep 11, 2014 1:31:23 PM (10 years ago)

Author:

vboxsync

Message:

VMM/GIM: Fix initialization of Hyper-V bits that rely on HM initialization to be completed.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• GIM.cpp (modified) (1 diff)
• GIMHv.cpp (modified) (3 diffs)
• GIMMinimal.cpp (modified) (3 diffs)
• VM.cpp (modified) (3 diffs)
• VMM.cpp (modified) (3 diffs)

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

@@ -149 +149 @@
 
 
-VMMR3_INT_DECL(int) GIMR3InitFinalize(PVM pVM)
-{
-    LogFlow(("GIMR3InitFinalize\n"));
-
+/**
+ * Initializes the remaining bits of the GIM provider.
+ * This is called after initializing HM and most other VMM components.
+ *
+ * @returns VBox status code.
+ * @param   pVM                 Pointer to the VM.
+ * @param   enmWhat             What has been completed.
+ * @thread  EMT(0)
+ */
+VMMR3_INT_DECL(int) GIMR3InitCompleted(PVM pVM)
+{
     if (!pVM->gim.s.fEnabled)
         return VINF_SUCCESS;
 
-    int rc = VINF_SUCCESS;
     switch (pVM->gim.s.enmProviderId)
     {
         case GIMPROVIDERID_MINIMAL:
-        {
-            rc = GIMR3MinimalInitFinalize(pVM);
-            break;
-        }
+            return GIMR3MinimalInitCompleted(pVM);
+
+        case GIMPROVIDERID_HYPERV:
+            return GIMR3HvInitCompleted(pVM);
 
         default:
             break;
     }
-    return rc;
+    return VINF_SUCCESS;
 }
 

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

@@ -111 +111 @@
         pHv->uHyperHints = GIM_HV_HINT_MSR_FOR_SYS_RESET
                          | GIM_HV_HINT_RELAX_TIME_CHECKS;
-
-        /* Hypervisor capabilities; features used by the hypervisor. */
-        /** @todo This is currently busted as it's too early. See @bugref{7270}
-         *        comment 130. */
-        pHv->uHyperCaps  = HMIsNestedPagingActive(pVM)   ? GIM_HV_HOST_FEAT_NESTED_PAGING : 0;
-        pHv->uHyperCaps |= HMAreMsrBitmapsAvailable(pVM) ? GIM_HV_HOST_FEAT_MSR_BITMAP : 0;
     }
 
@@ -213 +207 @@
     AssertLogRelRCReturn(rc, rc);
 
+    /*
+     * Insert all MSR ranges of Hyper-V.
+     */
+    for (unsigned i = 0; i < RT_ELEMENTS(g_aMsrRanges_HyperV); i++)
+    {
+        rc = CPUMR3MsrRangesInsert(pVM, &g_aMsrRanges_HyperV[i]);
+        AssertLogRelRCReturn(rc, rc);
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Initializes remaining bits of the Hyper-V provider.
+ * This is called after initializing HM and almost all other VMM components.
+ *
+ * @returns VBox status code.
+ * @param   pVM     Pointer to the VM.
+ */
+VMMR3_INT_DECL(int) GIMR3HvInitCompleted(PVM pVM)
+{
+    PGIMHV pHv = &pVM->gim.s.u.Hv;
+
+    /*
+     * Determine interface capabilities based on the version.
+     */
+    if (!pVM->gim.s.u32Version)
+    {
+        /* Hypervisor capabilities; features used by the hypervisor. */
+        pHv->uHyperCaps  = HMIsNestedPagingActive(pVM)   ? GIM_HV_HOST_FEAT_NESTED_PAGING : 0;
+        pHv->uHyperCaps |= HMAreMsrBitmapsAvailable(pVM) ? GIM_HV_HOST_FEAT_MSR_BITMAP : 0;
+    }
+
+    CPUMCPUIDLEAF HyperLeaf;
+    RT_ZERO(HyperLeaf);
     HyperLeaf.uLeaf        = UINT32_C(0x40000006);
     HyperLeaf.uEax         = pHv->uHyperCaps;
@@ -218 +248 @@
     HyperLeaf.uEcx         = 0;
     HyperLeaf.uEdx         = 0;
-    rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
+    int rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
     AssertLogRelRCReturn(rc, rc);
 
-    /*
-     * Insert all MSR ranges of Hyper-V.
-     */
-    for (unsigned i = 0; i < RT_ELEMENTS(g_aMsrRanges_HyperV); i++)
-    {
-        rc = CPUMR3MsrRangesInsert(pVM, &g_aMsrRanges_HyperV[i]);
-        AssertLogRelRCReturn(rc, rc);
-    }
-
-    return VINF_SUCCESS;
+    return rc;
 }
 

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

@@ -36 +36 @@
 *******************************************************************************/
 
+/**
+ * Initializes the Minimal provider.
+ *
+ * @returns VBox status code.
+ * @param   pVM     Pointer to the VM.
+ */
 VMMR3_INT_DECL(int) GIMR3MinimalInit(PVM pVM)
 {
@@ -50 +56 @@
 
 
-VMMR3_INT_DECL(int) GIMR3MinimalInitFinalize(PVM pVM)
+/**
+ * Initializes remaining bits of the Minimal provider.
+ * This is called after initializing HM and almost all other VMM components.
+ *
+ * @returns VBox status code.
+ * @param   pVM     Pointer to the VM.
+ */
+VMMR3_INT_DECL(int) GIMR3MinimalInitCompleted(PVM pVM)
 {
     /*
@@ -92 +105 @@
 }
 
+
+/**
+ * Applies relocations to data and code managed by this component. This function
+ * will be called at init and whenever the VMM need to relocate itself inside
+ * the GC.
+ *
+ * @param   pVM         Pointer to the VM.
+ * @param   offDelta    Relocation delta relative to old location.
+ */
 VMMR3_INT_DECL(void) GIMR3MinimalRelocate(PVM pVM, RTGCINTPTR offDelta)
 {

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1012 +1012 @@
 #endif
                                                                             if (RT_SUCCESS(rc))
-                                                                                rc = GIMR3InitFinalize(pVM);
-                                                                            if (RT_SUCCESS(rc))
                                                                             {
                                                                                 PGMR3MemSetup(pVM, false /*fAtReset*/);
@@ -1176 +1174 @@
         rc = HMR3InitCompleted(pVM, enmWhat);
     if (RT_SUCCESS(rc))
-        rc = PGMR3InitCompleted(pVM, enmWhat);
+        rc = PGMR3InitCompleted(pVM, enmWhat);  /** @todo Why is this not inside VMMR3InitCompleted()? */
 #ifndef VBOX_WITH_RAW_MODE
     if (enmWhat == VMINITCOMPLETED_RING3)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -84 +84 @@
 #include <VBox/vmm/pdmapi.h>
 #include <VBox/vmm/cpum.h>
+#include <VBox/vmm/gim.h>
 #include <VBox/vmm/mm.h>
 #include <VBox/vmm/iom.h>
@@ -708 +709 @@
 
             /*
+             * Last chance for GIM to update its CPUID leafs if it requires knowledge/information
+             * from HM initialization.
+             */
+            rc = GIMR3InitCompleted(pVM);
+            AssertRCReturn(rc, rc);
+
+            /*
              * CPUM's post-initialization (print CPUIDs).
              */