Changeset 52099 in vbox

Timestamp:

Jul 18, 2014 12:20:54 PM (11 years ago)

Author:

vboxsync

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

95110

Message:

VMM/HMSVMR0: Attempt at fixing NMI injection and handling NMI reflection while delivering an event.

File:

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

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

@@ -2597 +2597 @@
 
             hmR0SvmSetPendingEvent(pVCpu, &Event, 0 /* GCPtrFaultAddress */);
+            hmR0SvmSetIretIntercept(pVmcb);
             VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI);
         }
@@ -4026 +4027 @@
 
         SVMREFLECTXCPT enmReflect = SVMREFLECTXCPT_NONE;
+        bool fReflectingNmi = false;
         if (pVmcb->ctrl.ExitIntInfo.n.u3Type == SVM_EVENT_EXCEPTION)
         {
@@ -4076 +4078 @@
             /* Ignore software interrupts (INT n) as they reoccur when restarting the instruction. */
             enmReflect = SVMREFLECTXCPT_XCPT;
+            fReflectingNmi = RT_BOOL(pVmcb->ctrl.ExitIntInfo.n.u3Type == SVM_EVENT_NMI);
         }
 
@@ -4082 +4085 @@
             case SVMREFLECTXCPT_XCPT:
             {
+                /* If we are re-injecting the NMI, clear NMI blocking. */
+                if (fReflectingNmi)
+                    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_BLOCK_NMIS);
+
                 Assert(pVmcb->ctrl.ExitIntInfo.n.u3Type != SVM_EVENT_SOFTWARE_INT);
                 hmR0SvmSetPendingEvent(pVCpu, &pVmcb->ctrl.ExitIntInfo, 0 /* GCPtrFaultAddress */);