Changeset 72466 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jun 7, 2018 5:35:54 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

122951

Message:

VMM/HMSVMR0: vmmcall adjustments.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -7169 +7169 @@
 }
 
-/**
- * Performs the operations necessary that are part of the vmmcall instruction
- * execution in the guest.
- *
- * @returns Strict VBox status code (i.e. informational status codes too).
- * @retval  VINF_SUCCESS on successful handling, no \#UD needs to be thrown,
- *          update RIP and eflags.RF depending on @a pfUpdatedRipAndRF and
- *          continue guest execution.
- * @retval  VINF_GIM_HYPERCALL_CONTINUING continue hypercall without updating
- *          RIP.
- * @retval  VINF_GIM_R3_HYPERCALL re-start the hypercall from ring-3.
- *
- * @param   pVCpu               The cross context virtual CPU structure.
- * @param   pCtx                Pointer to the guest-CPU context.
- * @param   pfUpdatedRipAndRF   Whether the guest RIP/EIP has been updated as
- *                              part of handling the VMMCALL operation.
- *
- * @todo    r=bird: merge this with hmR0SvmExitVmmCall and fix todos.
- */
-static VBOXSTRICTRC hmR0SvmVmmcall(PVMCPU pVCpu, PCPUMCTX pCtx, bool *pfUpdatedRipAndRF)
-{
-    /*
-     * TPR patched instruction emulation for 32-bit guests.
-     */
-    PVM pVM = pVCpu->CTX_SUFF(pVM);
-    if (pVM->hm.s.fTprPatchingAllowed)
-    {
-        int rc = hmSvmEmulateMovTpr(pVCpu, pCtx);
-        if (RT_SUCCESS(rc))
-        {
-            *pfUpdatedRipAndRF = true;
-            return VINF_SUCCESS;
-        }
-
-        if (rc != VERR_NOT_FOUND)
-        {
-            Log(("hmSvmExitVmmCall: hmSvmEmulateMovTpr returns %Rrc\n", rc));
-            *pfUpdatedRipAndRF = false;
-            return rc;
-        }
-    }
-
-    /*
-     * Paravirtualized hypercalls.
-     */
-    *pfUpdatedRipAndRF = false; /** @todo r=bird: This is misleading/wrong, see GIMHypercall returncode docs.  */
-    if (EMAreHypercallInstructionsEnabled(pVCpu))
-        return GIMHypercall(pVCpu, pCtx);
-
-    return VERR_NOT_AVAILABLE;
-}
-
-
 
 /**
@@ -7231 +7178 @@
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitVmcall);
 
-    bool fRipUpdated;
-    VBOXSTRICTRC rcStrict = hmR0SvmVmmcall(pVCpu, pCtx, &fRipUpdated);
-    if (RT_SUCCESS(rcStrict))
-    {
-        /* Only update the RIP if we're continuing guest execution and not
-           in the case of say VINF_GIM_R3_HYPERCALL. */
-        if (   rcStrict == VINF_SUCCESS
-            && !fRipUpdated)
-        {
-            hmR0SvmAdvanceRipHwAssist(pVCpu, pCtx, 3 /* cbInstr */);
-        }
-
-        /* If the hypercall or TPR patching changes anything other than guest's general-purpose registers,
-           we would need to reload the guest changed bits here before VM-entry. */
-        return VBOXSTRICTRC_VAL(rcStrict);
+    if (pVCpu->CTX_SUFF(pVM)->hm.s.fTprPatchingAllowed)
+    {
+        int rc = hmSvmEmulateMovTpr(pVCpu, pCtx);
+        if (rc != VERR_NOT_FOUND)
+        {
+            Log4(("hmR0SvmExitVmmCall: hmSvmEmulateMovTpr returns %Rrc\n", rc));
+            return rc;
+        }
+    }
+
+    if (EMAreHypercallInstructionsEnabled(pVCpu))
+    {
+        VBOXSTRICTRC rcStrict = GIMHypercall(pVCpu, pCtx);
+        if (RT_SUCCESS(rcStrict))
+        {
+            /* Only update the RIP if we're continuing guest execution and not in the case
+               of say VINF_GIM_R3_HYPERCALL. */
+            if (rcStrict == VINF_SUCCESS)
+                hmR0SvmAdvanceRipHwAssist(pVCpu, pCtx, 3 /* cbInstr */);
+
+            return VBOXSTRICTRC_VAL(rcStrict);
+        }
+        else
+            Log4(("hmR0SvmExitVmmCall: GIMHypercall returns %Rrc -> #UD\n", VBOXSTRICTRC_VAL(rcStrict)));
     }