Changeset 66713 in vbox

Timestamp:

Apr 28, 2017 7:30:05 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Fixes while using IEM event reflection code.

File:

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

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

@@ -5905 +5905 @@
             enmRaise = IEMEvaluateRecursiveXcpt(pVCpu, fIdtVectorFlags, uIdtVector, fExitVectorFlags, uExitVector,
                                                 &fRaiseInfo);
+
+            if (fRaiseInfo & (IEMXCPTRAISEINFO_EXT_INT_XCPT | IEMXCPTRAISEINFO_NMI_XCPT))
+            {
+                /*
+                 * For some reason we go back to the interpreter if delivery of an external interrupt or
+                 * NMI causes an exception, see hmR0VmxExitXcptOrNmi. As long as we go back to the interpret
+                 * we need to keep the previous (first) event pending, hence this hack.
+                 */
+                enmRaise = IEMXCPTRAISE_PREV_EVENT;
+
+                /* Determine a vectoring #PF condition, see comment in hmR0VmxExitXcptPF(). */
+                if (fRaiseInfo & (IEMXCPTRAISEINFO_EXT_INT_PF | IEMXCPTRAISEINFO_NMI_PF))
+                    pVmxTransient->fVectoringPF = true;
+            }
         }
         else
@@ -5941 +5955 @@
             && uIdtVectorType == VMX_IDT_VECTORING_INFO_TYPE_NMI
             && (   enmRaise   == IEMXCPTRAISE_PREV_EVENT
-                || fRaiseInfo == IEMXCPTRAISEINFO_NMI_PF)
+                || (fRaiseInfo & IEMXCPTRAISEINFO_NMI_PF))
             && (pVCpu->hm.s.vmx.u32PinCtls & VMX_VMCS_CTRL_PIN_EXEC_VIRTUAL_NMI))
         {
@@ -5950 +5964 @@
         {
             case IEMXCPTRAISE_CURRENT_XCPT:
-            {
-                /*
-                 * Determine a vectoring #PF condition, see comment in hmR0VmxExitXcptPF().
-                 */
-                if (fRaiseInfo & (IEMXCPTRAISEINFO_EXT_INT_PF | IEMXCPTRAISEINFO_NMI_PF))
-                    pVmxTransient->fVectoringPF = true;
-
-                /*
-                 * Determing a vectoring double #PF condition. Used later, when PGM evaluates the
-                 * second #PF as a guest #PF (and not a nested #PF) and needs to be converted into a #DF.
-                 */
-                if (fRaiseInfo & IEMXCPTRAISEINFO_PF_PF)
-                    pVmxTransient->fVectoringDoublePF = true;
-
+            case IEMXCPTRAISE_REEXEC_INSTR:
                 Assert(rcStrict == VINF_SUCCESS);
                 break;
-            }
 
             case IEMXCPTRAISE_PREV_EVENT:
@@ -6000 +6000 @@
             case IEMXCPTRAISE_DOUBLE_FAULT:
             {
-                STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingReflect);
-                hmR0VmxSetPendingXcptDF(pVCpu, pMixedCtx);
-
-                Log4(("IDT: vcpu[%RU32] Pending vectoring #DF %#RX64 uIdtVector=%#x uExitVector=%#x\n", pVCpu->idCpu,
-                      pVCpu->hm.s.Event.u64IntInfo, uIdtVector, uExitVector));
-                rcStrict = VINF_HM_DOUBLE_FAULT;
+                /*
+                 * Determing a vectoring double #PF condition. Used later, when PGM evaluates the
+                 * second #PF as a guest #PF (and not a nested #PF) and needs to be converted into a #DF.
+                 */
+                if (fRaiseInfo & IEMXCPTRAISEINFO_PF_PF)
+                {
+                    pVmxTransient->fVectoringDoublePF = true;
+                    Log4(("IDT: vcpu[%RU32] Vectoring double #PF %#RX64 cr2=%#RX64\n", pVCpu->idCpu, pVCpu->hm.s.Event.u64IntInfo,
+                          pMixedCtx->cr2));
+                    rcStrict = VINF_SUCCESS;
+                }
+                else
+                {
+                    STAM_COUNTER_INC(&pVCpu->hm.s.StatInjectPendingReflect);
+                    hmR0VmxSetPendingXcptDF(pVCpu, pMixedCtx);
+                    Log4(("IDT: vcpu[%RU32] Pending vectoring #DF %#RX64 uIdtVector=%#x uExitVector=%#x\n", pVCpu->idCpu,
+                          pVCpu->hm.s.Event.u64IntInfo, uIdtVector, uExitVector));
+                    rcStrict = VINF_HM_DOUBLE_FAULT;
+                }
                 break;
             }
@@ -6023 +6036 @@
                 break;
             }
-
-            case IEMXCPTRAISE_REEXEC_INSTR:
-                Assert(rcStrict == VINF_SUCCESS);
-                break;
 
             default: