Changeset 75671 in vbox for trunk/include

Timestamp:

Nov 22, 2018 3:08:24 PM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Implement NMI-unblocking due to IRET for VM-exits. Implemented restoring blocking of NMI when VM-entry fails while checking/loading guest-state. Fixed loading blocking by NMI during VM-entry.

Location:

trunk/include/VBox/vmm

Files:

• cpumctx.h (modified) (2 diffs)
• hm_vmx.h (modified) (2 diffs)
• vm.h (modified) (1 diff)

trunk/include/VBox/vmm/cpumctx.h

@@ -573 +573 @@
                 /** 0x306 - Whether the injected events are subjected to event intercepts.  */
                 bool                    fInterceptEvents;
-                bool                    afPadding0[1];
+                /** 0x307 - Whether blocking of NMI (or virtual-NMIs) was in effect in VMX non-root
+                 *  mode before execution of IRET. */
+                bool                    fNmiUnblockingIret;
                 /** 0x308 - Cache of the nested-guest current VMCS - R0 ptr. */
                 R0PTRTYPE(PVMXVVMCS)    pVmcsR0;
@@ -756 +758 @@
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.fInVmxNonRootMode,      0x305);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.fInterceptEvents,       0x306);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.fNmiUnblockingIret,     0x307);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pVmcsR0,                0x308);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pVmcsR3,                0x310);

trunk/include/VBox/vmm/hm_vmx.h

@@ -4156 +4156 @@
  * Returns whether or not the VM-exit is trap-like or fault-like.
  *
- * @returns @c true if it's a trap-like VM-exit, @c false otehrwise.
+ * @returns @c true if it's a trap-like VM-exit, @c false otherwise.
  * @param   uExitReason     The VM-exit reason.
  *
  * @remarks Warning! This does not validate the VM-exit reason.
  */
-DECLINLINE(bool) HMVmxIsTrapLikeVmexit(uint32_t uExitReason)
+DECLINLINE(bool) HMVmxIsVmexitTrapLike(uint32_t uExitReason)
 {
     /*
@@ -4188 +4188 @@
     return false;
 }
+
+
+/**
+ * Returns whether the VM-entry is vectoring or not given the VM-entry interruption
+ * information field.
+ *
+ * @returns @c true if the VM-entry is vectoring, @c false otherwise.
+ * @param   uEntryIntInfo   The VM-entry interruption information field.
+ */
+DECLINLINE(bool) HMVmxIsVmentryVectoring(uint32_t uEntryIntInfo)
+{
+    if (!VMX_ENTRY_INT_INFO_IS_VALID(uEntryIntInfo))
+        return false;
+    uint8_t const uIntInfoType = VMX_ENTRY_INT_INFO_TYPE(uEntryIntInfo);
+    switch (uIntInfoType)
+    {
+        case VMX_ENTRY_INT_INFO_TYPE_EXT_INT:
+        case VMX_ENTRY_INT_INFO_TYPE_NMI:
+        case VMX_ENTRY_INT_INFO_TYPE_HW_XCPT:
+        case VMX_ENTRY_INT_INFO_TYPE_SW_INT:
+        case VMX_ENTRY_INT_INFO_TYPE_PRIV_SW_XCPT:
+        case VMX_ENTRY_INT_INFO_TYPE_SW_XCPT:
+            return true;
+    }
+    return false;
+}
 /** @} */
 

trunk/include/VBox/vmm/vm.h

@@ -546 +546 @@
 /** VMX-preemption timer in effect. */
 #define VMCPU_FF_VMX_PREEMPT_TIMER          RT_BIT_64(VMCPU_FF_VMX_PREEMPT_TIMER_BIT)
-/** Bit number for VMCPU_FF_VMX_PREEMPT_TIMER. */
 #define VMCPU_FF_VMX_PREEMPT_TIMER_BIT      32
 /** Pending MTF (Monitor Trap Flag) event.  */
 #define VMCPU_FF_VMX_MTF                    RT_BIT_64(VMCPU_FF_VMX_MTF_BIT)
-/** The bit number for VMCPU_FF_VMX_MTF. */
 #define VMCPU_FF_VMX_MTF_BIT                33
 /** VMX APIC-write emulation pending.  */
 #define VMCPU_FF_VMX_APIC_WRITE             RT_BIT_64(VMCPU_FF_VMX_APIC_WRITE_BIT)
-/** The bit number for VMCPU_FF_VMX_UPDATE_VTPR. */
 #define VMCPU_FF_VMX_APIC_WRITE_BIT         34