Changeset 79096 in vbox

Timestamp:

Jun 12, 2019 7:22:59 AM (5 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Nested VMX: bugref:9180 Add CPUMSetGuestNmiBlocking for upcoming changes.

Location:

trunk

Files:

• include/VBox/vmm/cpum.h (modified) (2 diffs)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -2396 +2396 @@
      */
     RT_NOREF(pVCpu);
+    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
     Assert(CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_VIRT_NMI));
     return pCtx->hwvirt.vmx.fVirtNmiBlocking;
+#endif
+}
+
+/**
+ * Sets or clears VMX nested-guest virtual-NMI blocking.
+ *
+ * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
+ * @param   pCtx        The guest-CPU context.
+ * @param   fBlocking   Whether virtual-NMI blocking is in effect or not.
+ */
+DECLINLINE(void) CPUMSetGuestVmxVirtNmiBlocking(PCVMCPU pVCpu, PCPUMCTX pCtx, bool fBlocking)
+{
+#ifdef IN_RC
+    RT_NOREF3(pVCpu, pCtx, fBlocking);
+    AssertReleaseFailedReturnVoid();
+#else
+    RT_NOREF(pVCpu);
+    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
+    Assert(CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_VIRT_NMI));
+    pCtx->hwvirt.vmx.fVirtNmiBlocking = fBlocking;
 #endif
 }
@@ -2580 +2601 @@
 VMM_INT_DECL(CPUMINTERRUPTIBILITY) CPUMGetGuestInterruptibility(PVMCPU pVCpu);
 VMM_INT_DECL(bool)                 CPUMIsGuestNmiBlocking(PVMCPU pVCpu);
-
+VMM_INT_DECL(void)                 CPUMSetGuestNmiBlocking(PVMCPU pVCpu, bool fBlock);
 
 /** @name Typical scalable bus frequency values.

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

@@ -2814 +2814 @@
 
 /**
+ * Sets blocking delivery of NMIs to the guest.
+ *
+ * @param   pVCpu   The cross context virtual CPU structure.
+ * @param   fBlock  Whether NMIs are blocked or not.
+ */
+VMM_INT_DECL(void) CPUMSetGuestNmiBlocking(PVMCPU pVCpu, bool fBlock)
+{
+#ifndef IN_RC
+    /*
+     * Set the state of guest-NMI blocking in any of the following cases:
+     *   - We're not executing a nested-guest.
+     *   - We're executing an SVM nested-guest[1].
+     *   - We're executing a VMX nested-guest without virtual-NMIs enabled.
+     *
+     * [1] -- SVM does not support virtual-NMIs or virtual-NMI blocking.
+     *        SVM hypervisors must track NMI blocking themselves by intercepting
+     *        the IRET instruction after injection of an NMI.
+     */
+    PCPUMCTX pCtx = &pVCpu->cpum.s.Guest;
+    if (   !CPUMIsGuestInNestedHwvirtMode(pCtx)
+        ||  CPUMIsGuestInSvmNestedHwVirtMode(pCtx)
+        || !CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_VIRT_NMI))
+    {
+        if (fBlock)
+        {
+            if (!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_BLOCK_NMIS))
+                VMCPU_FF_SET(pVCpu, VMCPU_FF_BLOCK_NMIS);
+        }
+        else
+        {
+            if (VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_BLOCK_NMIS))
+                VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_BLOCK_NMIS);
+        }
+        return;
+    }
+
+    /*
+     * Set the state of virtual-NMI blocking, if we are executing a
+     * VMX nested-guest with virtual-NMIs enabled.
+     */
+    return CPUMSetGuestVmxVirtNmiBlocking(pVCpu, pCtx, fBlock);
+#else
+    if (fBlock)
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_BLOCK_NMIS);
+    else
+        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_BLOCK_NMIS);
+#endif
+}
+
+
+/**
  * Checks whether the SVM nested-guest has physical interrupts enabled.
  *