Changeset 70697 in vbox

Timestamp:

Jan 23, 2018 4:47:29 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120434

Message:

bootsectors/bs3-cpu-instr-2: Fix restoring FS/GS base after testing.

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-2-template.c (modified) (8 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-2-template.c

@@ -877 +877 @@
         if (fSupportsFsGsBase)
         {
-            uint64_t uBaseAddr;
+            uint64_t const uBaseAddr = ASMRdMsr(idxFsGsBaseMsr);
 
             /* CR4.FSGSBASE disabled -> #UD. */
@@ -884 +884 @@
 
             /* Read and verify existing base address. */
-            uBaseAddr  = ASMRdMsr(idxFsGsBaseMsr);
             Ctx.rbx.u  = 0;
             Ctx.cr4.u |= X86_CR4_FSGSBASE;
@@ -905 +904 @@
             }
 
+            /* Restore original base address. */
+            ASMWrMsr(idxFsGsBaseMsr, uBaseAddr);
+
             /* Clean used GPRs. */
             Ctx.rbx.u = 0;
@@ -920 +922 @@
 
 static void bs3CpuInstr2_wrfsbase_wrgsbase_Common(uint8_t bMode, BS3CI2FSGSBASE const *paFsGsBaseWorkers,
-                                                  unsigned cFsGsBaseWorkers)
+                                                  unsigned cFsGsBaseWorkers, uint32_t idxFsGsBaseMsr)
 {
     BS3REGCTX         Ctx;
@@ -949 +951 @@
         if (fSupportsFsGsBase)
         {
+            uint64_t const uBaseAddr = ASMRdMsr(idxFsGsBaseMsr);
+
             /* CR4.FSGSBASE disabled -> #UD. */
             Ctx.cr4.u &= ~X86_CR4_FSGSBASE;
@@ -973 +977 @@
             }
 
+            /* Restore original base address. */
+            ASMWrMsr(idxFsGsBaseMsr, uBaseAddr);
+
             /* Clean used GPRs. */
             Ctx.rbx.u = 0;
@@ -989 +996 @@
 BS3_DECL_FAR(uint8_t) BS3_CMN_NM(bs3CpuInstr2_wrfsbase)(uint8_t bMode)
 {
-    bs3CpuInstr2_wrfsbase_wrgsbase_Common(bMode, s_aWrFsBaseWorkers, RT_ELEMENTS(s_aWrFsBaseWorkers));
+    bs3CpuInstr2_wrfsbase_wrgsbase_Common(bMode, s_aWrFsBaseWorkers, RT_ELEMENTS(s_aWrFsBaseWorkers), MSR_K8_FS_BASE);
     return 0;
 }
@@ -996 +1003 @@
 BS3_DECL_FAR(uint8_t) BS3_CMN_NM(bs3CpuInstr2_wrgsbase)(uint8_t bMode)
 {
-    bs3CpuInstr2_wrfsbase_wrgsbase_Common(bMode, s_aWrGsBaseWorkers, RT_ELEMENTS(s_aWrGsBaseWorkers));
+    bs3CpuInstr2_wrfsbase_wrgsbase_Common(bMode, s_aWrGsBaseWorkers, RT_ELEMENTS(s_aWrGsBaseWorkers), MSR_K8_FS_BASE);
     return 0;
 }