Changeset 79097 in vbox

Timestamp:

Jun 12, 2019 7:27:10 AM (6 years ago)

Author:

vboxsync

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

131259

Message:

VMM/EM: Nested VMX: bugref:9180 NMI VMX/SVM intercepts must be done -before- injecting an NMI (through TRPM or otherwise). Fix ordering.

File:

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

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

@@ -2200 +2200 @@
                     && !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_BLOCK_NMIS))
                 {
-                    if (!CPUMIsGuestInNestedHwvirtMode(&pVCpu->cpum.GstCtx))
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+                    if (   CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx)
+                        && CPUMIsGuestVmxPinCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PIN_CTLS_NMI_EXIT))
+                    {
+                        rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexitXcptNmi(pVCpu));
+                        Assert(rc2 != VINF_VMX_INTERCEPT_NOT_ACTIVE);
+                        UPDATE_RC();
+                    }
+#endif
+#ifdef VBOX_WITH_NESTED_HWVIRT_SVM
+                    else if (   CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx)
+                             && CPUMIsGuestSvmCtrlInterceptSet(pVCpu, &pVCpu->cpum.GstCtx, SVM_CTRL_INTERCEPT_NMI))
+                    {
+                        rc2 = VBOXSTRICTRC_VAL(IEMExecSvmVmexit(pVCpu, SVM_EXIT_NMI, 0 /* uExitInfo1 */,  0 /* uExitInfo2 */));
+                        AssertMsg(   rc2 != VINF_PGM_CHANGE_MODE
+                                  && rc2 != VINF_SVM_VMEXIT
+                                  && rc2 != VINF_NO_CHANGE, ("%Rrc\n", rc2));
+                        UPDATE_RC();
+                    }
+                    else
+#endif
                     {
                         rc2 = TRPMAssertTrap(pVCpu, X86_XCPT_NMI, TRPM_TRAP);
@@ -2218 +2238 @@
                         UPDATE_RC();
                     }
-#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-                    else if (   CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx)
-                             && CPUMIsGuestVmxPinCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PIN_CTLS_NMI_EXIT))
-                    {
-                        rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexitXcptNmi(pVCpu));
-                        Assert(rc2 != VINF_VMX_INTERCEPT_NOT_ACTIVE);
-                        UPDATE_RC();
-                    }
-#endif
-#ifdef VBOX_WITH_NESTED_HWVIRT_SVM
-                    else if (   CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx)
-                             && CPUMIsGuestSvmCtrlInterceptSet(pVCpu, &pVCpu->cpum.GstCtx, SVM_CTRL_INTERCEPT_NMI))
-                    {
-                        rc2 = VBOXSTRICTRC_VAL(IEMExecSvmVmexit(pVCpu, SVM_EXIT_NMI, 0 /* uExitInfo1 */,  0 /* uExitInfo2 */));
-                        AssertMsg(   rc2 != VINF_PGM_CHANGE_MODE
-                                  && rc2 != VINF_SVM_VMEXIT
-                                  && rc2 != VINF_NO_CHANGE, ("%Rrc\n", rc2));
-                        UPDATE_RC();
-                    }
-#endif
                 }
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX