Changeset 2224 in vbox for trunk

Timestamp:

Apr 19, 2007 1:18:14 PM (18 years ago)

Author:

vboxsync

Message:

In some situations the guest state would not be synced.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (3 diffs)
• HWVMXR0.cpp (modified) (4 diffs)

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

@@ -509 +509 @@
     SVM_VMCB   *pVMCB;
     bool        fForceTLBFlush = false;
+    bool        fGuestStateSynced = false;
 
     STAM_PROFILE_ADV_START(&pVM->hwaccm.s.StatEntry, x);
@@ -581 +582 @@
         goto end;
     }
+    fGuestStateSynced = true;
 
     /* All done! Let's start VM execution. */
@@ -1347 +1349 @@
     }
 
-    /* Remaining guest CPU context: TR, IDTR, GDTR, LDTR. */
-    SVM_READ_SELREG(LDTR, ldtr);
-    SVM_READ_SELREG(TR, tr);
-
-    pCtx->gdtr.cbGdt        = pVMCB->guest.GDTR.u32Limit;
-    pCtx->gdtr.pGdt         = pVMCB->guest.GDTR.u64Base;
-
-    pCtx->idtr.cbIdt        = pVMCB->guest.IDTR.u32Limit;
-    pCtx->idtr.pIdt         = pVMCB->guest.IDTR.u64Base;
-
-    /*
-     * System MSRs
-     */
-    pCtx->SysEnter.cs       = pVMCB->guest.u64SysEnterCS;
-    pCtx->SysEnter.eip      = pVMCB->guest.u64SysEnterEIP;
-    pCtx->SysEnter.esp      = pVMCB->guest.u64SysEnterESP;
+end:
+    if (fGuestStateSynced)
+    {
+        /* Remaining guest CPU context: TR, IDTR, GDTR, LDTR. */
+        SVM_READ_SELREG(LDTR, ldtr);
+        SVM_READ_SELREG(TR, tr);
+
+        pCtx->gdtr.cbGdt        = pVMCB->guest.GDTR.u32Limit;
+        pCtx->gdtr.pGdt         = pVMCB->guest.GDTR.u64Base;
+
+        pCtx->idtr.cbIdt        = pVMCB->guest.IDTR.u32Limit;
+        pCtx->idtr.pIdt         = pVMCB->guest.IDTR.u64Base;
+
+        /*
+         * System MSRs
+         */
+        pCtx->SysEnter.cs       = pVMCB->guest.u64SysEnterCS;
+        pCtx->SysEnter.eip      = pVMCB->guest.u64SysEnterEIP;
+        pCtx->SysEnter.esp      = pVMCB->guest.u64SysEnterESP;
+    }
 
     /* Signal changes for the recompiler. */
     CPUMSetChangedFlags(pVM, CPUM_CHANGED_SYSENTER_MSR | CPUM_CHANGED_LDTR | CPUM_CHANGED_GDTR | CPUM_CHANGED_IDTR | CPUM_CHANGED_TR | CPUM_CHANGED_HIDDEN_SEL_REGS);
-
-end:
 
     /* If we executed vmrun and an external irq was pending, then we don't have to do a full sync the next time. */

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

@@ -780 +780 @@
     RTGCUINTPTR intInfo = 0; /* shut up buggy gcc 4 */
     RTGCUINTPTR errCode, instrInfo, uInterruptState;
+    bool        fGuestStateSynced = false;
 
     Log2(("\nE"));
@@ -930 +931 @@
         goto end;
     }
+    fGuestStateSynced = true;
 
     /* Non-register state Guest Context */
@@ -1632 +1634 @@
     }
 
-    /* Remaining guest CPU context: TR, IDTR, GDTR, LDTR. */
-    VMX_READ_SELREG(LDTR, ldtr);
-    VMX_READ_SELREG(TR, tr);
-
-    VMXReadVMCS(VMX_VMCS_GUEST_GDTR_LIMIT,       &val);
-    pCtx->gdtr.cbGdt        = val;
-    VMXReadVMCS(VMX_VMCS_GUEST_GDTR_BASE,        &val);
-    pCtx->gdtr.pGdt         = val;
-
-    VMXReadVMCS(VMX_VMCS_GUEST_IDTR_LIMIT,       &val);
-    pCtx->idtr.cbIdt        = val;
-    VMXReadVMCS(VMX_VMCS_GUEST_IDTR_BASE,        &val);
-    pCtx->idtr.pIdt         = val;
-
-    /*
-     * System MSRs
-     */
-    VMXReadVMCS(VMX_VMCS_GUEST_SYSENTER_CS,      &val);
-    pCtx->SysEnter.cs       = val;
-    VMXReadVMCS(VMX_VMCS_GUEST_SYSENTER_EIP,     &val);
-    pCtx->SysEnter.eip      = val;
-    VMXReadVMCS(VMX_VMCS_GUEST_SYSENTER_ESP,     &val);
-    pCtx->SysEnter.esp      = val;
-
-    /* Signal changes for the recompiler. */
-    CPUMSetChangedFlags(pVM, CPUM_CHANGED_SYSENTER_MSR | CPUM_CHANGED_LDTR | CPUM_CHANGED_GDTR | CPUM_CHANGED_IDTR | CPUM_CHANGED_TR | CPUM_CHANGED_HIDDEN_SEL_REGS);
+    /** Note: the guest state isn't entirely synced back at this stage. */
 
     /* Investigate why there was a VM-exit. (part 2) */
@@ -1755 +1732 @@
     }
 end:
+    if (fGuestStateSynced)
+    {
+        /* Remaining guest CPU context: TR, IDTR, GDTR, LDTR. */
+        VMX_READ_SELREG(LDTR, ldtr);
+        VMX_READ_SELREG(TR, tr);
+
+        VMXReadVMCS(VMX_VMCS_GUEST_GDTR_LIMIT,       &val);
+        pCtx->gdtr.cbGdt        = val;
+        VMXReadVMCS(VMX_VMCS_GUEST_GDTR_BASE,        &val);
+        pCtx->gdtr.pGdt         = val;
+
+        VMXReadVMCS(VMX_VMCS_GUEST_IDTR_LIMIT,       &val);
+        pCtx->idtr.cbIdt        = val;
+        VMXReadVMCS(VMX_VMCS_GUEST_IDTR_BASE,        &val);
+        pCtx->idtr.pIdt         = val;
+
+        /*
+         * System MSRs
+         */
+        VMXReadVMCS(VMX_VMCS_GUEST_SYSENTER_CS,      &val);
+        pCtx->SysEnter.cs       = val;
+        VMXReadVMCS(VMX_VMCS_GUEST_SYSENTER_EIP,     &val);
+        pCtx->SysEnter.eip      = val;
+        VMXReadVMCS(VMX_VMCS_GUEST_SYSENTER_ESP,     &val);
+        pCtx->SysEnter.esp      = val;
+    }
+
+    /* Signal changes for the recompiler. */
+    CPUMSetChangedFlags(pVM, CPUM_CHANGED_SYSENTER_MSR | CPUM_CHANGED_LDTR | CPUM_CHANGED_GDTR | CPUM_CHANGED_IDTR | CPUM_CHANGED_TR | CPUM_CHANGED_HIDDEN_SEL_REGS);
 
     /* If we executed vmlaunch/vmresume and an external irq was pending, then we don't have to do a full sync the next time. */