Changeset 45888 in vbox for trunk/src/VBox/VMM

Timestamp:

May 3, 2013 9:30:33 AM (12 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Avoid syncing TRPM and Pending HM events back and forth when teasing to enter VT-x but we keep returning to ring-3 for one reason or another. Now do the actual conversion later during event injection when, currently, it's too late to go back to ring-3.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (5 diffs)

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

@@ -5496 +5496 @@
  *
  * @param   pVCpu           Pointer to the VMCPU.
- * @param   pCtx            Pointer to the guest-CPU context.
- */
-static void hmR0VmxUpdatePendingEvent(PVMCPU pVCpu, PCPUMCTX pCtx)
-{
-    if (!TRPMHasTrap(pVCpu))
-    {
-        Assert(!pVCpu->hm.s.Event.fPending);
-        return;
-    }
+ */
+static void hmR0VmxTRPMTrapToPendingEvent(PVMCPU pVCpu)
+{
+    Assert(TRPMHasTrap(pVCpu));
+    Assert(!pVCpu->hm.s.Event.fPending);
 
     uint8_t     uVector;
@@ -5570 +5566 @@
  * @param   pvCpu           Pointer to the VMCPU.
  */
-static void hmR0VmxUpdateTRPM(PVMCPU pVCpu)
-{
-    if (pVCpu->hm.s.Event.fPending)
-    {
-        uint32_t uVectorType     = VMX_IDT_VECTORING_INFO_TYPE(pVCpu->hm.s.Event.u64IntrInfo);
-        uint32_t uVector         = VMX_IDT_VECTORING_INFO_VECTOR(pVCpu->hm.s.Event.u64IntrInfo);
-        bool     fErrorCodeValid = !!VMX_IDT_VECTORING_INFO_ERROR_CODE_IS_VALID(pVCpu->hm.s.Event.u64IntrInfo);
-        uint32_t uErrorCode      = pVCpu->hm.s.Event.u32ErrCode;
-
-        /* If a trap was already pending, we did something wrong! */
-        Assert(TRPMQueryTrap(pVCpu, NULL /* pu8TrapNo */, NULL /* pEnmType */) == VERR_TRPM_NO_ACTIVE_TRAP);
-
-        TRPMEVENT enmTrapType;
-        switch (uVectorType)
-        {
-            case VMX_IDT_VECTORING_INFO_TYPE_EXT_INT:
-            case VMX_IDT_VECTORING_INFO_TYPE_NMI:
-               enmTrapType = TRPM_HARDWARE_INT;
-               break;
-            case VMX_IDT_VECTORING_INFO_TYPE_SW_INT:
-                enmTrapType = TRPM_SOFTWARE_INT;
-                break;
-            case VMX_IDT_VECTORING_INFO_TYPE_PRIV_SW_XCPT:
-            case VMX_IDT_VECTORING_INFO_TYPE_SW_XCPT:      /* #BP and #OF */
-            case VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT:
-                enmTrapType = TRPM_TRAP;
-                break;
-            default:
-                AssertMsgFailed(("Invalid trap type %#x\n", uVectorType));
-                enmTrapType = TRPM_32BIT_HACK;
-                break;
-        }
-
-        Log(("Converting pending HM event to TRPM trap uVector=%#x enmTrapType=%d\n", uVector, enmTrapType));
-        int rc = TRPMAssertTrap(pVCpu, uVector, enmTrapType);
-        AssertRC(rc);
-
-        if (fErrorCodeValid)
-            TRPMSetErrorCode(pVCpu, uErrorCode);
-        if (   uVectorType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT
-            && uVector == X86_XCPT_PF)
-        {
-            TRPMSetFaultAddress(pVCpu, pVCpu->hm.s.Event.GCPtrFaultAddress);
-        }
-        else if (   uVectorType == VMX_IDT_VECTORING_INFO_TYPE_SW_INT
-                 || uVectorType == VMX_IDT_VECTORING_INFO_TYPE_SW_XCPT
-                 || uVectorType == VMX_IDT_VECTORING_INFO_TYPE_PRIV_SW_XCPT)
-        {
-            AssertMsg(   uVectorType == VMX_IDT_VECTORING_INFO_TYPE_SW_INT
-                      || (uVector == X86_XCPT_BP || uVector == X86_XCPT_OF),
-                      ("Invalid vector: uVector=%#x uVectorType=%#x\n", uVector, uVectorType));
-            TRPMSetInstrLength(pVCpu, pVCpu->hm.s.Event.cbInstr);
-        }
-        pVCpu->hm.s.Event.fPending = false;
-    }
+static void hmR0VmxPendingEventToTRPMTrap(PVMCPU pVCpu)
+{
+    Assert(pVCpu->hm.s.Event.fPending);
+
+    uint32_t uVectorType     = VMX_IDT_VECTORING_INFO_TYPE(pVCpu->hm.s.Event.u64IntrInfo);
+    uint32_t uVector         = VMX_IDT_VECTORING_INFO_VECTOR(pVCpu->hm.s.Event.u64IntrInfo);
+    bool     fErrorCodeValid = !!VMX_IDT_VECTORING_INFO_ERROR_CODE_IS_VALID(pVCpu->hm.s.Event.u64IntrInfo);
+    uint32_t uErrorCode      = pVCpu->hm.s.Event.u32ErrCode;
+
+    /* If a trap was already pending, we did something wrong! */
+    Assert(TRPMQueryTrap(pVCpu, NULL /* pu8TrapNo */, NULL /* pEnmType */) == VERR_TRPM_NO_ACTIVE_TRAP);
+
+    TRPMEVENT enmTrapType;
+    switch (uVectorType)
+    {
+        case VMX_IDT_VECTORING_INFO_TYPE_EXT_INT:
+        case VMX_IDT_VECTORING_INFO_TYPE_NMI:
+           enmTrapType = TRPM_HARDWARE_INT;
+           break;
+        case VMX_IDT_VECTORING_INFO_TYPE_SW_INT:
+            enmTrapType = TRPM_SOFTWARE_INT;
+            break;
+        case VMX_IDT_VECTORING_INFO_TYPE_PRIV_SW_XCPT:
+        case VMX_IDT_VECTORING_INFO_TYPE_SW_XCPT:      /* #BP and #OF */
+        case VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT:
+            enmTrapType = TRPM_TRAP;
+            break;
+        default:
+            AssertMsgFailed(("Invalid trap type %#x\n", uVectorType));
+            enmTrapType = TRPM_32BIT_HACK;
+            break;
+    }
+
+    Log(("Converting pending HM event to TRPM trap uVector=%#x enmTrapType=%d\n", uVector, enmTrapType));
+    int rc = TRPMAssertTrap(pVCpu, uVector, enmTrapType);
+    AssertRC(rc);
+
+    if (fErrorCodeValid)
+        TRPMSetErrorCode(pVCpu, uErrorCode);
+    if (   uVectorType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT
+        && uVector == X86_XCPT_PF)
+    {
+        TRPMSetFaultAddress(pVCpu, pVCpu->hm.s.Event.GCPtrFaultAddress);
+    }
+    else if (   uVectorType == VMX_IDT_VECTORING_INFO_TYPE_SW_INT
+             || uVectorType == VMX_IDT_VECTORING_INFO_TYPE_SW_XCPT
+             || uVectorType == VMX_IDT_VECTORING_INFO_TYPE_PRIV_SW_XCPT)
+    {
+        AssertMsg(   uVectorType == VMX_IDT_VECTORING_INFO_TYPE_SW_INT
+                  || (uVector == X86_XCPT_BP || uVector == X86_XCPT_OF),
+                  ("Invalid vector: uVector=%#x uVectorType=%#x\n", uVector, uVectorType));
+        TRPMSetInstrLength(pVCpu, pVCpu->hm.s.Event.cbInstr);
+    }
+    pVCpu->hm.s.Event.fPending = false;
 }
 
@@ -5720 +5715 @@
 
     /* We need to do this only while truly exiting the "inner loop" back to ring-3 and -not- for any longjmp to ring3. */
-    hmR0VmxUpdateTRPM(pVCpu);
+    if (pVCpu->hm.s.Event.fPending)
+    {
+        hmR0VmxPendingEventToTRPMTrap(pVCpu);
+        Assert(!pVCpu->hm.s.Event.fPending);
+    }
 
     /* Sync. the guest state. */
@@ -6528 +6527 @@
      */
     /** @todo Rework event evaluation and injection to be complete separate. */
+    if (TRPMHasTrap(pVCpu))
+        hmR0VmxTRPMTrapToPendingEvent(pVCpu);
+
     rc = hmR0VmxInjectPendingEvent(pVCpu, pMixedCtx);
     AssertRCReturn(rc, rc);
@@ -6751 +6753 @@
     int          rc     = VERR_INTERNAL_ERROR_5;
     uint32_t     cLoops = 0;
-    hmR0VmxUpdatePendingEvent(pVCpu, pCtx);
 
     for (;; cLoops++)