Changeset 75885 in vbox for trunk/src/VBox/VMM

Timestamp:

Dec 3, 2018 5:52:06 AM (6 years ago)

Author:

vboxsync

Message:

VMM/EM: Nested VMX: bugref:9180 Handle VMX-preemption timer VM-exits and MTF VM-exits in the EM loop. Also, why are we not injecting NMIs here when we inject interrupts?

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -2111 +2111 @@
         }
 
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+        /*
+         * VMX Nested-guest monitor-trap flag (MTF) VM-exit.
+         * Takes priority over "Traps on the previous instruction".
+         * See Intel spec. 6.9 "Priority Among Simultaneous Exceptions And Interrupts".
+         */
+        if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_MTF))
+        {
+            rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexitMtf(pVCpu));
+            Assert(rc2 != VINF_VMX_INTERCEPT_NOT_ACTIVE);
+            UPDATE_RC();
+        }
+
+        /*
+         * VMX Nested-guest preemption timer VM-exit.
+         * Takes priority over non-maskable interrupts (NMIs).
+         */
+        if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_PREEMPT_TIMER))
+        {
+            rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexitPreemptTimer(pVCpu));
+            if (rc2 != VINF_VMX_INTERCEPT_NOT_ACTIVE)
+                UPDATE_RC();
+        }
+#endif
+
         /*
          * Interrupts.
@@ -2190 +2215 @@
             }
         }
-
-        /*
-         * VMX Nested-guest monitor-trap flag (MTF) VM-exit.
-         */
-#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-        if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_MTF))
-        {
-            rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexitMtf(pVCpu));
-            UPDATE_RC();
-        }
-#endif
 
         /*