Changeset 72065 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Apr 30, 2018 6:27:34 AM (7 years ago)

Author:

vboxsync

Message:

VMM/SVM: Interrupt injection fixes.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllRegs.cpp (modified) (3 diffs)
• HMSVMAll.cpp (modified) (1 diff)
• IEMAllCImplSvmInstr.cpp.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -2568 +2568 @@
     Assert(pCtx->hwvirt.fGif);
 
-    if (!pCtx->hwvirt.svm.fHMCachedVmcb)
-    {
-        PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
-        X86EFLAGS fEFlags;
-        if (pVmcbCtrl->IntCtrl.n.u1VIntrMasking)
-            fEFlags.u = pCtx->hwvirt.svm.HostState.rflags.u;
-        else
-            fEFlags.u = pCtx->eflags.u;
-
-        return fEFlags.Bits.u1IF;
-    }
-
-    return HMCanSvmNstGstTakePhysIntr(pVCpu, pCtx);
+    X86EFLAGS fEFlags;
+    if (CPUMIsGuestSvmVirtIntrMasking(pVCpu, pCtx))
+        fEFlags.u = pCtx->hwvirt.svm.HostState.rflags.u;
+    else
+        fEFlags.u = pCtx->eflags.u;
+
+    return fEFlags.Bits.u1IF;
 #endif
 }
@@ -2604 +2598 @@
     Assert(pCtx->hwvirt.fGif);
 
-    /*
-     * Although at present, the V_TPR and V_INTR_PRIO fields are not modified
-     * by SVM R0 code and we could inspect them directly here, we play it
-     * safe and ask HM if it has cached the VMCB.
-     */
-    if (!pCtx->hwvirt.svm.fHMCachedVmcb)
-    {
-        PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
-        if (   !pVmcbCtrl->IntCtrl.n.u1IgnoreTPR
-            &&  pVmcbCtrl->IntCtrl.n.u4VIntrPrio <= pVmcbCtrl->IntCtrl.n.u8VTPR)
-            return false;
-
-        X86EFLAGS fEFlags;
-        if (pVmcbCtrl->IntCtrl.n.u1VIntrMasking)
-            fEFlags.u = pCtx->eflags.u;
-        else
-            fEFlags.u = pCtx->hwvirt.svm.HostState.rflags.u;
-
-        return fEFlags.Bits.u1IF;
-    }
-
-    return HMCanSvmNstGstTakeVirtIntr(pVCpu, pCtx);
+    PCSVMVMCBCTRL pVmcbCtrl    = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
+    PCSVMINTCTRL  pVmcbIntCtrl = &pVmcbCtrl->IntCtrl;
+    if (   !pVmcbIntCtrl->n.u1IgnoreTPR
+        &&  pVmcbIntCtrl->n.u4VIntrPrio <= pVmcbIntCtrl->n.u8VTPR)
+        return false;
+
+    X86EFLAGS fEFlags;
+    if (CPUMIsGuestSvmVirtIntrMasking(pVCpu, pCtx))
+        fEFlags.u = pCtx->eflags.u;
+    else
+        fEFlags.u = pCtx->hwvirt.svm.HostState.rflags.u;
+
+    return fEFlags.Bits.u1IF;
 #endif
 }
@@ -2644 +2629 @@
     PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
     return pVmcbCtrl->IntCtrl.n.u8VIntrVector;
+#endif
+}
+
+
+/**
+ * Gets the SVM nested-guest virtual GIF.
+ *
+ * @returns The nested-guest virtual GIF.
+ * @param   pCtx            The guest-CPU context.
+ */
+VMM_INT_DECL(bool) CPUMGetSvmNstGstVGif(PCCPUMCTX pCtx)
+{
+#ifdef IN_RC
+    RT_NOREF(pCtx);
+    AssertReleaseFailedReturn(false);
+#else
+    PCSVMVMCBCTRL pVmcbCtrl    = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
+    PCSVMINTCTRL  pVmcbIntCtrl = &pVmcbCtrl->IntCtrl;
+    if (pVmcbIntCtrl->n.u1VGifEnable)
+        return pVmcbIntCtrl->n.u1VGif;
+    return true;
 #endif
 }

trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp

@@ -577 +577 @@
 }
 
-
-/**
- * Checks whether the SVM nested-guest is in a state to receive physical (APIC)
- * interrupts.
- *
- * @returns true if it's ready, false otherwise.
- * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
- * @param   pCtx        The guest-CPU context.
- *
- * @remarks This function looks at the VMCB cache rather than directly at the
- *          nested-guest VMCB. The latter may have been modified for executing
- *          using hardware-assisted SVM.
- *
- * @sa      CPUMCanSvmNstGstTakePhysIntr.
- */
-VMM_INT_DECL(bool) HMCanSvmNstGstTakePhysIntr(PVMCPU pVCpu, PCCPUMCTX pCtx)
-{
-    Assert(pCtx->hwvirt.svm.fHMCachedVmcb);
-    Assert(pCtx->hwvirt.fGif);
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-    X86EFLAGS fEFlags;
-    if (pVmcbNstGstCache->fVIntrMasking)
-        fEFlags.u = pCtx->hwvirt.svm.HostState.rflags.u;
-    else
-        fEFlags.u = pCtx->eflags.u;
-    return fEFlags.Bits.u1IF;
-}
-
-
-/**
- * Checks whether the SVM nested-guest is in a state to receive virtual (setup
- * for injection by VMRUN instruction) interrupts.
- *
- * @returns true if it's ready, false otherwise.
- * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
- * @param   pCtx        The guest-CPU context.
- *
- * @remarks This function looks at the VMCB cache rather than directly at the
- *          nested-guest VMCB. The latter may have been modified for executing
- *          using hardware-assisted SVM.
- *
- * @sa      CPUMCanSvmNstGstTakeVirtIntr.
- */
-VMM_INT_DECL(bool) HMCanSvmNstGstTakeVirtIntr(PVMCPU pVCpu, PCCPUMCTX pCtx)
-{
-#ifdef IN_RC
-    RT_NOREF2(pVCpu, pCtx);
-    AssertReleaseFailedReturn(false);
-#else
-    Assert(pCtx->hwvirt.svm.fHMCachedVmcb);
-    Assert(pCtx->hwvirt.fGif);
-    PCSVMNESTEDVMCBCACHE pVmcbNstGstCache = &pVCpu->hm.s.svm.NstGstVmcbCache;
-
-    PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
-    if (   !pVmcbCtrl->IntCtrl.n.u1IgnoreTPR
-        &&  pVmcbCtrl->IntCtrl.n.u4VIntrPrio <= pVmcbCtrl->IntCtrl.n.u8VTPR)
-        return false;
-
-    X86EFLAGS fEFlags;
-    if (pVmcbNstGstCache->fVIntrMasking)
-        fEFlags.u = pCtx->eflags.u;
-    else
-        fEFlags.u = pCtx->hwvirt.svm.HostState.rflags.u;
-    return fEFlags.Bits.u1IF;
-#endif
-}
-

trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h

@@ -174 +174 @@
              *
              *   - V_IRQ: Tracked using VMCPU_FF_INTERRUPT_NESTED_GUEST force-flag and updated below.
-             *   - V_TPR: Already updated by iemCImpl_load_CrX or by the physical CPU for
-             *     hardware-assisted SVM execution.
+             *   - V_TPR: Updated by iemCImpl_load_CrX or by the physical CPU for hardware-assisted
+             *     SVM execution.
              *   - Interrupt shadow: Tracked using VMCPU_FF_INHIBIT_INTERRUPTS and RIP.
              */
             PSVMVMCBCTRL pVmcbMemCtrl = &pVmcbMem->ctrl;
-            if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST))        /* V_IRQ. */
+            if (!VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST))       /* V_IRQ. */
+                pVmcbMemCtrl->IntCtrl.n.u1VIrqPending = 0;
+            else
             {
                 Assert(pVmcbCtrl->IntCtrl.n.u1VIrqPending);
-                pVmcbMemCtrl->IntCtrl.n.u1VIrqPending = 1;
                 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST);
             }
-            else
-                pVmcbMemCtrl->IntCtrl.n.u1VIrqPending = 0;
 
             pVmcbMemCtrl->IntCtrl.n.u8VTPR = pVmcbCtrl->IntCtrl.n.u8VTPR;           /* V_TPR. */
@@ -439 +438 @@
 
         /* Virtual GIF. */
-        if (   pVmcbCtrl->IntCtrl.n.u1VGifEnable
-            && pVM->cpum.ro.GuestFeatures.fSvmVGif)
+        if (    pVmcbCtrl->IntCtrl.n.u1VGifEnable
+            && !pVM->cpum.ro.GuestFeatures.fSvmVGif)
         {
             Log(("iemSvmVmrun: Virtual GIF not supported -> Disabling\n"));