Changeset 49664 in vbox for trunk/include

Timestamp:

Nov 26, 2013 3:53:35 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: MSR optimizations for world-switch of 64-bit guests.

Location:

trunk/include/VBox/vmm

Files:

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

trunk/include/VBox/vmm/hm_vmx.h

@@ -94 +94 @@
 AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase,    40);
 AssertCompileSize(VMXRESTOREHOST, 56);
+
+/** @name Host-state MSR lazy-restoration flags.
+ * @{
+ */
+#define VMX_RESTORE_HOST_MSR_LSTAR            RT_BIT(0)
+#define VMX_RESTORE_HOST_MSR_STAR             RT_BIT(1)
+#define VMX_RESTORE_HOST_MSR_SFMASK           RT_BIT(2)
+#define VMX_RESTORE_HOST_MSR_KERNELGSBASE     RT_BIT(3)
+/** @} */
 
 /** @name VMX HM-error codes for VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO.
@@ -2113 +2122 @@
 #ifdef VBOX_WITH_HYBRID_32BIT_KERNEL
 # define VMXWriteVmcsHstN(idxField, uVal)       HMVMX_IS_64BIT_HOST_MODE() ?                     \
-                                                   VMXWriteVmcs64(idxField, uVal)                 \
+                                                   VMXWriteVmcs64(idxField, uVal)                \
                                                  : VMXWriteVmcs32(idxField, uVal)
 # define VMXWriteVmcsGstN(idxField, u64Val)     (pVCpu->CTX_SUFF(pVM)->hm.s.fAllow64BitGuests) ? \
-                                                   VMXWriteVmcs64(idxField, u64Val)               \
+                                                   VMXWriteVmcs64(idxField, u64Val)              \
                                                  : VMXWriteVmcs32(idxField, u64Val)
 #elif ARCH_BITS == 32

trunk/include/VBox/vmm/vm.h

@@ -149 +149 @@
         struct HMCPU    s;
 #endif
-        uint8_t             padding[5568];      /* multiple of 64 */
+        uint8_t             padding[5632];      /* multiple of 64 */
     } hm;
 
@@ -226 +226 @@
 
     /** Align the following members on page boundary. */
-    uint8_t                 abAlignment2[192];
+    uint8_t                 abAlignment2[128];
 
     /** PGM part. */

trunk/include/VBox/vmm/vm.mac

@@ -135 +135 @@
 
     .cpum                   resb 3584
-    .hm                     resb 5568
+    .hm                     resb 5632
     .em                     resb 1472
     .iem                    resb 3072