Changeset 45862 in vbox for trunk/src/VBox/VMM

Timestamp:

May 1, 2013 11:13:25 AM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMR0: Unbreak old VT-x code with manual load/store of kernel GS base MSR.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMR0Mixed.mac (modified) (4 diffs)
• VMMR0/HWVMXR0.cpp (modified) (3 diffs)
• VMMSwitcher/LegacyandAMD64.mac (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMR0Mixed.mac

@@ -421 +421 @@
     LOADGUESTMSR MSR_K8_SF_MASK, CPUMCTX.msrSFMASK
     LOADGUESTMSR MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
+%else
+%ifdef VBOX_WITH_OLD_VTX_CODE
+    ; The KERNEL_GS_BASE MSR does not work reliably with auto load/store. See @bugref{6208}
+    LOADGUESTMSR MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
+%endif
 %endif
 
@@ -561 +566 @@
     LOADHOSTMSREX MSR_K6_STAR, CPUMCTX.msrSTAR
     LOADHOSTMSREX MSR_K8_LSTAR, CPUMCTX.msrLSTAR
+%else
+%ifdef VBOX_WITH_OLD_VTX_CODE
+    ; The KERNEL_GS_BASE MSR does not work reliably with auto load/store. See @bugref{6208}
+    LOADHOSTMSREX MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
+%endif
 %endif
 
@@ -632 +642 @@
     LOADHOSTMSR MSR_K6_STAR
     LOADHOSTMSR MSR_K8_LSTAR
+%else
+%ifdef VBOX_WITH_OLD_VTX_CODE
+    ; The KERNEL_GS_BASE MSR does not work reliably with auto load/store. See @bugref{6208}
+    LOADHOSTMSR MSR_K8_KERNEL_GS_BASE
+%endif
 %endif
 
@@ -677 +692 @@
     LOADHOSTMSR MSR_K6_STAR
     LOADHOSTMSR MSR_K8_LSTAR
+%else
+%ifdef VBOX_WITH_OLD_VTX_CODE
+    ; The KERNEL_GS_BASE MSR does not work reliably with auto load/store. See @bugref{6208}
+    LOADHOSTMSR MSR_K8_KERNEL_GS_BASE
+%endif
 %endif
 

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -1532 +1532 @@
             pMsr->u64Value    = ASMRdMsr(MSR_K8_SF_MASK);           /* syscall flag mask */
             pMsr++; idxMsr++;
-
-            /* The KERNEL_GS_BASE MSR was previously not working reliably with auto load/store. See @bugref{6208}  */
+#  if 0
+            /* The KERNEL_GS_BASE MSR does not work reliably with auto load/store. See @bugref{6208}  */
             pMsr->u32IndexMSR = MSR_K8_KERNEL_GS_BASE;
             pMsr->u32Reserved = 0;
             pMsr->u64Value    = ASMRdMsr(MSR_K8_KERNEL_GS_BASE);    /* swapgs exchange value */
             pMsr++; idxMsr++;
+#  endif
         }
 # endif
@@ -2386 +2387 @@
             pMsr->u64Value    = pCtx->msrSFMASK;          /* syscall flag mask */
             pMsr++; idxMsr++;
-
-            /* The KERNEL_GS_BASE MSR was previously not working reliably with auto load/store. See @bugref{6208}  */
+#if 0
+            /* The KERNEL_GS_BASE MSR does not work reliably with auto load/store. See @bugref{6208}  */
             pMsr->u32IndexMSR = MSR_K8_KERNEL_GS_BASE;
             pMsr->u32Reserved = 0;
             pMsr->u64Value    = pCtx->msrKERNELGSBASE;    /* swapgs exchange value */
             pMsr++; idxMsr++;
+#endif
         }
     }
@@ -2568 +2570 @@
                 pCtx->msrSFMASK = pMsr->u64Value;
                 break;
-            /* The KERNEL_GS_BASE MSR was previously not working reliably with auto load/store. See @bugref{6208}  */
+#if 0
+            /* The KERNEL_GS_BASE MSR does not work reliably with auto load/store. See @bugref{6208}  */
             case MSR_K8_KERNEL_GS_BASE:
                 pCtx->msrKERNELGSBASE = pMsr->u64Value;
                 break;
+#endif
             case MSR_K8_TSC_AUX:
                 CPUMSetGuestMsr(pVCpu, MSR_K8_TSC_AUX, pMsr->u64Value);

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

@@ -723 +723 @@
     LOADGUESTMSR MSR_K8_SF_MASK,        CPUMCTX.msrSFMASK
     LOADGUESTMSR MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
+%else
+%ifdef VBOX_WITH_OLD_VTX_CODE
+    ; The KERNEL_GS_BASE MSR does not work reliably with auto load/store. See @bugref{6208}
+    LOADGUESTMSR MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
+%endif
 %endif
 
@@ -804 +809 @@
     SAVEGUESTMSR MSR_K6_STAR,           CPUMCTX.msrSTAR
     SAVEGUESTMSR MSR_K8_LSTAR,          CPUMCTX.msrLSTAR
+%else
+%ifdef VBOX_WITH_OLD_VTX_CODE
+    ; The KERNEL_GS_BASE MSR does not work reliably with auto load/store. See @bugref{6208}
+    SAVEGUESTMSR MSR_K8_KERNEL_GS_BASE, CPUMCTX.msrKERNELGSBASE
+%endif
 %endif