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

Timestamp:

Oct 16, 2015 3:20:38 PM (9 years ago)

Author:

vboxsync

Message:

VMM/GIM: Implemented Hyper-V SINT2 and SIMP faking for making Windows 10 32-bit guests happy.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• GIM.cpp (modified) (1 diff)
• GIMHv.cpp (modified) (11 diffs)

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

@@ -89 +89 @@
      */
     AssertCompile(sizeof(pVM->gim.s) <= sizeof(pVM->gim.padding));
+    AssertCompile(sizeof(pVM->aCpus[0].gim.s) <= sizeof(pVM->aCpus[0].gim.padding));
+
 
     /*

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

@@ -113 +113 @@
          */
         rc = CFGMR3ValidateConfig(pCfgHv, "/HyperV/",
-                                  "VendorID",
+                                  "VendorID"
+                                  "|VSInterface",
                                   "" /* pszValidNodes */, "GIM/HyperV" /* pszWho */, 0 /* uInstance */);
         if (RT_FAILURE(rc))
@@ -132 +133 @@
     }
 
-    pHv->fIsInterfaceVs = true;
+    if (pHv->fIsVendorMsHv)
+    {
+        /** @cfgm{/GIM/HyperV/VSInterface, bool, true}
+         * The Microsoft virtualization service interface (debugging). */
+        rc = CFGMR3QueryBoolDef(pCfgHv, "VSInterface", &pHv->fIsInterfaceVs, true);
+        AssertLogRelRCReturn(rc, rc);
+    }
+    else
+        Assert(pHv->fIsInterfaceVs == false);
 
     /*
@@ -169 +178 @@
                          | GIM_HV_HINT_RELAX_TIME_CHECKS;
 
-        /* Expose more if we're posing as Microsoft. */
-        if (   pHv->fIsVendorMsHv
-            /*&& !pHv->fIsInterfaceVs*/)
+        /* Expose more if we're posing as Microsoft. We can, if needed, force MSR-based Hv
+           debugging by not exposing these bits while exposing the VS interface.*/
+        if (pHv->fIsVendorMsHv)
         {
             pHv->uMiscFeat  |= GIM_HV_MISC_FEAT_GUEST_DEBUGGING
@@ -331 +340 @@
     if (pHv->uMiscFeat & GIM_HV_MISC_FEAT_GUEST_CRASH_MSRS)
         pHv->uCrashCtl = MSR_GIM_HV_CRASH_CTL_NOTIFY_BIT;
-
-    /*
-     * Setup guest-host hypercall based debugging support.
-     */
-    if (pHv->uMiscFeat & GIM_HV_MISC_FEAT_GUEST_DEBUGGING)
-    {
-        rc = gimR3HvInitHypercallSupport(pVM);
-        AssertLogRelRCReturn(rc, rc);
-    }
+    for (VMCPUID i = 0; i < pVM->cCpus; i++)
+        pVM->aCpus[i].gim.s.u.HvCpu.uSint2Msr = MSR_GIM_HV_SINT_MASKED_BIT;
+
+    /*
+     * Setup hypercall support.
+     */
+    rc = gimR3HvInitHypercallSupport(pVM);
+    AssertLogRelRCReturn(rc, rc);
 
     return VINF_SUCCESS;
@@ -406 +414 @@
 {
     gimR3HvReset(pVM);
-
-    PGIMHV pHv = &pVM->gim.s.u.Hv;
-    if (pHv->uMiscFeat & GIM_HV_MISC_FEAT_GUEST_DEBUGGING)
-        gimR3HvTermHypercallSupport(pVM);
+    gimR3HvTermHypercallSupport(pVM);
     return VINF_SUCCESS;
 }
@@ -463 +468 @@
 
     /*
-     * Reset MSRs (Careful! Don't reset non-zero MSRs).
+     * Reset MSRs.
      */
     pHv->u64GuestOsIdMsr        = 0;
@@ -477 +482 @@
     pHv->uDebugSendBufferMsr    = 0;
     pHv->uDebugRecvBufferMsr    = 0;
+    for (VMCPUID i = 0; i < pVM->cCpus; i++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[i];
+        pVCpu->gim.s.u.HvCpu.uSint2Msr = MSR_GIM_HV_SINT_MASKED_BIT;
+        pVCpu->gim.s.u.HvCpu.uSimpMsr  = 0;
+    }
 }
 
@@ -1209 +1220 @@
  * @returns VBox status code.
  * @param   pVM         The cross context VM structure.
- * @param   GCPhysOut   Where to write the hypercall output parameters after
- *                      performing the hypercall.
  * @param   prcHv       Where to store the result of the hypercall operation.
  *
  * @thread  EMT.
  */
-VMMR3_INT_DECL(int) gimR3HvHypercallPostDebugData(PVM pVM, RTGCPHYS GCPhysOut, int *prcHv)
+VMMR3_INT_DECL(int) gimR3HvHypercallPostDebugData(PVM pVM, int *prcHv)
 {
     AssertPtr(pVM);
@@ -1265 +1274 @@
      * Update the guest memory with result.
      */
-    int rc = PGMPhysSimpleWriteGCPhys(pVM, GCPhysOut, pHv->pbHypercallOut, sizeof(GIMHVDEBUGPOSTOUT));
+    int rc = PGMPhysSimpleWriteGCPhys(pVM, pHv->GCPhysHypercallOut, pHv->pbHypercallOut, sizeof(GIMHVDEBUGPOSTOUT));
     if (RT_FAILURE(rc))
     {
@@ -1282 +1291 @@
  * @returns VBox status code.
  * @param   pVM         The cross context VM structure.
- * @param   GCPhysOut   Where to write the hypercall output parameters after
- *                      performing the hypercall.
  * @param   prcHv       Where to store the result of the hypercall operation.
  *
  * @thread  EMT.
  */
-VMMR3_INT_DECL(int) gimR3HvHypercallRetrieveDebugData(PVM pVM, RTGCPHYS GCPhysOut, int *prcHv)
+VMMR3_INT_DECL(int) gimR3HvHypercallRetrieveDebugData(PVM pVM, int *prcHv)
 {
     AssertPtr(pVM);
@@ -1345 +1352 @@
      * Update the guest memory with result.
      */
-    int rc = PGMPhysSimpleWriteGCPhys(pVM, GCPhysOut, pHv->pbHypercallOut, sizeof(GIMHVDEBUGRETRIEVEOUT) + *pcbReallyRead);
+    int rc = PGMPhysSimpleWriteGCPhys(pVM, pHv->GCPhysHypercallOut, pHv->pbHypercallOut,
+                                      sizeof(GIMHVDEBUGRETRIEVEOUT) + *pcbReallyRead);
     if (RT_FAILURE(rc))
     {