Changeset 9853 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jun 20, 2008 1:09:30 PM (17 years ago)

Author:

vboxsync

Message:

kernel gs base can be changed behind our back (swapgs), so always refresh it.

File:

• trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm

@@ -77 +77 @@
 
   ; Save a guest and load the corresponding host MSR (trashes rdx & rcx)
+  ; Only really useful for gs kernel base as that one can be changed behind our back (swapgs)
+  %macro LOADHOSTMSREX 2
+    mov     rcx, %1
+    rdmsr 
+    mov     qword [xSI + %2], rax
+    pop     rax
+    pop     rdx
+    wrmsr
+  %endmacro
+
+  ; Load the corresponding host MSR (trashes rdx & rcx)
   %macro LOADHOSTMSR 1
     mov     rcx, %1
@@ -566 +577 @@
     ; Restore the host LSTAR, CSTAR, SFMASK & KERNEL_GSBASE MSRs
     ; @todo use the automatic load feature for MSRs
-    LOADHOSTMSR MSR_K8_KERNEL_GS_BASE
+    LOADHOSTMSREX MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
     LOADHOSTMSR MSR_K8_SF_MASK
     LOADHOSTMSR MSR_K8_CSTAR
@@ -599 +610 @@
     ; Restore the host LSTAR, CSTAR, SFMASK & KERNEL_GSBASE MSRs
     ; @todo use the automatic load feature for MSRs
-    LOADHOSTMSR MSR_K8_KERNEL_GS_BASE
+    LOADHOSTMSREX MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
     LOADHOSTMSR MSR_K8_SF_MASK
     LOADHOSTMSR MSR_K8_CSTAR
@@ -626 +637 @@
     ; Restore the host LSTAR, CSTAR, SFMASK & KERNEL_GSBASE MSRs
     ; @todo use the automatic load feature for MSRs
-    LOADHOSTMSR MSR_K8_KERNEL_GS_BASE
+    LOADHOSTMSREX MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
     LOADHOSTMSR MSR_K8_SF_MASK
     LOADHOSTMSR MSR_K8_CSTAR