Changeset 74539 in vbox for trunk/include/VBox

Timestamp:

Oct 1, 2018 4:09:23 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 VM-exit bits; RDTSC, RDTSCP intercepts.

File:

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

trunk/include/VBox/vmm/cpum.h

@@ -1875 +1875 @@
 
 /**
- * Checks whether the given Pin-based VM-execution controls are set.
+ * Checks whether the given Pin-based VM-execution controls are set when executing a
+ * nested-guest.
  *
  * @returns @c true if set, @c false otherwise.
@@ -1881 +1882 @@
  * @param   pCtx        Pointer to the context.
  * @param   uPinCtl     The Pin-based VM-execution controls to check.
+ *
+ * @remarks This does not check if all given controls are set if more than one
+ *          control is passed in @a uPinCtl.
  */
 DECLINLINE(bool) CPUMIsGuestVmxPinCtlsSet(PVMCPU pVCpu, PCCPUMCTX pCtx, uint32_t uPinCtl)
@@ -1887 +1891 @@
     if (pCtx->hwvirt.enmHwvirt != CPUMHWVIRT_VMX)
         return false;
-    Assert(pCtx->hwvirt.vmx.fInVmxNonRootMode);
+    if (!pCtx->hwvirt.vmx.fInVmxNonRootMode)
+        return false;
     Assert(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs));
     return RT_BOOL(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u32PinCtls & uPinCtl);
@@ -1893 +1898 @@
 
 /**
- * Checks whether the given Processor-based VM-execution controls are set.
+ * Checks whether the given Processor-based VM-execution controls are set when
+ * executing a nested-guest.
  *
  * @returns @c true if set, @c false otherwise.
  * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
  * @param   pCtx        Pointer to the context.
- * @param   uPinCtl     The Processor-based VM-execution controls to check.
- */
-DECLINLINE(bool) CPUMIsGuestVmxProcCtlsSet(PVMCPU pVCpu, PCCPUMCTX pCtx, uint32_t uProcCtls)
+ * @param   uProcCtl    The Processor-based VM-execution controls to check.
+ *
+ * @remarks This does not check if all given controls are set if more than one
+ *          control is passed in @a uProcCtls.
+ */
+DECLINLINE(bool) CPUMIsGuestVmxProcCtlsSet(PVMCPU pVCpu, PCCPUMCTX pCtx, uint32_t uProcCtl)
 {
     RT_NOREF(pVCpu);
     if (pCtx->hwvirt.enmHwvirt != CPUMHWVIRT_VMX)
         return false;
-    Assert(pCtx->hwvirt.vmx.fInVmxNonRootMode);
+    if (!pCtx->hwvirt.vmx.fInVmxNonRootMode)
+        return false;
     Assert(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs));
-    return RT_BOOL(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u32ProcCtls & uProcCtls);
-}
-
-/**
- * Checks whether the given Secondary Processor-based VM-execution controls are set.
+    return RT_BOOL(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u32ProcCtls & uProcCtl);
+}
+
+/**
+ * Checks whether the given Secondary Processor-based VM-execution controls are set
+ * when executing a nested-guest.
  *
  * @returns @c true if set, @c false otherwise.
  * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
  * @param   pCtx        Pointer to the context.
- * @param   uPinCtl     The Secondary Processor-based VM-execution controls to
+ * @param   uProcCtl2   The Secondary Processor-based VM-execution controls to
  *                      check.
- */
-DECLINLINE(bool) CPUMIsGuestVmxProcCtls2Set(PVMCPU pVCpu, PCCPUMCTX pCtx, uint32_t uProcCtls2)
+ *
+ * @remarks This does not check if all given controls are set if more than one
+ *          control is passed in @a uProcCtl2.
+ *
+ */
+DECLINLINE(bool) CPUMIsGuestVmxProcCtls2Set(PVMCPU pVCpu, PCCPUMCTX pCtx, uint32_t uProcCtl2)
 {
     RT_NOREF(pVCpu);
     if (pCtx->hwvirt.enmHwvirt != CPUMHWVIRT_VMX)
         return false;
-    Assert(pCtx->hwvirt.vmx.fInVmxNonRootMode);
+    if (!pCtx->hwvirt.vmx.fInVmxNonRootMode)
+        return false;
     Assert(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs));
-    return RT_BOOL(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u32ProcCtls2 & uProcCtls2);
+    return RT_BOOL(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u32ProcCtls2 & uProcCtl2);
 }