儲存庫 vbox 的更動 66979

時間撮記:

2017-5-19 下午01:02:48 (8 年 以前)

作者:

vboxsync

訊息:

VMM/HMSVMR0: Fixes to hmR0SvmCheckExitDueToEventDelivery while handling soft int. and NMIs.

檔案:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (修改) (3 筆差異)

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

@@ -4063 +4063 @@
         {
             /*
-             * If event delivery caused an #VMEXIT that is not an exception (e.g. #NPF) then reflect the original
-             * exception to the guest after handling the #VMEXIT.
+             * If delivery of an event caused a #VMEXIT that is not an exception (e.g. #NPF) then we
+             * end up here.
+             *
+             * If the event was:
+             *   - a software interrupt, we can re-execute the instruction which will regenerate
+             *     the event.
+             *   - an NMI, we need to clear NMI blocking and re-inject the NMI.
+             *   - a hardware exception or external interrupt, we re-inject it.
              */
-            enmRaise   = IEMXCPTRAISE_PREV_EVENT;
-            fRaiseInfo = IEMXCPTRAISEINFO_NONE;
+            if (pVmcb->ctrl.ExitIntInfo.n.u3Type == SVM_EVENT_SOFTWARE_INT)
+            {
+                enmRaise   = IEMXCPTRAISE_REEXEC_INSTR;
+                fRaiseInfo = IEMXCPTRAISEINFO_NONE;
+            }
+            else if (pVmcb->ctrl.ExitIntInfo.n.u3Type == SVM_EVENT_NMI)
+            {
+                enmRaise   = IEMXCPTRAISE_PREV_EVENT;
+                fRaiseInfo = IEMXCPTRAISEINFO_SOFT_INT_XCPT;
+            }
+            else
+            {
+                enmRaise   = IEMXCPTRAISE_PREV_EVENT;
+                fRaiseInfo = IEMXCPTRAISEINFO_NONE;
+            }
         }
 
@@ -4087 +4106 @@
                     if (fRaiseInfo & (IEMXCPTRAISEINFO_EXT_INT_PF | IEMXCPTRAISEINFO_NMI_PF))
                         pSvmTransient->fVectoringPF = true;
-                    else if (uIdtVector == X86_XCPT_PF)
+                    else if (   uIdtVector == X86_XCPT_PF
+                             && pVmcb->ctrl.ExitIntInfo.n.u3Type == SVM_EVENT_EXCEPTION)
                     {
                         /*
@@ -4101 +4121 @@
 
                     /** @todo r=michaln: The comment makes no sense with nested paging on! */
-                    /* If uExitVector is #PF, CR2 value will be updated from the VMCB if it's a guest #PF. See hmR0SvmExitXcptPF(). */
-                    Log4(("IDT: Pending vectoring event %#RX64 ErrValid=%RTbool Err=%#RX32 GCPtrFaultAddress=%#RX64\n", pVmcb->ctrl.ExitIntInfo.u,
-                          !!pVmcb->ctrl.ExitIntInfo.n.u1ErrorCodeValid, pVmcb->ctrl.ExitIntInfo.n.u32ErrorCode, GCPtrFaultAddress));
+                    /* If uExitVector is #PF, CR2 value will be updated from the VMCB if it's a guest #PF,
+                       see hmR0SvmExitXcptPF(). */
+                    Log4(("IDT: Pending vectoring event %#RX64 ErrValid=%RTbool Err=%#RX32 GCPtrFaultAddress=%#RX64\n",
+                          pVmcb->ctrl.ExitIntInfo.u, RT_BOOL(pVmcb->ctrl.ExitIntInfo.n.u1ErrorCodeValid),
+                          pVmcb->ctrl.ExitIntInfo.n.u32ErrorCode, GCPtrFaultAddress));
                 }
+                break;
+            }
+
+            case IEMXCPTRAISE_REEXEC_INSTR:
+            {
+                Assert(rc == VINF_SUCCESS);
                 break;
             }