Changeset 68

Timestamp:

01/16/07 16:16:24 (2 years ago)

Author:

vboxsync

Message:

Sync the TSS ring 0 stack selector and base address on-demand.

Files:

• trunk/src/VBox/VMM/SELM.cpp (modified) (7 diffs)
• trunk/src/VBox/VMM/SELMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMAll/SELMAll.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/SELM.cpp

@@ -66 +66 @@
-
-/** SELM saved state version. */
-4
+5
-
-/*******************************************************************************
@@ -139 +139 @@
-
-    pVM->selm.s.fDisableMonitoring = false;
+    pVM->selm.s.fSyncTSSRing0Stack = false;
-
-    /*
@@ -506 +507 @@
-    pVM->selm.s.cbMonitoredGuestTss = 0;
-
+    pVM->selm.s.fSyncTSSRing0Stack = false;
+
-    /*
-     * Default action when entering raw mode for the first time
@@ -604 +607 @@
-    PSELM pSelm = &pVM->selm.s;
-
-
+
+
-    SSMR3PutSel(pSSM, pSelm->SelCS);
-    SSMR3PutSel(pSSM, pSelm->SelDS);
@@ -641 +645 @@
-
-    /* Get the monitoring flag. */
-
+
+
+
+
-
-    /*
@@ -1447 +1454 @@
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-            VM_FF_CLEAR(pVM, VM_FF_SELM_SYNC_TSS);
-        }
@@ -1670 +1655 @@
-    }
-
-
-
-
-
-
-
-
+
+
+
+
+
-        if (VBOX_SUCCESS(rc))
-        {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        else
-
-
-
-
-
+
+
+
-    return false;
-#else

trunk/src/VBox/VMM/SELMInternal.h

@@ -124 +124 @@
-
-    /** Indicates that the Guest GDT access handler have been registered. */
-RTUINT                  fGDTRangeRegistered; /** @todo r=bird: use bool when we mean bool. Just keep in mind that it's a 1 byte byte. */
+bool                    fGDTRangeRegistered;
-
-    /** Indicates whether LDT/GDT/TSS monitoring and syncing is disabled. */
-
+
+
+
+
-
-    /** SELMR3UpdateFromCPUM() profiling. */

trunk/src/VBox/VMM/VMMAll/SELMAll.cpp

@@ -35 +35 @@
-#include <iprt/assert.h>
-#include <VBox/log.h>
+#include <VBox/pgm.h>
-
-
@@ -499 +500 @@
-SELMDECL(void) SELMGetRing1Stack(PVM pVM, uint32_t *pSS, uint32_t *pEsp)
-{
+
+    if (pVM->selm.s.fSyncTSSRing0Stack)
+    {
+        GCPTRTYPE(uint8_t *)GCPtrTss = (GCPTRTYPE(uint8_t *))pVM->selm.s.GCPtrGuestTss;
+        int     rc;
+        VBOXTSS tss;
+
+        Assert(pVM->selm.s.GCPtrGuestTss && pVM->selm.s.cbMonitoredGuestTss);
+
+#ifdef IN_GC
+        rc  = MMGCRamRead(pVM, &tss.ss0,  GCPtrTss + RT_OFFSETOF(VBOXTSS, ss0), sizeof(tss.ss0));
+        rc |= MMGCRamRead(pVM, &tss.esp0, GCPtrTss + RT_OFFSETOF(VBOXTSS, esp0), sizeof(tss.esp0));
+  #ifdef DEBUG
+        rc |= MMGCRamRead(pVM, &tss.offIoBitmap, GCPtrTss + RT_OFFSETOF(VBOXTSS, offIoBitmap), sizeof(tss.offIoBitmap));
+  #endif
+#else /* IN_GC */
+        /* Reading too much. Could be cheaper than two seperate calls though. */
+        rc = PGMPhysReadGCPtr(pVM, &tss, GCPtrTss, sizeof(VBOXTSS));
+#endif /* IN_GC */
+        if (VBOX_FAILURE(rc))
+        {
+            AssertReleaseMsgFailed(("Unable to read TSS structure at %08X\n", GCPtrTss));
+            return;
+        }
+#ifdef DEBUG
+        uint32_t ssr0  = pVM->selm.s.Tss.ss1;
+        uint32_t espr0 = pVM->selm.s.Tss.esp1;
+        ssr0 &= ~1;
+
+        if (ssr0 != tss.ss0 || espr0 != tss.esp0)
+            Log(("SELMGetRing1Stack: Updating TSS ring 0 stack to %04X:%08X\n", tss.ss0, tss.esp0));
+
+        Log(("offIoBitmap=%#x\n", tss.offIoBitmap));
+#endif
+        /* Update our TSS structure for the guest's ring 1 stack */
+        SELMSetRing1Stack(pVM, tss.ss0 | 1, tss.esp0);
+        pVM->selm.s.fSyncTSSRing0Stack = false;
+    }
+
-    *pSS  = pVM->selm.s.Tss.ss1;
-    *pEsp = pVM->selm.s.Tss.esp1;