Changeset 1328 in vbox for trunk/src

Timestamp:

Mar 8, 2007 1:02:08 PM (18 years ago)

Author:

vboxsync

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

19296

Message:

Reorganized TRPM in preparation of handling IDT writes in the guest context.

Location:

trunk/src/VBox/VMM

Files:

• TRPM.cpp (modified) (6 diffs)
• TRPMInternal.h (modified) (3 diffs)
• TRPMInternal.mac (modified) (1 diff)
• VMMAll/TRPMAll.cpp (modified) (1 diff)
• VMMGC/TRPMGC.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/TRPM.cpp

@@ -96 +96 @@
     TRPM_HANDLER_MAX
 } TRPMHANDLER, *PTRPMHANDLER;
-
-/** First interrupt handler. Used for validating input. */
-#define TRPM_HANDLER_INT_BASE  0x20
 
 
@@ -423 +420 @@
 static DECLCALLBACK(int) trpmR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t u32Version);
 static DECLCALLBACK(int) trpmGuestIDTWriteHandler(PVM pVM, RTGCPTR GCPtr, void *pvPtr, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser);
-static int               trpmR3ClearGuestTrapHandler(PVM pVM, unsigned iTrap);
 
 
@@ -471 +467 @@
      * Statistics.
      */
-    STAM_REG(pVM, &pVM->trpm.s.StatGCWriteGuestIDT,     STAMTYPE_COUNTER, "/TRPM/GC/Write/Guest/IDT",   STAMUNIT_OCCURENCES,     "The number of writes to the Guest IDT.");
+    STAM_REG(pVM, &pVM->trpm.s.StatGCWriteGuestIDTFault,   STAMTYPE_COUNTER, "/TRPM/GC/Write/IDT/Fault",   STAMUNIT_OCCURENCES,     "The number of writes to the Guest IDT.");
+    STAM_REG(pVM, &pVM->trpm.s.StatGCWriteGuestIDTHandled, STAMTYPE_COUNTER, "/TRPM/GC/Write/IDT/Handled", STAMUNIT_OCCURENCES,     "The number of writes to the Guest IDT.");
 
     STAM_REG(pVM, &pVM->trpm.s.StatSyncIDT,             STAMTYPE_PROFILE, "/PROF/TRPM/SyncIDT",         STAMUNIT_TICKS_PER_CALL, "Profiling of TRPMR3SyncIDT().");
@@ -872 +869 @@
         /** @todo inefficient, but simple */
         for (unsigned iGate=0;iGate<256;iGate++)
-            trpmR3ClearGuestTrapHandler(pVM, iGate);
+            trpmClearGuestTrapHandler(pVM, iGate);
 
         /* Scan them all (only the first time) */
@@ -1105 +1102 @@
 
 /**
- * Clear guest trap/interrupt gate handler
- *
- * @returns VBox status code.
- * @param   pVM         The VM to operate on.
- * @param   iTrap       Interrupt/trap number.
- */
-static int trpmR3ClearGuestTrapHandler(PVM pVM, unsigned iTrap)
-{
-    /*
-     * Validate.
-     */
-    if (iTrap >= ELEMENTS(pVM->trpm.s.aIdt))
-    {
-        AssertMsg(iTrap < TRPM_HANDLER_INT_BASE, ("Illegal gate number %d!\n", iTrap));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    if (ASMBitTest(&pVM->trpm.s.au32IdtPatched[0], iTrap))
-        trpmR3ClearPassThroughHandler(pVM, iTrap);
-
-    pVM->trpm.s.aGuestTrapHandler[iTrap] = TRPM_INVALID_HANDLER;
-    return VINF_SUCCESS;
-}
-
-/**
  * Set guest trap/interrupt gate handler
  * Used for setting up trap gates used for kernel calls.
@@ -1160 +1132 @@
         /* clear trap handler */
         Log(("TRPMR3SetGuestTrapHandler: clear handler %x\n", iTrap));
-        return trpmR3ClearGuestTrapHandler(pVM, iTrap);
+        return trpmClearGuestTrapHandler(pVM, iTrap);
     }
 

trunk/src/VBox/VMM/TRPMInternal.h

@@ -35 +35 @@
 /* Enable to allow trap forwarding in GC. */
 #define TRPM_FORWARD_TRAPS_IN_GC
+
+/** First interrupt handler. Used for validating input. */
+#define TRPM_HANDLER_INT_BASE  0x20
 
 __BEGIN_DECLS
@@ -146 +149 @@
 
     /** GC: The number of times writes to the Guest IDT were detected. */
-    STAMCOUNTER     StatGCWriteGuestIDT;
+    STAMCOUNTER     StatGCWriteGuestIDTFault;
+    STAMCOUNTER     StatGCWriteGuestIDTHandled;
+
     /** HC: Profiling of the TRPMR3SyncIDT() method. */
     STAMPROFILE     StatSyncIDT;
@@ -176 +181 @@
 TRPMGCDECL(int) trpmgcShadowIDTWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, void *pvRange, uintptr_t offRange);
 
+/**
+ * Clear guest trap/interrupt gate handler
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   iTrap       Interrupt/trap number.
+ */
+TRPMDECL(int) trpmClearGuestTrapHandler(PVM pVM, unsigned iTrap);
+
 
 #ifdef IN_RING3
+
+/**
+ * Clear passthrough interrupt gate handler (reset to default handler)
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   iTrap       Trap/interrupt gate number.
+ */
+TRPMR3DECL(int) trpmR3ClearPassThroughHandler(PVM pVM, unsigned iTrap);
 
 #endif

trunk/src/VBox/VMM/TRPMInternal.mac

@@ -55 +55 @@
     .aGuestTrapHandler  resd 256
 
-    .StatGCWriteGuestIDT  resb STAMCOUNTER_size
+    .StatGCWriteGuestIDTFault  resb STAMCOUNTER_size
+    .StatGCWriteGuestIDTHandled  resb STAMCOUNTER_size
     .StatSyncIDT        resb STAMPROFILE_size
     .aStatGCTraps       resb STAMPROFILEADV_size * 0x14

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

@@ -821 +821 @@
 }
 
+
+/**
+ * Clear guest trap/interrupt gate handler
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   iTrap       Interrupt/trap number.
+ */
+TRPMDECL(int) trpmClearGuestTrapHandler(PVM pVM, unsigned iTrap)
+{
+    /*
+     * Validate.
+     */
+    if (iTrap >= ELEMENTS(pVM->trpm.s.aIdt))
+    {
+        AssertMsg(iTrap < TRPM_HANDLER_INT_BASE, ("Illegal gate number %d!\n", iTrap));
+        return VERR_INVALID_PARAMETER;
+    }
+
+    if (ASMBitTest(&pVM->trpm.s.au32IdtPatched[0], iTrap))
+#ifdef IN_RING3
+        trpmR3ClearPassThroughHandler(pVM, iTrap);
+#else
+        AssertFailed();
+#endif
+
+    pVM->trpm.s.aGuestTrapHandler[iTrap] = TRPM_INVALID_HANDLER;
+    return VINF_SUCCESS;
+}
+
+

trunk/src/VBox/VMM/VMMGC/TRPMGC.cpp

@@ -33 +33 @@
 #include <VBox/err.h>
 #include <VBox/x86.h>
+#include <VBox/em.h>
 #include <iprt/assert.h>
 #include <iprt/asm.h>
@@ -109 +110 @@
 #ifdef VBOX_STRICT
     RTGCPTR     GCPtrIDTEnd = (RTGCPTR)((RTGCUINTPTR)GCPtrIDT + cbIDT + 1);
+#endif
     uint32_t    iTrap       = ((RTGCUINTPTR)pvFault - (RTGCUINTPTR)GCPtrIDT)/sizeof(VBOXIDTE);
-#endif
 
     Assert(pvFault >= GCPtrIDT && pvFault < GCPtrIDTEnd);
     Log(("trpmgcGuestIDTWriteHandler: write to gate %x\n", iTrap));
 
-    ////LogCom(("trpmgcGuestIDTWriteHandler: eip=%08X pvFault=%08X pvRange=%08X\r\n", pRegFrame->eip, pvFault, pvRange));
+#if 0
+    /* Check if we can handle the write here. */    
+    if (     iTrap != 3                                         /* Gate 3 is handled differently; could do it here as well, but let ring 3 handle this case for now. */
+        &&  !ASMBitTest(&pVM->trpm.s.au32IdtPatched[0], iTrap)) /* Passthru gates need special attention too. */
+    {
+        uint32_t cb;
+        int rc = EMInterpretInstruction(pVM, pRegFrame, pvFault, &cb);
+        if (VBOX_SUCCESS(rc) && cb)
+        {
+            trpmClearGuestTrapHandler(pVM, iTrap);
+            STAM_COUNTER_INC(&pVM->trpm.s.StatGCWriteGuestIDTHandled);
+            return VINF_SUCCESS;
+        }
+    }
+#endif
+
+    /** @todo Check which IDT entry and keep the update cost low in TRPMR3SyncIDT() and CSAMCheckGates(). */
     VM_FF_SET(pVM, VM_FF_TRPM_SYNC_IDT);
-    /** @todo Check which IDT entry and keep the update cost low in TRPMR3SyncIDT() and CSAMCheckGates(). */
 
-    STAM_COUNTER_INC(&pVM->trpm.s.StatGCWriteGuestIDT);
+    STAM_COUNTER_INC(&pVM->trpm.s.StatGCWriteGuestIDTFault);
     return VINF_EM_RAW_EMULATE_INSTR_IDT_FAULT;
 }