Changeset 79721 in vbox

Timestamp:

Jul 12, 2019 8:35:44 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 More IDT-vectoring madness.

File:

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

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

@@ -16988 +16988 @@
         case VMX_EXIT_INT_INFO_TYPE_NMI:
         {
-            Assert(!pVCpu->hm.s.Event.fPending);  /* NMIs cannot be caused during delivery on another event. */
+            Assert(!pVCpu->hm.s.Event.fPending);  /* An NMI cannot be caused by the delivery on another event. */
             return hmR0VmxExitHostNmi(pVCpu, pVmxTransient->pVmcsInfo);
         }
@@ -17039 +17039 @@
                 if (pVCpu->hm.s.Event.fPending)
                 {
-                    Assert(ExitEventInfo.uIdtVectoringInfo    == pVCpu->hm.s.Event.u64IntInfo);
+                    Assert(ExitEventInfo.uIdtVectoringInfo == pVCpu->hm.s.Event.u64IntInfo);
                     if (VMX_IDT_VECTORING_INFO_IS_ERROR_CODE_VALID(ExitEventInfo.uIdtVectoringInfo))
                         Assert(ExitEventInfo.uIdtVectoringErrCode == pVCpu->hm.s.Event.u32ErrCode);
@@ -17057 +17057 @@
             /*
              * If the guest hypervisor is not intercepting an exception that caused a VM-exit directly,
-             * forward it to the guest (for e.g, an instruction raises a #GP that causes a VM-exit but
-             * the guest hypervisor is not intercept #GPs, inject #GP into the guest).
+             * forward it to the guest (for e.g, an instruction raises a #GP that causes this VM-exit
+             * despite the guest hypervisor not intercept #GPs, inject #GP into the nested-guest).
+             *
+             * If the guest hypervisor is not intercepting an exception that caused a VM-exit indirectly,
+             * inject the secondary exception into the nested-guest (for e.g, an instruction raises a #GP,
+             * delivery of which causes an #AC. We get a #AC VM-exit but the guest-hypervisor is not
+             * intercepting #AC, then inject the #AC into the nested-guest rather than the original #GP).
              */
-            if (!pVCpu->hm.s.Event.fPending)
-            {
-                hmR0VmxSetPendingEvent(pVCpu, VMX_ENTRY_INT_INFO_FROM_EXIT_INT_INFO(uExitIntInfo), pVmxTransient->cbInstr,
-                                       pVmxTransient->uExitIntErrorCode, pVmxTransient->uExitQual);
-            }
+            pVCpu->hm.s.Event.fPending = false;
+            hmR0VmxSetPendingEvent(pVCpu, VMX_ENTRY_INT_INFO_FROM_EXIT_INT_INFO(uExitIntInfo), pVmxTransient->cbInstr,
+                                   pVmxTransient->uExitIntErrorCode, pVmxTransient->uExitQual);
             return VINF_SUCCESS;
         }