Changeset 32512 in vbox

Timestamp:

Sep 15, 2010 11:44:46 AM (14 years ago)

Author:

vboxsync

Message:

Enabled minimal guest state loading (VT-x; again). Watch for regressions.

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (3 diffs)
• VMMR0/HWVMXR0.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -82 +82 @@
 #define HWACCM_CHANGED_GUEST_LDTR               RT_BIT(6)
 #define HWACCM_CHANGED_GUEST_TR                 RT_BIT(7)
-#define HWACCM_CHANGED_GUEST_SYSENTER_MSR       RT_BIT(8)
+#define HWACCM_CHANGED_GUEST_MSR                RT_BIT(8)
 #define HWACCM_CHANGED_GUEST_SEGMENT_REGS       RT_BIT(9)
 #define HWACCM_CHANGED_GUEST_DEBUG              RT_BIT(10)
@@ -95 +95 @@
                                             |   HWACCM_CHANGED_GUEST_LDTR         \
                                             |   HWACCM_CHANGED_GUEST_TR           \
-                                            |   HWACCM_CHANGED_GUEST_SYSENTER_MSR \
+                                            |   HWACCM_CHANGED_GUEST_MSR          \
                                             |   HWACCM_CHANGED_GUEST_FPU          \
                                             |   HWACCM_CHANGED_GUEST_DEBUG        \
@@ -108 +108 @@
                                             |   HWACCM_CHANGED_GUEST_LDTR         \
                                             |   HWACCM_CHANGED_GUEST_TR           \
-                                            |   HWACCM_CHANGED_GUEST_SYSENTER_MSR \
+                                            |   HWACCM_CHANGED_GUEST_MSR          \
                                             |   HWACCM_CHANGED_GUEST_DEBUG        \
                                             |   HWACCM_CHANGED_GUEST_FPU)

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

@@ -1560 +1560 @@
 
     /*
-     * Sysenter MSRs (unconditional)
+     * Sysenter MSRs
      */
-    rc  = VMXWriteVMCS(VMX_VMCS32_GUEST_SYSENTER_CS,    pCtx->SysEnter.cs);
-    rc |= VMXWriteVMCS64(VMX_VMCS64_GUEST_SYSENTER_EIP, pCtx->SysEnter.eip);
-    rc |= VMXWriteVMCS64(VMX_VMCS64_GUEST_SYSENTER_ESP, pCtx->SysEnter.esp);
-    AssertRC(rc);
+    if (pVCpu->hwaccm.s.fContextUseFlags & HWACCM_CHANGED_GUEST_MSR)
+    {
+        rc  = VMXWriteVMCS(VMX_VMCS32_GUEST_SYSENTER_CS,    pCtx->SysEnter.cs);
+        rc |= VMXWriteVMCS64(VMX_VMCS64_GUEST_SYSENTER_EIP, pCtx->SysEnter.eip);
+        rc |= VMXWriteVMCS64(VMX_VMCS64_GUEST_SYSENTER_ESP, pCtx->SysEnter.esp);
+        AssertRC(rc);
+    }
 
     /* Control registers */
@@ -1830 +1833 @@
         pVCpu->hwaccm.s.vmx.pfnStartVM  = VMXR0StartVM64;
 #endif
-        /* Unconditionally update these as wrmsr might have changed them. */
-        rc = VMXWriteVMCS64(VMX_VMCS64_GUEST_FS_BASE, pCtx->fsHid.u64Base);
-        AssertRC(rc);
-        rc = VMXWriteVMCS64(VMX_VMCS64_GUEST_GS_BASE, pCtx->gsHid.u64Base);
-        AssertRC(rc);
+        if (pVCpu->hwaccm.s.fContextUseFlags & HWACCM_CHANGED_GUEST_MSR)
+        {
+            /* Update these as wrmsr might have changed them. */
+            rc = VMXWriteVMCS64(VMX_VMCS64_GUEST_FS_BASE, pCtx->fsHid.u64Base);
+            AssertRC(rc);
+            rc = VMXWriteVMCS64(VMX_VMCS64_GUEST_GS_BASE, pCtx->gsHid.u64Base);
+            AssertRC(rc);
+        }
     }
     else
@@ -2614 +2620 @@
 
     /* Load the guest state */
-#if 0
     if (!pVCpu->hwaccm.s.fContextUseFlags)
     {
@@ -2621 +2626 @@
     }
     else
-#endif
     {
         rc = VMXR0LoadGuestState(pVM, pVCpu, pCtx);
@@ -3612 +3616 @@
             goto ResumeExecution;
         }
+        pVCpu->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_GUEST_MSR;
         /* no break */
     case VMX_EXIT_RDMSR:                /* 31 RDMSR. Guest software attempted to execute RDMSR. */