Changeset 49914 in vbox for trunk/src

Timestamp:

Dec 15, 2013 8:03:06 PM (11 years ago)

Author:

vboxsync

Message:

SELM: Fixed stale selector handling issue (raw-mode only). Returning VINF_EM_RESCHEDULE_REM isn't OK for PATM should the GDT write monitoring trigger in patch code. Using VINF_EM_RAW_EMULATE_INSTR_GDT_FAULT instead gives the PATM related code in TRPM and EM a chance to clean up before trying IEM and REM. (Seen booting Ubuntu 8.04 live CD.)

Location:

trunk/src/VBox/VMM

Files:

• VMMRC/SELMRC.cpp (modified) (2 diffs)
• include/SELMInline.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMRC/SELMRC.cpp

@@ -149 +149 @@
                     paSReg[iSReg].fFlags |= CPUMSELREG_FLAGS_STALE;
                     VMCPU_FF_SET(pVCpu, VMCPU_FF_TO_R3); /* paranoia */
-                    rcStrict = VINF_EM_RESCHEDULE_REM;
+                    /* rcStrict = VINF_EM_RESCHEDULE_REM; - bad idea if we're in a patch. */
+                    rcStrict = VINF_EM_RAW_EMULATE_INSTR_GDT_FAULT;
                 }
                 else if (paSReg[iSReg].fFlags & CPUMSELREG_FLAGS_STALE)
@@ -288 +289 @@
                 if (rc2 == VINF_SUCCESS || rc2 == VINF_EM_RESCHEDULE_REM)
                 {
+                    /* VINF_EM_RESCHEDULE_REM - bad idea if we're in a patch. */
+                    if (rc2 == VINF_EM_RESCHEDULE_REM)
+                        rc = VINF_EM_RAW_EMULATE_INSTR_GDT_FAULT;
                     STAM_COUNTER_INC(&pVM->selm.s.StatRCWriteGuestGDTHandled);
                     return rc;

trunk/src/VBox/VMM/include/SELMInline.h

@@ -253 +253 @@
     if (pSReg->u64Base != X86DESC_BASE(pShwDesc))
     {
-        Log(("selmIsSRegStale32: base changed (%#llx -> %#llx)\n", pSReg->u64Base, X86DESC_BASE(pShwDesc)));
+        Log(("selmIsSRegStale32: base changed (%#llx -> %#x)\n", pSReg->u64Base, X86DESC_BASE(pShwDesc)));
         return true;
     }