Changeset 79843 in vbox

Timestamp:

Jul 17, 2019 5:42:11 PM (6 years ago)

Author:

vboxsync

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

132230

Message:

VMM/EM: Nested VMX: bugref:9180 Nested SVM: bugref:7243 Fix missing CPUMIsGuestPhysIntrEnabled for the VMX case and re-factored the code to be far more readable.

File:

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

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

@@ -1717 +1717 @@
  *
  * @returns VBox status code.
+ * @retval  VINF_NO_CHANGE if the VMX external interrupt intercept was not active.
  * @param   pVCpu       The cross context virtual CPU structure.
  */
@@ -1722 +1723 @@
 {
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-    Assert(CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx));
-
     /* Handle the "external interrupt" VM-exit intercept. */
     if (    CPUMIsGuestVmxPinCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PIN_CTLS_EXT_INT_EXIT)
@@ -1746 +1745 @@
  *
  * @returns VBox status code.
+ * @retval  VINF_NO_CHANGE if the SVM external interrupt intercept was not active.
  * @param   pVCpu       The cross context virtual CPU structure.
  */
@@ -1751 +1751 @@
 {
 #ifdef VBOX_WITH_NESTED_HWVIRT_SVM
-    Assert(CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx));
-
     /* Handle the physical interrupt intercept (can be masked by the guest hypervisor). */
-    if (   CPUMIsGuestPhysIntrEnabled(pVCpu)
-        && CPUMIsGuestSvmCtrlInterceptSet(pVCpu, &pVCpu->cpum.GstCtx, SVM_CTRL_INTERCEPT_INTR))
+    if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, &pVCpu->cpum.GstCtx, SVM_CTRL_INTERCEPT_INTR))
     {
         CPUM_ASSERT_NOT_EXTRN(pVCpu, IEM_CPUMCTX_EXTRN_SVM_VMEXIT_MASK);
@@ -1781 +1778 @@
  *
  * @returns VBox status code.
+ * @retval  VINF_NO_CHANGE if the SVM virtual interrupt intercept was not active.
  * @param   pVCpu       The cross context virtual CPU structure.
  */
@@ -2166 +2164 @@
             && !TRPMHasTrap(pVCpu))                                  /* An event could already be scheduled for dispatching. */
         {
+            bool fInVmxNonRootMode;
+            bool fInSvmHwvirtMode;
+            bool const fInNestedGuest = CPUMIsGuestInNestedHwvirtMode(&pVCpu->cpum.GstCtx);
+            if (fInNestedGuest)
+            {
+                fInVmxNonRootMode = CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx);
+                fInSvmHwvirtMode  = CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx);
+            }
+            else
+            {
+                fInVmxNonRootMode = false;
+                fInSvmHwvirtMode  = false;
+            }
+
             bool fGif = CPUMGetGuestGif(&pVCpu->cpum.GstCtx);
 #ifdef VBOX_WITH_RAW_MODE
@@ -2202 +2214 @@
                 {
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-                    if (   CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx)
+                    if (   fInVmxNonRootMode
                         && CPUMIsGuestVmxPinCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PIN_CTLS_NMI_EXIT))
                     {
@@ -2212 +2224 @@
 #endif
 #ifdef VBOX_WITH_NESTED_HWVIRT_SVM
-                    if (   CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx)
+                    if (   fInSvmHwvirtMode
                         && CPUMIsGuestSvmCtrlInterceptSet(pVCpu, &pVCpu->cpum.GstCtx, SVM_CTRL_INTERCEPT_NMI))
                     {
@@ -2271 +2283 @@
                      * SVM: physical interrupts takes priority over virtual interrupts.
                      */
-                    if (   VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST)
-                        && CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx)
+                    if (   fInVmxNonRootMode
+                        && VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST)
                         && CPUMIsGuestVmxVirtIntrEnabled(pVCpu, &pVCpu->cpum.GstCtx))
                     {
                         /** @todo NSTVMX: virtual-interrupt delivery. */
-                        rc2 = VINF_NO_CHANGE;
+                        rc2 = VINF_SUCCESS;
                     }
-                    else if (VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))
+                    else if (   VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)
+                             && CPUMIsGuestPhysIntrEnabled(pVCpu))
                     {
-                        bool fInjected = false;
                         Assert(pVCpu->em.s.enmState != EMSTATE_WAIT_SIPI);
-
-                        if (!CPUMIsGuestInNestedHwvirtMode(&pVCpu->cpum.GstCtx))
-                        {
-                            if (CPUMIsGuestPhysIntrEnabled(pVCpu))
-                                rc2 = VINF_NO_CHANGE;
-                            else
-                                rc2 = VINF_SUCCESS;
-                        }
-                        else if (CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx))
+                        if (fInVmxNonRootMode)
                             rc2 = emR3VmxNstGstIntrIntercept(pVCpu);
+                        else if (fInSvmHwvirtMode)
+                            rc2 = emR3SvmNstGstIntrIntercept(pVCpu);
                         else
-                        {
-                            Assert(CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx));
-                            rc2 = emR3SvmNstGstIntrIntercept(pVCpu);
-                        }
-
-                        /* If no interrupt has been injected so far, do so now. */
+                            rc2 = VINF_NO_CHANGE;
+
                         if (rc2 == VINF_NO_CHANGE)
                         {
+                            bool fInjected = false;
                             CPUM_IMPORT_EXTRN_RET(pVCpu, IEM_CPUMCTX_EXTRN_XCPT_MASK);
                             /** @todo this really isn't nice, should properly handle this */
@@ -2312 +2315 @@
                                 rc2 = VINF_EM_RESCHEDULE;
                             }
+#ifdef VBOX_STRICT
+                            if (fInjected)
+                                rcIrq = rc2;
+#endif
                         }
-#ifdef VBOX_STRICT
-                        if (fInjected)
-                            rcIrq = rc2;
-#endif
                         UPDATE_RC();
                     }
-                    else if (   VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST)
-                             && CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx)
+                    else if (   fInSvmHwvirtMode
+                             && VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST)
                              && CPUMIsGuestSvmVirtIntrEnabled(pVCpu,  &pVCpu->cpum.GstCtx))
                     {