Changeset 5394 in vbox

Timestamp:

Oct 21, 2007 1:49:38 AM (17 years ago)

Author:

vboxsync

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

25505

Message:

/TRPM/SafeToDropGuestIDTMonitoring

Location:

trunk/src/VBox/VMM

Files:

• TRPM.cpp (modified) (8 diffs)
• TRPMInternal.h (modified) (1 diff)
• TRPMInternal.mac (modified) (2 diffs)

trunk/src/VBox/VMM/TRPM.cpp

@@ -394 +394 @@
 
 
-/**
- * Enable or disable tracking of Guest's IDT.
- * @{
- */
+/** Enable or disable tracking of Guest's IDT. */
 #define TRPM_TRACK_GUEST_IDT_CHANGES
-/** @} */
-
-/**
- * Enable or disable tracking of Shadow IDT.
- * @{
- */
+
+/** Enable or disable tracking of Shadow IDT. */
 #define TRPM_TRACK_SHADOW_IDT_CHANGES
-/** @} */
 
 /** TRPM saved state version. */
@@ -445 +437 @@
     pVM->trpm.s.GCPtrIdt           = ~0;
     pVM->trpm.s.fDisableMonitoring = false;
+    pVM->trpm.s.fSafeToDropGuestIDTMonitoring = false;
+
+    /*
+     * Read the configuration (if any).
+     */
+    PCFGMNODE pTRPMNode = CFGMR3GetChild(CFGMR3GetRoot(pVM), "TRPM");
+    if (pTRPMNode)
+    {
+        bool f;
+        int rc = CFGMR3QueryBool(pTRPMNode, "SafeToDropGuestIDTMonitoring", &f);
+        if (RT_SUCCESS(rc))
+            pVM->trpm.s.fSafeToDropGuestIDTMonitoring = f;
+    }
+
+    /* write config summary to log */
+    if (pVM->trpm.s.fSafeToDropGuestIDTMonitoring)
+        LogRel(("TRPM: Dropping Guest IDT Monitoring.\n"));
 
     /*
@@ -557 +566 @@
      * Iterate the idt and set the addresses.
      */
-    PVBOXIDTE   pIdte         = &pVM->trpm.s.aIdt[0];
-    PVBOXIDTE_GENERIC   pIdteTemplate = &g_aIdt[0];
+    PVBOXIDTE pIdte = &pVM->trpm.s.aIdt[0];
+    PVBOXIDTE_GENERIC pIdteTemplate = &g_aIdt[0];
     for (unsigned i = 0; i < ELEMENTS(pVM->trpm.s.aIdt); i++, pIdte++, pIdteTemplate++)
     {
@@ -673 +682 @@
     if (pVM->trpm.s.GuestIdtr.pIdt != ~0U)
     {
-        int rc = PGMHandlerVirtualDeregister(pVM, pVM->trpm.s.GuestIdtr.pIdt);
-        AssertRC(rc);
+        if (!pVM->trpm.s.fSafeToDropGuestIDTMonitoring)
+        {
+            int rc = PGMHandlerVirtualDeregister(pVM, pVM->trpm.s.GuestIdtr.pIdt);
+            AssertRC(rc);
+        }
         pVM->trpm.s.GuestIdtr.pIdt = ~0U;
     }
@@ -719 +731 @@
     SSMR3PutGCUIntPtr(pSSM, pTrpm->uSavedCR2);
     SSMR3PutGCUInt(pSSM,    pTrpm->uPrevVector);
+#if 0  /** @todo Enable this (+ load change) on the next version change. */
+    SSMR3PutBool(pSSM,      pTrpm->fDisableMonitoring);
+#else
     SSMR3PutGCUInt(pSSM,    pTrpm->fDisableMonitoring);
+#endif
     SSMR3PutUInt(pSSM,      VM_FF_ISSET(pVM, VM_FF_TRPM_SYNC_IDT));
     SSMR3PutMem(pSSM,       &pTrpm->au32IdtPatched[0], sizeof(pTrpm->au32IdtPatched));
@@ -780 +796 @@
     SSMR3GetGCUIntPtr(pSSM, &pTrpm->uSavedCR2);
     SSMR3GetGCUInt(pSSM,    &pTrpm->uPrevVector);
-    SSMR3GetGCUInt(pSSM,    &pTrpm->fDisableMonitoring);
+#if 0 /** @todo Enable this + the corresponding save code on the next version change. */
+    SSMR3GetBool(pSSM,      &pTrpm->fDisableMonitoring);
+#else
+    RTGCUINT fDisableMonitoring;
+    SSMR3GetGCUInt(pSSM,    &fDisableMonitoring);
+    pTrpm->fDisableMonitoring = !!fDisableMonitoring;
+#endif
 
     RTUINT fSyncIDT;
@@ -892 +914 @@
     {
         Log(("TRPMR3UpdateFromCPUM: Guest's IDT is changed to pIdt=%08X cbIdt=%08X\n", IDTR.pIdt, IDTR.cbIdt));
-
-        /*
-         * [Re]Register write virtual handler for guest's IDT.
-         */
-        if (pVM->trpm.s.GuestIdtr.pIdt != ~0U)
-        {
-            rc = PGMHandlerVirtualDeregister(pVM, pVM->trpm.s.GuestIdtr.pIdt);
-            AssertRCReturn(rc, rc);
-        }
-        /* limit is including */
-        rc = PGMR3HandlerVirtualRegister(pVM, PGMVIRTHANDLERTYPE_WRITE, IDTR.pIdt, IDTR.pIdt + IDTR.cbIdt /* already inclusive */,
-                                         0, trpmGuestIDTWriteHandler, "trpmgcGuestIDTWriteHandler", 0, "Guest IDT write access handler");
-
-        if (rc == VERR_PGM_HANDLER_VIRTUAL_CONFLICT)
-        {
-            /* Could be a conflict with CSAM */
-            CSAMR3RemovePage(pVM, IDTR.pIdt);
-            if (PAGE_ADDRESS(IDTR.pIdt) != PAGE_ADDRESS(IDTR.pIdt + IDTR.cbIdt))
-                CSAMR3RemovePage(pVM, IDTR.pIdt + IDTR.cbIdt);
-
+        if (!pVM->trpm.s.fSafeToDropGuestIDTMonitoring)
+        {
+            /*
+             * [Re]Register write virtual handler for guest's IDT.
+             */
+            if (pVM->trpm.s.GuestIdtr.pIdt != ~0U)
+            {
+                rc = PGMHandlerVirtualDeregister(pVM, pVM->trpm.s.GuestIdtr.pIdt);
+                AssertRCReturn(rc, rc);
+            }
+            /* limit is including */
             rc = PGMR3HandlerVirtualRegister(pVM, PGMVIRTHANDLERTYPE_WRITE, IDTR.pIdt, IDTR.pIdt + IDTR.cbIdt /* already inclusive */,
                                              0, trpmGuestIDTWriteHandler, "trpmgcGuestIDTWriteHandler", 0, "Guest IDT write access handler");
-        }
-
-        AssertRCReturn(rc, rc);
+
+            if (rc == VERR_PGM_HANDLER_VIRTUAL_CONFLICT)
+            {
+                /* Could be a conflict with CSAM */
+                CSAMR3RemovePage(pVM, IDTR.pIdt);
+                if (PAGE_ADDRESS(IDTR.pIdt) != PAGE_ADDRESS(IDTR.pIdt + IDTR.cbIdt))
+                    CSAMR3RemovePage(pVM, IDTR.pIdt + IDTR.cbIdt);
+
+                rc = PGMR3HandlerVirtualRegister(pVM, PGMVIRTHANDLERTYPE_WRITE, IDTR.pIdt, IDTR.pIdt + IDTR.cbIdt /* already inclusive */,
+                                                 0, trpmGuestIDTWriteHandler, "trpmgcGuestIDTWriteHandler", 0, "Guest IDT write access handler");
+            }
+
+            AssertRCReturn(rc, rc);
+        }
 
         /* Update saved Guest IDTR. */
@@ -962 +986 @@
     if (pVM->trpm.s.GuestIdtr.pIdt != ~0U)
     {
-        int rc = PGMHandlerVirtualDeregister(pVM, pVM->trpm.s.GuestIdtr.pIdt);
-        AssertRC(rc);
+        if (!pVM->trpm.s.fSafeToDropGuestIDTMonitoring)
+        {
+            int rc = PGMHandlerVirtualDeregister(pVM, pVM->trpm.s.GuestIdtr.pIdt);
+            AssertRC(rc);
+        }
         pVM->trpm.s.GuestIdtr.pIdt = ~0U;
     }

trunk/src/VBox/VMM/TRPMInternal.h

@@ -117 +117 @@
     RTGCUINT        uPrevVector;
 
-    /** IDT monitoring and sync flag */
-    RTUINT          fDisableMonitoring; /** @todo r=bird: bool and 7 byte achPadding1. */
+    /** IDT monitoring and sync flag (HWACC). */
+    bool            fDisableMonitoring; /** @todo r=bird: bool and 7 byte achPadding1. */
+
+    /** Whether monitoring of the guest IDT is enabled or not.
+     *
+     * This configuration option is provided for speeding up guest like Solaris
+     * that put the IDT on the same page as a whole lot of other data that is
+     * freqently updated. The updates will cause #PFs and have to be interpreted
+     * by PGMInterpretInstruction which is slow compared to raw execution.
+     *
+     * If the guest is well behaved and doesn't change the IDT after loading it,
+     * there is no problem with dropping the IDT monitoring.
+     *
+     * @cfgm    /TRPM/SafeToDropGuestIDTMonitoring   boolean     defaults to false.
+     */
+    bool            fSafeToDropGuestIDTMonitoring;
 
     /** Padding to get the IDTs at a 16 byte alignement. */
-    char            achPadding1[4];
+    uint8_t         abPadding1[6];
 
     /** IDTs. Aligned at 16 byte offset for speed. */

trunk/src/VBox/VMM/TRPMInternal.mac

@@ -6 +6 @@
 ;
 ;  Copyright (C) 2006-2007 innotek GmbH
-; 
+;
 ;  This file is part of VirtualBox Open Source Edition (OSE), as
 ;  available from http://www.virtualbox.org. This file is free software;
@@ -38 +38 @@
     .uSavedCR2          resd 1
     .uPrevVector        resd 1
-    .fDisableMonitoring resd 1
-    .achPadding1        resb 4
+    .fDisableMonitoring resb 1
+    .fSafeToDropGuestIDTMonitoring resb 1
+    .abPadding1         resb 6
     .aIdt               resd 512
     .au32IdtPatched     resd 8