Changeset 46925 in vbox for trunk/include/VBox

Timestamp:

Jul 3, 2013 11:16:39 AM (11 years ago)

Author:

vboxsync

Message:

VMM: Optimized world-switch with lazy restoration LDTR and TR on Intel.

Location:

trunk/include/VBox/vmm

Files:

• hm_vmx.h (modified) (3 diffs)
• hm_vmx.mac (modified) (3 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -45 +45 @@
 #define VMX_RESTORE_HOST_SEL_FS               RT_BIT(2)
 #define VMX_RESTORE_HOST_SEL_GS               RT_BIT(3)
-#define VMX_RESTORE_HOST_GDTR                 RT_BIT(4)
-#define VMX_RESTORE_HOST_IDTR                 RT_BIT(5)
-#define VMX_RESTORE_HOST_LDTR                 RT_BIT(6)
+#define VMX_RESTORE_HOST_SEL_LDTR             RT_BIT(4)
+#define VMX_RESTORE_HOST_SEL_TR               RT_BIT(5)
+#define VMX_RESTORE_HOST_GDTR                 RT_BIT(6)
+#define VMX_RESTORE_HOST_IDTR                 RT_BIT(7)
 /** @} */
 
@@ -62 +63 @@
     RTSEL       uHostSelFS;     /* 0x04 */
     RTSEL       uHostSelGS;     /* 0x06 */
-    uint64_t    uHostFSBase;    /* 0x08 */
-    uint64_t    uHostGSBase;    /* 0x10 */
-    X86XDTR64   HostGdtr;       /* 0x18 */
-    X86XDTR64   HostIdtr;       /* 0x22 */
+    RTSEL       uHostSelLDTR;   /* 0x08 */
+    RTSEL       uHostSelTR;     /* 0x0a */
+    uint32_t    u32Padding;     /* 0x0c */
+    uint64_t    uHostFSBase;    /* 0x10 */
+    uint64_t    uHostGSBase;    /* 0x18 */
+    X86XDTR64   HostGdtr;       /* 0x20 */
+    X86XDTR64   HostIdtr;       /* 0x2a */
 } VMXRESTOREHOST;
 #pragma pack()
@@ -71 +75 @@
 typedef VMXRESTOREHOST *PVMXRESTOREHOST;
 AssertCompileSize(X86XDTR64, 10);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelES, 2);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelFS, 4);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelGS, 6);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase, 8);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostGSBase, 16);
-AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtr, 24);
-AssertCompileMemberOffset(VMXRESTOREHOST, HostIdtr, 34);
-AssertCompileSize(VMXRESTOREHOST, 44);
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelDS,    0);
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelES,    2);
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelFS,    4);
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelGS,    6);
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelLDTR,  8);
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelTR,   10);
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase,  16);
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostGSBase,  24);
+AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtr,     32);
+AssertCompileMemberOffset(VMXRESTOREHOST, HostIdtr,     42);
+AssertCompileSize(VMXRESTOREHOST, 52);
 
 /** @name VMX VMCS-Read cache indices.

trunk/include/VBox/vmm/hm_vmx.mac

@@ -61 +61 @@
 %define VMX_VMCS_GUEST_DEBUGCTL_FULL                            02802h
 %define VMX_VMCS_GUEST_DEBUGCTL_HIGH                            02803h
-%define VMX_VMCS_CTRL_PIN_EXEC                                  04000h
-%define VMX_VMCS_CTRL_PROC_EXEC                                 04002h
+%define VMX_VMCS_CTRL_PIN_EXEC                                  04000h
+%define VMX_VMCS_CTRL_PROC_EXEC                                 04002h
 %define VMX_VMCS_CTRL_EXCEPTION_BITMAP                          04004h
 %define VMX_VMCS_CTRL_PAGEFAULT_ERROR_MASK                      04006h
 %define VMX_VMCS_CTRL_PAGEFAULT_ERROR_MATCH                     04008h
 %define VMX_VMCS_CTRL_CR3_TARGET_COUNT                          0400Ah
-%define VMX_VMCS_CTRL_EXIT                                      0400Ch
+%define VMX_VMCS_CTRL_EXIT                                      0400Ch
 %define VMX_VMCS_CTRL_EXIT_MSR_STORE_COUNT                      0400Eh
 %define VMX_VMCS_CTRL_EXIT_MSR_LOAD_COUNT                       04010h
-%define VMX_VMCS_CTRL_ENTRY                                     04012h
+%define VMX_VMCS_CTRL_ENTRY                                     04012h
 %define VMX_VMCS_CTRL_ENTRY_MSR_LOAD_COUNT                      04014h
 %define VMX_VMCS_CTRL_ENTRY_IRQ_INFO                            04016h
@@ -152 +152 @@
 %define VMX_VMCS_HOST_RIP                                       06C16h
 
-%define VMX_RESTORE_HOST_SEL_DS                                 1h      ;RT_BIT(0)
-%define VMX_RESTORE_HOST_SEL_ES                                 2h      ;RT_BIT(1)
-%define VMX_RESTORE_HOST_SEL_FS                                 4h      ;RT_BIT(2)
-%define VMX_RESTORE_HOST_SEL_GS                                 8h      ;RT_BIT(3)
-%define VMX_RESTORE_HOST_GDTR                                   10h     ;RT_BIT(4)
-%define VMX_RESTORE_HOST_IDTR                                   20h     ;RT_BIT(5)
-%define VMX_RESTORE_HOST_LDTR                                   40h     ;RT_BIT(6)
+%define VMX_RESTORE_HOST_SEL_DS                                 1h    ;RT_BIT(0)
+%define VMX_RESTORE_HOST_SEL_ES                                 2h    ;RT_BIT(1)
+%define VMX_RESTORE_HOST_SEL_FS                                 4h    ;RT_BIT(2)
+%define VMX_RESTORE_HOST_SEL_GS                                 8h    ;RT_BIT(3)
+%define VMX_RESTORE_HOST_SEL_LDTR                               10h   ;RT_BIT(4)
+%define VMX_RESTORE_HOST_SEL_TR                                 20h   ;RT_BIT(5)
+%define VMX_RESTORE_HOST_GDTR                                   40h   ;RT_BIT(6)
+%define VMX_RESTORE_HOST_IDTR                                   80h   ;RT_BIT(7)
 
 struc VMXRESTOREHOST
@@ -165 +166 @@
     .uHostSelFS         resw    1
     .uHostSelGS         resw    1
+    .uHostSelLDTR       resw    1
+    .uHostSelTR         resw    1
+    .u32Padding         resd    1
     .uHostFSBase        resq    1
     .uHostGSBase        resq    1