Changeset 15563 in vbox for trunk/src/VBox

Timestamp:

Dec 16, 2008 9:25:08 AM (16 years ago)

Author:

vboxsync

Message:

Save and restore the host's EFER msr in the 32->64 switcher.

Location:

trunk/src/VBox/VMM

Files:

• CPUMInternal.h (modified) (1 diff)
• CPUMInternal.mac (modified) (1 diff)
• VMMSwitcher/LegacyandAMD64.mac (modified) (2 diffs)

trunk/src/VBox/VMM/CPUMInternal.h

@@ -189 +189 @@
     CPUMSYSENTER    SysEnter;
 
+    /** MSRs
+     * @{ */
+    uint64_t        efer;
+    /** @} */
+
     /* padding to get 64byte aligned size */
-    uint8_t         auPadding[24+32];
+    uint8_t         auPadding[16+32];
 
 #elif HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)

trunk/src/VBox/VMM/CPUMInternal.mac

@@ -272 +272 @@
     .Host.SysEnter.eip   resq    1
     .Host.SysEnter.esp   resq    1
+    .Host.efer           resq    1
 
 %else ; 64-bit

trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac

@@ -145 +145 @@
     mov     [edx + CPUMCPU.Host.cr4], eax
 
+    ; save the host EFER msr
+    mov     ebx, edx
+    mov     ecx, MSR_K6_EFER
+    rdmsr
+    mov     [ebx + CPUMCPU.Host.efer], eax
+    mov     [ebx + CPUMCPU.Host.efer + 4], edx
+    mov     edx, ebx
+
     CPUM_FROM_CPUMCPU(edx)
     ; Load new gdt so we can do a far jump after going into 64 bits mode
@@ -440 +448 @@
     CPUMCPU_FROM_CPUM(edx)
 
-       
+    ; restore the host EFER
+    mov     ebx, edx
+    mov     ecx, MSR_K6_EFER
+    mov     eax, [ebx + CPUMCPU.Host.efer]
+    mov     edx, [ebx + CPUMCPU.Host.efer + 4]
+    wrmsr
+    mov     edx, ebx
+    
     ; activate host gdt and idt
     lgdt    [edx + CPUMCPU.Host.gdtr]