Changeset 46135 in vbox for trunk/src/VBox/VMM

Timestamp:

May 16, 2013 11:32:47 PM (12 years ago)

Author:

vboxsync

Message:

Started populating the RC address space in the debugger.

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (2 diffs)
• VMMR3/DBGFAddrSpace.cpp (modified) (5 diffs)
• VMMR3/PATM.cpp (modified) (3 diffs)
• include/PATMInternal.h (modified) (3 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -178 +178 @@
         VMMR3/PATMA.asm \
         VMMR3/PATMSSM.cpp \
+        VMMR3/PATMR3Dbg.cpp \
        ,) \
         VMMAll/CPUMAllRegs.cpp \

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

@@ -70 +70 @@
 #define HMVMX_FLUSH_TAGGED_TLB_NONE              3
 
-/** Updated-guest-state flags. */
+/** @name Updated-guest-state flags.
+ * @{  */
 #define HMVMX_UPDATED_GUEST_RIP                   RT_BIT(0)
 #define HMVMX_UPDATED_GUEST_RSP                   RT_BIT(1)
@@ -111 +112 @@
                                                    | HMVMX_UPDATED_GUEST_ACTIVITY_STATE        \
                                                    | HMVMX_UPDATED_GUEST_APIC_STATE)
+/** @} */
 
 /**

trunk/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp

@@ -39 +39 @@
 #define LOG_GROUP LOG_GROUP_DBGF
 #include <VBox/vmm/dbgf.h>
+#include <VBox/vmm/hm.h>
 #include <VBox/vmm/pdmapi.h>
 #include <VBox/vmm/mm.h>
+#ifdef VBOX_WITH_RAW_MODE
+# include <VBox/vmm/patm.h>
+#endif
 #include "DBGFInternal.h"
 #include <VBox/vmm/uvm.h>
@@ -51 +55 @@
 #include <iprt/ctype.h>
 #include <iprt/env.h>
+#include <iprt/mem.h>
 #include <iprt/path.h>
 #include <iprt/param.h>
@@ -289 +294 @@
 void dbgfR3AsRelocate(PUVM pUVM, RTGCUINTPTR offDelta)
 {
-    /** @todo */
-    NOREF(pUVM); NOREF(offDelta);
+    /*
+     * We will relocate the raw-mode context modules by offDelta if they have
+     * been injected into the the DBGF_AS_RC map.
+     */
+    if (   pUVM->dbgf.s.afAsAliasPopuplated[DBGF_AS_ALIAS_2_INDEX(DBGF_AS_RC)]
+        && offDelta != 0)
+    {
+        RTDBGAS hAs = pUVM->dbgf.s.ahAsAliases[DBGF_AS_ALIAS_2_INDEX(DBGF_AS_RC)];
+
+        /* Take a snapshot of the modules as we might have overlapping
+           addresses between the previous and new mapping. */
+        RTDbgAsLockExcl(hAs);
+        uint32_t cModules = RTDbgAsModuleCount(hAs);
+        if (cModules > 0 && cModules < _4K)
+        {
+            struct DBGFASRELOCENTRY
+            {
+                RTDBGMOD    hDbgMod;
+                RTRCPTR     uOldAddr;
+            } *paEntries = (struct DBGFASRELOCENTRY *)RTMemTmpAllocZ(sizeof(paEntries[0]) * cModules);
+            if (paEntries)
+            {
+                /* Snapshot. */
+                for (uint32_t i = 0; i < cModules; i++)
+                {
+                    paEntries[i].hDbgMod = RTDbgAsModuleByIndex(hAs, i);
+                    AssertLogRelMsg(paEntries[i].hDbgMod != NIL_RTDBGMOD, ("iModule=%#x\n", i));
+
+                    RTDBGASMAPINFO  aMappings[1] = { { 0, 0 } };
+                    uint32_t        cMappings = 1;
+                    int rc = RTDbgAsModuleQueryMapByIndex(hAs, i, &aMappings[0], &cMappings, 0 /*fFlags*/);
+                    if (RT_SUCCESS(rc) && cMappings == 1 && aMappings[0].iSeg == NIL_RTDBGSEGIDX)
+                        paEntries[i].uOldAddr = (RTRCPTR)aMappings[0].Address;
+                    else
+                        AssertLogRelMsgFailed(("iModule=%#x rc=%Rrc cMappings=%#x.\n", i, rc, cMappings));
+                }
+
+                /* Unlink them. */
+                for (uint32_t i = 0; i < cModules; i++)
+                {
+                    int rc = RTDbgAsModuleUnlink(hAs, paEntries[i].hDbgMod);
+                    AssertLogRelMsg(RT_SUCCESS(rc), ("iModule=%#x rc=%Rrc hDbgMod=%p\n", i, rc, paEntries[i].hDbgMod));
+                }
+
+                /* Link them at the new locations. */
+                for (uint32_t i = 0; i < cModules; i++)
+                {
+                    RTRCPTR uNewAddr = paEntries[i].uOldAddr + offDelta;
+                    int rc = RTDbgAsModuleLink(hAs, paEntries[i].hDbgMod, uNewAddr,
+                                               RTDBGASLINK_FLAGS_REPLACE);
+                    AssertLogRelMsg(RT_SUCCESS(rc),
+                                    ("iModule=%#x rc=%Rrc hDbgMod=%p %RRv -> %RRv\n", i, rc, paEntries[i].hDbgMod,
+                                     paEntries[i].uOldAddr, uNewAddr));
+                    RTDbgModRelease(paEntries[i].hDbgMod);
+                }
+
+                RTMemTmpFree(paEntries);
+            }
+            else
+                AssertLogRelMsgFailed(("No memory for %#x modules.\n", cModules));
+        }
+        else
+            AssertLogRelMsgFailed(("cModules=%#x\n", cModules));
+        RTDbgAsUnlockExcl(hAs);
+    }
 }
 
@@ -499 +567 @@
 
 /**
+ * @callback_method_impl{FNPDMR3ENUM}
+ */
+static DECLCALLBACK(int) dbgfR3AsLazyPopulateRCCallback(PVM pVM, const char *pszFilename, const char *pszName,
+                                                        RTUINTPTR ImageBase, size_t cbImage, bool fRC, void *pvArg)
+{
+    NOREF(pVM); NOREF(cbImage);
+
+    /* Only raw-mode modules. */
+    if (fRC)
+    {
+        RTDBGMOD hDbgMod;
+        int rc = RTDbgModCreateFromImage(&hDbgMod, pszFilename, pszName, pVM->pUVM->dbgf.s.hDbgCfg);
+        if (RT_SUCCESS(rc))
+        {
+            rc = RTDbgAsModuleLink((RTDBGAS)pvArg, hDbgMod, ImageBase, 0 /*fFlags*/);
+            if (RT_FAILURE(rc))
+                LogRel(("DBGF: Failed to link module \"%s\" into DBGF_AS_RC at %RTptr: %Rrc\n",
+                        pszName, ImageBase, rc));
+        }
+        else
+            LogRel(("DBGF: RTDbgModCreateFromImage failed with rc=%Rrc for module \"%s\" (%s)\n",
+                    rc, pszName, pszFilename));
+    }
+    return VINF_SUCCESS;
+}
+
+
+/**
  * Lazily populates the specified address space.
  *
@@ -510 +606 @@
     if (!pUVM->dbgf.s.afAsAliasPopuplated[iAlias])
     {
-        RTDBGAS hAs = pUVM->dbgf.s.ahAsAliases[iAlias];
+        RTDBGAS hDbgAs = pUVM->dbgf.s.ahAsAliases[iAlias];
         if (hAlias == DBGF_AS_R0 && pUVM->pVM)
-            PDMR3LdrEnumModules(pUVM->pVM, dbgfR3AsLazyPopulateR0Callback, hAs);
-        /** @todo what do we do about DBGF_AS_RC?  */
+            PDMR3LdrEnumModules(pUVM->pVM, dbgfR3AsLazyPopulateR0Callback, hDbgAs);
+        else if (hAlias == DBGF_AS_RC && pUVM->pVM && !HMIsEnabled(pUVM->pVM))
+        {
+            LogRel(("DBGF: Lazy init of RC address space\n"));
+            PDMR3LdrEnumModules(pUVM->pVM, dbgfR3AsLazyPopulateRCCallback, hDbgAs);
+#ifdef VBOX_WITH_RAW_MODE
+            PATMR3DbgPopulateAddrSpace(pUVM->pVM, hDbgAs);
+#endif
+        }
 
         pUVM->dbgf.s.afAsAliasPopuplated[iAlias] = true;

trunk/src/VBox/VMM/VMMR3/PATM.cpp

@@ -427 +427 @@
 
     pVM->patm.s.pfnHelperCallGC = 0;
+    patmR3DbgReset(pVM);
 
     /* Generate all global functions to be used by future patches. */
@@ -447 +448 @@
     /* Round to next 8 byte boundary. */
     pVM->patm.s.offPatchMem = RT_ALIGN_32(pVM->patm.s.offPatchMem, 8);
+
+
     return rc;
 }
@@ -522 +525 @@
     if (HMIsEnabled(pVM))
         return VINF_SUCCESS;
+
+    patmR3DbgTerm(pVM);
 
     /* Memory was all allocated from the two MM heaps and requires no freeing. */

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

@@ -427 +427 @@
      * Used only during PATMR3Relocate(). */
     int32_t                     deltaReloc;
-    /* GC PATM state pointer - HC pointer. */
+    /** GC PATM state pointer - HC pointer. */
     R3PTRTYPE(PPATMGCSTATE)     pGCStateHC;
-    /* GC PATM state pointer - GC pointer. */
+    /** GC PATM state pointer - RC pointer. */
     RCPTRTYPE(PPATMGCSTATE)     pGCStateGC;
-    /** PATM stack page for call instruction execution. (2 parts: one for our private stack and one to store the original return address */
+    /** PATM stack page for call instruction execution.
+     * 2 parts: one for our private stack and one to store the original return
+     * address. */
     RCPTRTYPE(RTRCPTR *)        pGCStackGC;
     /** HC pointer of the PATM stack page. */
@@ -488 +490 @@
     } savedstate;
 
+    /** Debug module for the patch memory. */
+    RTDBGMOD                    hDbgModPatchMem;
+
     STAMCOUNTER                 StatNrOpcodeRead;
     STAMCOUNTER                 StatDisabled;
@@ -648 +653 @@
 #endif
 
-#endif
+
+void patmR3DbgInit(PVM pVM);
+void patmR3DbgTerm(PVM pVM);
+void patmR3DbgReset(PVM pVM);
+//void patmR3DbgNewPatch(PVM pVM, );
+
+#endif