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

Timestamp:

Jun 3, 2019 6:52:00 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 Signal NMI-window FF not just when an IRET finishes executing. Set it up during nested-guest VM-entry.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllCImpl.cpp.h (modified) (1 diff)
• IEMAllCImplVmxInstr.cpp.h (modified) (4 diffs)

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

@@ -3866 +3866 @@
         if (IEM_VMX_IS_PINCTLS_SET(pVCpu, VMX_PIN_CTLS_NMI_EXIT))
             fBlockingNmi = false;
-
-        /* Signal a pending NMI-window VM-exit before executing the next instruction. */
-        if (   IEM_VMX_IS_PROCCTLS_SET(pVCpu, VMX_PROC_CTLS_NMI_WINDOW_EXIT)
-            && !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW))
-        {
-            Assert(IEM_VMX_IS_PINCTLS_SET(pVCpu, VMX_PIN_CTLS_VIRT_NMI));
-            VMCPU_FF_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW);
-        }
 
         /* Clear virtual-NMI blocking, if any, before causing any further exceptions. */

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

@@ -2772 +2772 @@
     Assert(pVmcs->u64RoIoRip.u == 0);
 
+    /* We should not cause an NMI-window/interrupt-window VM-exit when injecting events as part of VM-entry. */
+    if (!pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents)
+    {
+        Assert(uExitReason != VMX_EXIT_NMI_WINDOW);
+        Assert(uExitReason != VMX_EXIT_INT_WINDOW);
+    }
+
     /*
      * Save the guest state back into the VMCS.
@@ -3940 +3947 @@
 
     /*
-     * If the event is being injected as part of VM-entry, it isn't subject to event
+     * If the event is being injected as part of VM-entry, it is -not- subject to event
      * intercepts in the nested-guest. However, secondary exceptions that occur during
      * injection of any event -are- subject to event interception.
@@ -7246 +7253 @@
 
 /**
+ * Sets up NMI-window exiting.
+ *
+ * @param   pVCpu       The cross context virtual CPU structure.
+ * @param   pszInstr    The VMX instruction name (for logging purposes).
+ */
+IEM_STATIC void iemVmxVmentrySetupNmiWindow(PVMCPU pVCpu, const char *pszInstr)
+{
+    PCVMXVVMCS pVmcs = pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs);
+    Assert(pVmcs);
+    if (pVmcs->u32ProcCtls & VMX_PROC_CTLS_NMI_WINDOW_EXIT)
+    {
+        Assert(pVmcs->u32PinCtls & VMX_PIN_CTLS_VIRT_NMI);
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW);
+        Log(("%s: NMI-window set on VM-entry\n", pszInstr));
+    }
+    else
+        Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW));
+    NOREF(pszInstr);
+}
+
+
+/**
  * Set up the VMX-preemption timer.
  *
@@ -7663 +7692 @@
                                 /* Setup monitor-trap flag. */
                                 iemVmxVmentrySetupMtf(pVCpu, pszInstr);
+
+                                /* Setup NMI-window exiting. */
+                                iemVmxVmentrySetupNmiWindow(pVCpu, pszInstr);
 
                                 /* Now that we've switched page tables, we can go ahead and inject any event. */