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

Timestamp:

Sep 22, 2018 3:06:57 PM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 VM-exit bits.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (3 diffs)

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

@@ -4272 +4272 @@
      *     exception bitmap) do block subsequent NMIs.
      *
-     *   - MTF needs to be preserved as it's for a single instruction boundary which
-     *     follows the return from VMLAUNCH/VMRESUME instruction.
+     *   - MTF need not be preserved as it's used only in VMX non-root mode and
+     *     is supplied on VM-entry through the VM-execution controls.
      *
      * The remaining FFs (e.g. timers) can stay in place so that we will be able to
      * generate interrupts that should cause #VMEXITs for the nested-guest.
      */
-    uint32_t const fNstGstDiscardMask = VMCPU_FF_MTF;
-    pVCpu->cpum.GstCtx.hwvirt.fLocalForcedActions = pVCpu->fLocalForcedActions & fNstGstDiscardMask;
-    VMCPU_FF_CLEAR(pVCpu, fNstGstDiscardMask);
+    uint32_t const fDiscardMask = VMCPU_FF_INHIBIT_INTERRUPTS | VMCPU_FF_MTF | VMCPU_FF_BLOCK_NMIS;
+    pVCpu->cpum.GstCtx.hwvirt.fLocalForcedActions = pVCpu->fLocalForcedActions & fDiscardMask;
+    VMCPU_FF_CLEAR(pVCpu, fDiscardMask);
 }
 
@@ -4566 +4566 @@
                                 }
 
+                                /* We've now entered nested-guest execution. */
+                                pVCpu->cpum.GstCtx.hwvirt.vmx.fInVmxNonRootMode = true;
+
                                 /* Event injection. */
                                 iemVmxVmentryInjectEvent(pVCpu, pszInstr);
@@ -5321 +5324 @@
 
     /** @todo NSTVMX: rest of VM-exit. */
+
+    /* We're no longer in nested-guest execution mode. */
+    pVCpu->cpum.GstCtx.hwvirt.vmx.fInVmxNonRootMode = false;
+
     return VINF_SUCCESS;
 }