Changeset 67024 in vbox for trunk

Timestamp:

May 23, 2017 6:35:38 AM (8 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Don't go back to IEM for injecting secondary/final exception, also removed superfluous updates of CR2.

File:

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

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

@@ -5927 +5927 @@
                              uExitVectorType), VERR_VMX_IPE_5);
             enmRaise = IEMEvaluateRecursiveXcpt(pVCpu, fIdtVectorFlags, uIdtVector, fExitVectorFlags, uExitVector, &fRaiseInfo);
+
+            /* Determine a vectoring #PF condition, see comment in hmR0VmxExitXcptPF(). */
+            if (fRaiseInfo & (IEMXCPTRAISEINFO_EXT_INT_PF | IEMXCPTRAISEINFO_NMI_PF))
+            {
+                pVmxTransient->fVectoringPF = true;
+                enmRaise = IEMXCPTRAISE_PREV_EVENT;
+            }
         }
         else
@@ -5962 +5969 @@
         {
             case IEMXCPTRAISE_CURRENT_XCPT:
+            {
+                Log4(("IDT: vcpu[%RU32] Pending secondary xcpt: uIdtVectoringInfo=%#RX64 uExitIntInfo=%#RX64\n", pVCpu->idCpu,
+                      pVmxTransient->uIdtVectoringInfo, pVmxTransient->uExitIntInfo));
+                Assert(rcStrict == VINF_SUCCESS);
+                break;
+            }
+
             case IEMXCPTRAISE_PREV_EVENT:
             {
-                /* Determine a vectoring #PF condition, see comment in hmR0VmxExitXcptPF(). */
-                if (fRaiseInfo & (IEMXCPTRAISEINFO_EXT_INT_PF | IEMXCPTRAISEINFO_NMI_PF))
-                    pVmxTransient->fVectoringPF = true;
-
                 uint32_t u32ErrCode;
                 if (VMX_IDT_VECTORING_INFO_ERROR_CODE_IS_VALID(pVmxTransient->uIdtVectoringInfo))
@@ -11571 +11581 @@
         case VMX_EXIT_INTERRUPTION_INFO_TYPE_HW_XCPT:
         {
+#if 0
             /*
              * If there's any exception caused as a result of event injection, go back to
@@ -11588 +11599 @@
                 break;
             }
+#endif
 
             switch (uVector)
@@ -12901 +12913 @@
         if (VMX_IDT_VECTORING_INFO_VALID(pVmxTransient->uIdtVectoringInfo))
         {
-            uint32_t uIntType = VMX_IDT_VECTORING_INFO_TYPE(pVmxTransient->uIdtVectoringInfo);
-
-            uint32_t uVector     = VMX_IDT_VECTORING_INFO_VECTOR(pVmxTransient->uIdtVectoringInfo);
-            bool fErrorCodeValid = VMX_IDT_VECTORING_INFO_ERROR_CODE_IS_VALID(pVmxTransient->uIdtVectoringInfo);
-
-            /* Save it as a pending event and it'll be converted to a TRPM event on the way out to ring-3. */
-            Assert(!pVCpu->hm.s.Event.fPending);
-            pVCpu->hm.s.Event.fPending = true;
-            pVCpu->hm.s.Event.u64IntInfo = pVmxTransient->uIdtVectoringInfo;
-            rc = hmR0VmxReadIdtVectoringErrorCodeVmcs(pVmxTransient);
-            AssertRCReturn(rc, rc);
+            uint32_t       uErrCode;
+            RTGCUINTPTR    GCPtrFaultAddress;
+            uint32_t const uIntType        = VMX_IDT_VECTORING_INFO_TYPE(pVmxTransient->uIdtVectoringInfo);
+            uint32_t const uVector         = VMX_IDT_VECTORING_INFO_VECTOR(pVmxTransient->uIdtVectoringInfo);
+            bool const     fErrorCodeValid = VMX_IDT_VECTORING_INFO_ERROR_CODE_IS_VALID(pVmxTransient->uIdtVectoringInfo);
             if (fErrorCodeValid)
-                pVCpu->hm.s.Event.u32ErrCode = pVmxTransient->uIdtVectoringErrorCode;
+            {
+                rc = hmR0VmxReadIdtVectoringErrorCodeVmcs(pVmxTransient);
+                AssertRCReturn(rc, rc);
+                uErrCode = pVmxTransient->uIdtVectoringErrorCode;
+            }
             else
-                pVCpu->hm.s.Event.u32ErrCode = 0;
+                uErrCode = 0;
+
             if (   uIntType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT
                 && uVector == X86_XCPT_PF)
-            {
-                pVCpu->hm.s.Event.GCPtrFaultAddress = pMixedCtx->cr2;
-            }
+                GCPtrFaultAddress = pMixedCtx->cr2;
+            else
+                GCPtrFaultAddress = 0;
+
+            hmR0VmxSetPendingEvent(pVCpu, VMX_ENTRY_INT_INFO_FROM_EXIT_IDT_INFO(pVmxTransient->uIdtVectoringInfo),
+                                   0 /* cbInstr */, uErrCode, GCPtrFaultAddress);
 
             Log4(("Pending event on TaskSwitch uIntType=%#x uVector=%#x\n", uIntType, uVector));
@@ -13851 +13865 @@
         if (RT_LIKELY(!pVmxTransient->fVectoringDoublePF))
         {
-            pMixedCtx->cr2 = pVmxTransient->uExitQualification;  /* Update here in case we go back to ring-3 before injection. */
             hmR0VmxSetPendingEvent(pVCpu, VMX_VMCS_CTRL_ENTRY_IRQ_INFO_FROM_EXIT_INT_INFO(pVmxTransient->uExitIntInfo),
                                    0 /* cbInstr */, pVmxTransient->uExitIntErrorCode, pVmxTransient->uExitQualification);
@@ -13915 +13928 @@
             TRPMResetTrap(pVCpu);
             pVCpu->hm.s.Event.fPending = false;                 /* In case it's a contributory #PF. */
-            pMixedCtx->cr2 = pVmxTransient->uExitQualification; /* Update here in case we go back to ring-3 before injection. */
             hmR0VmxSetPendingEvent(pVCpu, VMX_VMCS_CTRL_ENTRY_IRQ_INFO_FROM_EXIT_INT_INFO(pVmxTransient->uExitIntInfo),
                                    0 /* cbInstr */, uGstErrorCode, pVmxTransient->uExitQualification);