Changeset 75107 in vbox

Timestamp:

Oct 26, 2018 3:40:44 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

126170

Message:

VMM/CPUM: Nested VMX: bugref:9180 Add member for recording VM-entry TSC tick.

Location:

trunk

Files:

• include/VBox/vmm/cpumctx.h (modified) (2 diffs)
• src/VBox/VMM/testcase/tstVMStruct.h (modified) (1 diff)

trunk/include/VBox/vmm/cpumctx.h

@@ -659 +659 @@
                 /** 0x390 - Guest TSC timestamp of the previous PAUSE instruction. */
                 uint64_t                uPrevPauseTick;
-                /** 0x398 - Padding. */
-                uint8_t             abPadding[0x3f0 - 0x398];
+                /** 0x398 - Guest TSC timestamp of VM-entry (used for VMX-preemption timer). */
+                uint64_t                uVmentryTick;
+                /** 0x3a0 - Padding. */
+                uint8_t             abPadding[0x3f0 - 0x3a0];
             } vmx;
         } CPUM_UNION_NM(s);
@@ -770 +772 @@
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.uFirstPauseLoopTick,    0x388);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.uPrevPauseTick,         0x390);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.uVmentryTick,           0x398);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pVmcsR0,           8);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pShadowVmcsR0,     8);

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -168 +168 @@
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvMsrBitmapR0);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvMsrBitmapR3);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvIoBitmapR0);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pvIoBitmapR3);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uFirstPauseLoopTick);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uPrevPauseTick);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uVmentryTick);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.enmHwvirt);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.fGif);