Changeset 74303 in vbox for trunk/include/VBox

Timestamp:

Sep 17, 2018 9:33:58 AM (6 years ago)

Author:

vboxsync

Message:

VMM/CPUM, IEM: Nested VMX: bugref:9180 vmlaunch/vmresume bits.

Location:

trunk/include/VBox/vmm

Files:

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

trunk/include/VBox/vmm/cpum.mac

@@ -280 +280 @@
     alignb 8
     .hwvirt.svm.HCPhysVmcb             RTHCPHYS_RES  1
+    .hwvirt.uInhibitRip                resq          1
     .hwvirt.fLocalForcedActions        resd          1
     .hwvirt.fGif                       resb          1

trunk/include/VBox/vmm/cpumctx.h

@@ -618 +618 @@
         } CPUM_UNION_NM(s);
 
-        /** 0x3f0 - A subset of force flags that are preserved while running the nested-guest. */
+        /** 0x3f0 - Saved guest's interrupt-inhibited RIP (if any) - Intel only. */
+        uint64_t                uInhibitRip;
+        /** 0x3f8 - A subset of guest force flags that are saved while running the
+         *  nested-guest. */
         uint32_t                fLocalForcedActions;
-        /** 0x3f4 - Global interrupt flag (always true on nested VMX). */
+        /** 0x3fc - Global interrupt flag - AMD only (always true on Intel). */
         bool                    fGif;
-        /** 0x3f5 - Padding. */
-        uint8_t                 abPadding1[11];
+        /** 0x3fd - Padding. */
+        uint8_t                 abPadding1[3];
     } hwvirt;
     /** @} */
@@ -687 +690 @@
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.pvIoBitmapR3,           0x3e0);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.HCPhysVmcb,             0x3e8);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions, 0x3f0);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.uInhibitRip,         0x3f0);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions, 0x3f8);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.fGif,                0x3fc);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.pVmcbR0,       8);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.pvMsrBitmapR0, 8);

trunk/include/VBox/vmm/hm_vmx.h

@@ -2440 +2440 @@
 #define VMX_IDT_VECTORING_INFO_IS_VALID(a)                      (((a) >> 31) & 1)
 
+/** Construct an IDT-vectoring information field from an VM-entry interruption
+ *  information field (same except that bit 12 is reserved). */
+#define VMX_EXIT_IDT_INFO_FROM_ENTRY_INT_INFO(a)                ((a) & ~RT_BIT(12))
+
 /** Bit fields for IDT-vectoring information. */
 /** The IDT-vectoring info vector. */
@@ -2795 +2799 @@
 /** @name Format of Pending-Debug-Exceptions.
  * Bits 4-11, 13, 15 and 17-63 are reserved.
+ * Similar to DR6 except bit 12 (breakpoint enabled) and bit 16 (RTM) are both
+ * possibly valid here but not in DR6.
  * @{
  */