Changeset 71915 in vbox for trunk

Timestamp:

Apr 19, 2018 10:03:20 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Nested Hw.virt: Sync VMCPU_FF_INTERRUPT_NESTED_GUEST while returning from executing the nested-guest.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (2 diffs)

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

@@ -2734 +2734 @@
 
 #ifdef VBOX_WITH_NESTED_HWVIRT
-    /*
-     * Guest Virtual GIF (Global Interrupt Flag).
-     */
-    if (pVmcb->ctrl.IntCtrl.n.u1VGifEnable == 1)
-    {
-        Assert(pVCpu->CTX_SUFF(pVM)->hm.s.svm.fVGif);
-        Assert(!CPUMIsGuestInSvmNestedHwVirtMode(pMixedCtx));
-        pMixedCtx->hwvirt.fGif = pVmcb->ctrl.IntCtrl.n.u1VGif;
+    if (!CPUMIsGuestInSvmNestedHwVirtMode(pMixedCtx))
+    {
+        if (pVmcb->ctrl.IntCtrl.n.u1VGifEnable)
+        {
+            /*
+             * Guest Virtual GIF (Global Interrupt Flag).
+             * We don't yet support passing VGIF feature to the guest.
+             */
+            Assert(pVCpu->CTX_SUFF(pVM)->hm.s.svm.fVGif);
+            pMixedCtx->hwvirt.fGif = pVmcb->ctrl.IntCtrl.n.u1VGif;
+        }
+    }
+    else
+    {
+        /* Sync/verify nested-guest's V_IRQ pending and our force-flag. */
+        if (!pVmcb->ctrl.IntCtrl.n.u1VIrqPending)
+        {
+            if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST))
+                VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST);
+        }
+        else
+            Assert(VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST));
     }
 #endif
@@ -3133 +3147 @@
      * RDTSC/RDTSCP as well.
      */
-    bool     fParavirtTsc;
-    uint64_t uTscOffset;
+    bool       fParavirtTsc;
+    uint64_t   uTscOffset;
     bool const fCanUseRealTsc = TMCpuTickCanUseRealTSC(pVM, pVCpu, &uTscOffset, &fParavirtTsc);