Changeset 78980 in vbox for trunk/include/VBox

Timestamp:

Jun 5, 2019 8:55:38 AM (6 years ago)

Author:

vboxsync

Message:

cpum.h: Nested VMX: bugref:9180 Use the inline function to verify VMX non-root mode in all places consistently. Added CPUMIsGuestVmxVirtNmiBlocking for upcoming changes.

File:

• trunk/include/VBox/vmm/cpum.h (modified) (14 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -2009 +2009 @@
 {
     RT_NOREF(pVCpu);
-    Assert(pCtx->hwvirt.enmHwvirt == CPUMHWVIRT_VMX);
-    Assert(pCtx->hwvirt.vmx.fInVmxNonRootMode);
-    Assert(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs));
-    return RT_BOOL(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u32PinCtls & uPinCtls);
+    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
+    PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
+    Assert(pVmcs);
+    return RT_BOOL(pVmcs->u32PinCtls & uPinCtls);
 }
 
@@ -2030 +2030 @@
 {
     RT_NOREF(pVCpu);
-    Assert(pCtx->hwvirt.enmHwvirt == CPUMHWVIRT_VMX);
-    Assert(pCtx->hwvirt.vmx.fInVmxNonRootMode);
-    Assert(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs));
-    return RT_BOOL(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u32ProcCtls & uProcCtls);
+    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
+    PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
+    Assert(pVmcs);
+    return RT_BOOL(pVmcs->u32ProcCtls & uProcCtls);
 }
 
@@ -2052 +2052 @@
 {
     RT_NOREF(pVCpu);
-    Assert(pCtx->hwvirt.enmHwvirt == CPUMHWVIRT_VMX);
-    Assert(pCtx->hwvirt.vmx.fInVmxNonRootMode);
-    Assert(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs));
-    return RT_BOOL(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u32ProcCtls2 & uProcCtls2);
+    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
+    PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
+    Assert(pVmcs);
+    return RT_BOOL(pVmcs->u32ProcCtls2 & uProcCtls2);
 }
 
@@ -2073 +2073 @@
 {
     RT_NOREF(pVCpu);
-    Assert(pCtx->hwvirt.enmHwvirt == CPUMHWVIRT_VMX);
-    Assert(pCtx->hwvirt.vmx.fInVmxNonRootMode);
-    Assert(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs));
-    return RT_BOOL(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u32ExitCtls & uExitCtls);
+    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
+    PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
+    Assert(pVmcs);
+    return RT_BOOL(pVmcs->u32ExitCtls & uExitCtls);
 }
 
@@ -2094 +2094 @@
 {
     RT_NOREF(pVCpu);
-    Assert(pCtx->hwvirt.enmHwvirt == CPUMHWVIRT_VMX);
-    Assert(pCtx->hwvirt.vmx.fInVmxNonRootMode);
-    Assert(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs));
-    return RT_BOOL(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u32EntryCtls & uEntryCtls);
+    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
+    PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
+    Assert(pVmcs);
+    return RT_BOOL(pVmcs->u32EntryCtls & uEntryCtls);
 }
 
@@ -2121 +2121 @@
 
     RT_NOREF(pVCpu);
+    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
     PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
     Assert(pVmcs);
-    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
 
     /* NMIs have a dedicated VM-execution control for causing VM-exits. */
@@ -2204 +2204 @@
 {
     RT_NOREF(pVCpu);
-    Assert(pCtx->hwvirt.enmHwvirt == CPUMHWVIRT_VMX);
-    Assert(pCtx->hwvirt.vmx.fInVmxNonRootMode);
-    Assert(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs));
-    return pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u64AddrApicAccess.u;
+    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
+    PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
+    Assert(pVmcs);
+    return pVmcs->u64AddrApicAccess.u;
 }
 
@@ -2227 +2227 @@
      */
     RT_NOREF(pVCpu);
+    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
     PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
     Assert(pVmcs);
-    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
     uint64_t const uGstCr0      = pCtx->cr0;
     uint64_t const fGstHostMask = pVmcs->u64Cr0Mask.u;
@@ -2253 +2253 @@
      */
     RT_NOREF(pVCpu);
+    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
     PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
     Assert(pVmcs);
-    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
     uint64_t const uGstCr4      = pCtx->cr4;
     uint64_t const fGstHostMask = pVmcs->u64Cr4Mask.u;
@@ -2279 +2279 @@
      */
     RT_NOREF(pVCpu);
+    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
     PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
     Assert(pVmcs);
-    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
 
     uint32_t const fGstHostMask = pVmcs->u64Cr0Mask.u;
@@ -2329 +2329 @@
      */
     RT_NOREF(pVCpu);
+    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
     PCVMXVVMCS pVmcs = pCtx->hwvirt.vmx.CTX_SUFF(pVmcs);
     Assert(pVmcs);
-    Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
     Assert(iCrReg == 0 || iCrReg == 4);
 
@@ -2362 +2362 @@
  * interrupts.
  *
- * @returns VBox status code.
- * @retval  true if it's ready, false otherwise.
- *
+ * @returns @c true if it's ready, @c false otherwise.
  * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
  * @param   pCtx    The guest-CPU context.
@@ -2381 +2379 @@
 
 /**
+ * Checks whether the VMX nested-guest is blocking virtual-NMIs.
+ *
+ * @returns @c true if it's blocked, @c false otherwise.
+ * @param   pCtx    The guest-CPU context.
+ */
+DECLINLINE(bool) CPUMIsGuestVmxVirtNmiBlocking(PCVMCPU pVCpu, PCCPUMCTX pCtx)
+{
+#ifdef IN_RC
+    RT_NOREF2(pVCpu, pCtx);
+    AssertReleaseFailedReturn(false);
+#else
+    /*
+     * Return the state of virtual-NMI blocking, if we are executing a
+     * VMX nested-guest with virtual-NMIs enabled.
+     */
+    Assert(CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_VIRT_NMI));
+    return pCtx->hwvirt.vmx.fVirtNmiBlocking;
+#endif
+}
+
+/**
  * Checks whether the VMX nested-guest is in a state to receive virtual interrupts
  * (those injected with the "virtual-interrupt delivery" feature).
  *
- * @returns VBox status code.
- * @retval  true if it's ready, false otherwise.
- *
+ * @returns @c true if it's ready, @c false otherwise.
  * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
  * @param   pCtx    The guest-CPU context.
@@ -2398 +2415 @@
     RT_NOREF(pVCpu);
     Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
-
-    if (   (pCtx->eflags.u & X86_EFL_IF)
-        && !CPUMIsGuestVmxProcCtlsSet(pVCpu, pCtx, VMX_PROC_CTLS_INT_WINDOW_EXIT))
-        return true;
-    return false;
+    return RT_BOOL(pCtx->eflags.u & X86_EFL_IF);
 #endif
 }