Changeset 8800

Timestamp:

05/14/08 05:03:54 (8 months ago)

Author:

vboxsync

Message:

Started digging into the solaris guest kernel. Added DBGFR3MemRead.

Files:

• trunk/include/VBox/dbgf.h (modified) (2 diffs)
• trunk/src/VBox/Debugger/DBGCCommands.cpp (modified) (3 diffs)
• trunk/src/VBox/Debugger/DBGConsole.cpp (modified) (2 diffs)
• trunk/src/VBox/Debugger/DBGPlugInSolaris.cpp (added)
• trunk/src/VBox/Debugger/DBGPlugIns.h (added)
• trunk/src/VBox/Debugger/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Debugger/testcase/tstDBGCStubs.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/DBGFMem.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/DBGFOS.cpp (modified) (10 diffs)

trunk/include/VBox/dbgf.h

@@ -1530 +1530 @@
-
-
-/**
- * Scan guest memory for an exact byte string.
- *
- * @returns VBox status codes:
- * @retval  VINF_SUCCESS and *pGCPtrHit on success.
- * @retval  VERR_DBGF_MEM_NOT_FOUND if not found.
- * @retval  VERR_INVALID_POINTER if any of the pointer arguments are invalid.
- * @retval  VERR_INVALID_ARGUMENT if any other arguments are invalid.
- *
- * @param   pVM         The VM handle.
- * @param   pAddress    Where to store the mixed address.
- * @param   cbRange     The number of bytes to scan.
- * @param   pabNeedle   What to search for - exact search.
- * @param   cbNeedle    Size of the search byte string.
- * @param   pHitAddress Where to put the address of the first hit.
- *
- * @thread  Any thread.
- */
-DBGFR3DECL(int) DBGFR3MemScan(PVM pVM, PCDBGFADDRESS pAddress, RTGCUINTPTR cbRange, const uint8_t *pabNeedle, size_t cbNeedle, PDBGFADDRESS pHitAddress);
+DBGFR3DECL(int) DBGFR3MemRead(PVM pVM, PCDBGFADDRESS pAddress, void *pvBuf, size_t cbRead);
-
-
@@ -1690 +1673 @@
-#define DBGFOSREG_MAGIC     0x19830808
-
-
-
+C
+C
-DBGFR3DECL(int)     DBGFR3OSDetect(PVM pVM, char *pszName, size_t cchName);
-
+Query
-DBGFR3DECL(void *)  DBGFR3OSQueryInterface(PVM pVM, DBGFOSINTERFACE enmIf);
-

trunk/src/VBox/Debugger/DBGCCommands.cpp

@@ -67 +67 @@
-static DECLCALLBACK(int) dbgcCmdEcho(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult);
-static DECLCALLBACK(int) dbgcCmdRunScript(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult);
+static DECLCALLBACK(int) dbgcCmdDetect(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult);
-
-
@@ -167 +168 @@
-    { "exit",       0,        0,        NULL,               0,                          NULL,               0,          dbgcCmdQuit,        "",                     "Exits the debugger." },
-    { "format",     1,        1,        &g_aArgAny[0],      ELEMENTS(g_aArgAny),        NULL,               0,          dbgcCmdFormat,      "",                     "Evaluates an expression and formats it." },
+    { "detect",     0,        0,        NULL,               0,                          NULL,               0,          dbgcCmdDetect,      "",                     "Detects or re-detects the guest os and starts the OS specific digger." },
-    { "harakiri",   0,        0,        NULL,               0,                          NULL,               0,          dbgcCmdHarakiri,    "",                     "Kills debugger process." },
-    { "help",       0,        ~0,       &g_aArgHelp[0],     ELEMENTS(g_aArgHelp),       NULL,               0,          dbgcCmdHelp,        "[cmd/op [..]]",        "Display help. For help about info items try 'info help'." },
@@ -716 +718 @@
-
-    NOREF(pCmd); NOREF(pResult); NOREF(pVM);
+    return rc;
+}
+
+
+/**
+ * The 'detect' command.
+ *
+ * @returns VBox status.
+ * @param   pCmd        Pointer to the command descriptor (as registered).
+ * @param   pCmdHlp     Pointer to command helper functions.
+ * @param   pVM         Pointer to the current VM (if any).
+ * @param   paArgs      Pointer to (readonly) array of arguments.
+ * @param   cArgs       Number of arguments in the array.
+ */
+static DECLCALLBACK(int) dbgcCmdDetect(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs, PDBGCVAR pResult)
+{
+    /* check that the parser did what it's supposed to do. */
+    if (cArgs != 0)
+        return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "parser error\n");
+
+    /*
+     * Perform the detection.
+     */
+    char szName[64];
+    int rc = DBGFR3OSDetect(pVM, szName, sizeof(szName));
+    if (RT_FAILURE(rc))
+        return pCmdHlp->pfnVBoxError(pCmdHlp, rc, "Executing DBGFR3OSDetect().");
+    if (rc == VINF_SUCCESS)
+    {
+        rc = pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Guest OS: %s\n", szName);
+        char szVersion[64];
+        int rc2 = DBGFR3OSQueryNameAndVersion(pVM, NULL, 0, szVersion, sizeof(szVersion));
+        if (RT_SUCCESS(rc2))
+            rc = pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Version : %s\n", szVersion);
+    }
+    else
+        rc = pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Unable to figure out which guest OS it is, sorry.\n");
+    NOREF(pCmd); NOREF(pResult); NOREF(paArgs);
-    return rc;
-}

trunk/src/VBox/Debugger/DBGConsole.cpp

@@ -158 +158 @@
-
-#include "DBGCInternal.h"
+#include "DBGPlugIns.h"
-
-
@@ -2047 +2048 @@
-            rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL,
-                                         "Current VM is %08x\n" /** @todo get and print the VM name! */
-
-
+
-        }
-        else
-            rc = pDbgc->CmdHlp.pfnVBoxError(&pDbgc->CmdHlp, rc, "When trying to attach to VM %p\n", pDbgc->pVM);
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL,
-                                     "VBoxDbg> ");
-
-    /*
-
+debugger 
-     */
-    if (RT_SUCCESS(rc))

trunk/src/VBox/Debugger/Makefile.kmk

@@ -56 +56 @@
-        DBGCEmulateCodeView.cpp \
-        DBGCOps.cpp \
-
+
+
-
-

trunk/src/VBox/Debugger/testcase/tstDBGCStubs.cpp

@@ -282 +282 @@
-    return VERR_INTERNAL_ERROR;
-}
+DBGFR3DECL(int) DBGFR3MemRead(PVM pVM, PCDBGFADDRESS pAddress, void *pvBuf, size_t cbRead)
+{
+    return VERR_INTERNAL_ERROR;
+}
-DBGFR3DECL(void) DBGFR3AddrFromPhys(PVM pVM, PDBGFADDRESS pAddress, RTGCPHYS PhysAddr)
-{
-}
+DBGFR3DECL(int) DBGFR3OSRegister(PVM pVM, PCDBGFOSREG pReg)
+{
+    return VERR_INTERNAL_ERROR;
+}
+DBGFR3DECL(int) DBGFR3OSDetect(PVM pVM, char *pszName, size_t cchName)
+{
+    return VERR_INTERNAL_ERROR;
+}
+DBGFR3DECL(int) DBGFR3OSQueryNameAndVersion(PVM pVM, char *pszName, size_t cchName, char *pszVersion, size_t cchVersion)
+{
+    return VERR_INTERNAL_ERROR;
+}

trunk/src/VBox/VMM/DBGFMem.cpp

@@ -116 +116 @@
-
-
+/**
+ * Read guest memory.
+ *
+ * @returns VBox status code.
+ * @param   pVM             Pointer to the shared VM structure.
+ * @param   pAddress        Where to start reading.
+ * @param   pvBuf           Where to store the data we've read.
+ * @param   cbRead          The number of bytes to read.
+ */
+static DECLCALLBACK(int) dbgfR3MemRead(PVM pVM, PCDBGFADDRESS pAddress, void *pvBuf, size_t cbRead)
+{
+    /*
+     * Validate the input we use, PGM does the rest.
+     */
+    if (!DBGFR3AddrIsValid(pVM, pAddress))
+        return VERR_INVALID_POINTER;
+    if (!VALID_PTR(pvBuf))
+        return VERR_INVALID_POINTER;
+    if (DBGFADDRESS_IS_HMA(pAddress))
+        return VERR_INVALID_POINTER;
+
+    /*
+     * Select DBGF worker by addressing mode.
+     */
+    int rc;
+    PGMMODE enmMode = PGMGetGuestMode(pVM);
+    if (    enmMode == PGMMODE_REAL
+        ||  enmMode == PGMMODE_PROTECTED
+        ||  DBGFADDRESS_IS_PHYS(pAddress) )
+        rc = PGMPhysReadGCPhys(pVM, pvBuf, pAddress->FlatPtr, cbRead);
+    else
+        rc = PGMPhysReadGCPtr(pVM, pvBuf, pAddress->FlatPtr, cbRead);
+    return rc;
+}
+
+
+/**
+ * Read guest memory.
+ *
+ * @returns VBox status code.
+ * @param   pVM             Pointer to the shared VM structure.
+ * @param   pAddress        Where to start reading.
+ * @param   pvBuf           Where to store the data we've read.
+ * @param   cbRead          The number of bytes to read.
+ */
+DBGFR3DECL(int) DBGFR3MemRead(PVM pVM, PCDBGFADDRESS pAddress, void *pvBuf, size_t cbRead)
+{
+    PVMREQ pReq;
+    int rc = VMR3ReqCallU(pVM->pUVM, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)dbgfR3MemRead, 4,
+                          pVM, pAddress, pvBuf, cbRead);
+    if (VBOX_SUCCESS(rc))
+        rc = pReq->iStatus;
+    VMR3ReqFree(pReq);
+
+    return rc;
+}

trunk/src/VBox/VMM/DBGFOS.cpp

@@ -38 +38 @@
-
-/**
+ * EMT worker function for DBGFR3OSRegister.
+ *
+ * @returns VBox status code.
+ * @param   pVM     Pointer to the shared VM structure.
+ * @param   pReg    The registration structure.
+ */
+static DECLCALLBACK(int) dbgfR3OSRegister(PVM pVM, PDBGFOSREG pReg)
+{
+    /* more validations. */
+    for (PDBGFOS pOS = pVM->dbgf.s.pOSHead; pOS; pOS = pOS->pNext)
+        if (!strcmp(pOS->pReg->szName, pReg->szName))
+        {
+            Log(("dbgfR3OSRegister: %s -> VERR_ALREADY_LOADED\n", pReg->szName));
+            return VERR_ALREADY_LOADED;
+        }
+
+    /*
+     * Allocate a new structure, call the constructor and link it into the list.
+     */
+    PDBGFOS pOS = (PDBGFOS)MMR3HeapAllocZ(pVM, MM_TAG_DBGF_OS, RT_OFFSETOF(DBGFOS, abData[pReg->cbData]));
+    AssertReturn(pOS, VERR_NO_MEMORY);
+    pOS->pReg = pReg;
+
+    int rc = pOS->pReg->pfnConstruct(pVM, pOS->abData);
+    if (RT_SUCCESS(rc))
+    {
+        pOS->pNext = pVM->dbgf.s.pOSHead;
+        pVM->dbgf.s.pOSHead = pOS;
+    }
+    else
+    {
+        if (pOS->pReg->pfnDestruct)
+            pOS->pReg->pfnDestruct(pVM, pOS->abData);
+        MMR3HeapFree(pOS);
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+/**
- * Registers a guest OS digger.
- *
@@ -46 +87 @@
- * @param   pVM     Pointer to the shared VM structure.
- * @param   pReg    The registration structure.
-
-
+
+
+
-{
-    /*
-     * Validate intput.
-     */
-    VM_ASSERT_EMT_RETURN(pVM, VERR_VM_THREAD_NOT_EMT);
-    AssertPtrReturn(pReg, VERR_INVALID_POINTER);
-    AssertReturn(pReg->u32Magic == DBGFOSREG_MAGIC, VERR_INVALID_MAGIC);
@@ -58 +99 @@
-    AssertReturn(!pReg->fFlags, VERR_INVALID_PARAMETER);
-    AssertReturn(pReg->cbData < _2G, VERR_INVALID_PARAMETER);
-!
+
-    AssertReturn(memchr(&pReg->szName[0], '\0', sizeof(pReg->szName)), VERR_INVALID_NAME);
-    AssertPtrReturn(pReg->pfnConstruct, VERR_INVALID_POINTER);
@@ -68 +109 @@
-    AssertPtrReturn(pReg->pfnQueryVersion, VERR_INVALID_POINTER);
-    AssertPtrReturn(pReg->pfnQueryInterface, VERR_INVALID_POINTER);
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    if (RT_SUCCESS(rc))
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -126 +154 @@
-
-/**
-
-
-
-
+
- *
- * @returns VBox status code.
@@ -139 +164 @@
- * @param   cchName     Size of the buffer.
- */
-
-
-
-
-
+
+
-    /*
-     * Cycle thru the detection routines.
-     */
-    if (pszName && cchName)
-        *pszName = '\0';
-    PDBGFOS const pOldOS = pVM->dbgf.s.pCurOS;
-    pVM->dbgf.s.pCurOS = NULL;
@@ -178 +198 @@
-
-/**
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- *
- * @returns VBox status code.
@@ -190 +241 @@
- * @param   cchVersion      The size of the version buffer.
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    /*
-     * Any known OS?
@@ -237 +276 @@
-
-/**
+ * Queries the name and/or version string for the guest OS.
+ *
+ * It goes without saying that this querying is done using the current
+ * guest OS digger and not additions or user configuration.
+ *
+ * @returns VBox status code.
+ * @param   pVM             Pointer to the shared VM structure.
+ * @param   pszName         Where to store the OS name. Optional.
+ * @param   cchName         The size of the name buffer.
+ * @param   pszVersion      Where to store the version string. Optional.
+ * @param   cchVersion      The size of the version buffer.
+ * @thread  Any.
+ */
+DBGFR3DECL(int) DBGFR3OSQueryNameAndVersion(PVM pVM, char *pszName, size_t cchName, char *pszVersion, size_t cchVersion)
+{
+    AssertPtrNullReturn(pszName, VERR_INVALID_POINTER);
+    AssertPtrNullReturn(pszVersion, VERR_INVALID_POINTER);
+
+    /*
+     * Initialize the output up front.
+     */
+    if (pszName && cchName)
+        *pszName = '\0';
+    if (pszVersion && cchVersion)
+        *pszVersion = '\0';
+
+    /*
+     * Pass it on to the EMT.
+     */
+    PVMREQ pReq;
+    int rc = VMR3ReqCallU(pVM->pUVM, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)dbgfR3OSQueryNameAndVersion,
+                          5, pVM, pszName, cchName, pszVersion, cchVersion);
+    if (RT_SUCCESS(rc))
+        rc = pReq->iStatus;
+    VMR3ReqFree(pReq);
+
+    return rc;
+}
+
+
+/**
+ * EMT worker for DBGFR3OSQueryInterface.
+ *
+ * @param   pVM         Pointer to the shared VM structure.
+ * @param   enmIf       The interface identifier.
+ * @param   ppvIf       Where to store the interface pointer on success.
+ */
+static DECLCALLBACK(void) dbgfR3OSQueryInterface(PVM pVM, DBGFOSINTERFACE enmIf, void **ppvIf)
+{
+    if (pVM->dbgf.s.pCurOS)
+    {
+        *ppvIf = pVM->dbgf.s.pCurOS->pReg->pfnQueryInterface(pVM, pVM->dbgf.s.pCurOS->abData, enmIf);
+        if (*ppvIf)
+        {
+            /** @todo Create EMT wrapper for the returned interface once we've defined one...
+             * Just keep a list of wrapper together with the OS instance. */
+        }
+    }
+    else
+        *ppvIf = NULL;
+}
+
+
+/**
- * Query an optional digger interface.
- *
@@ -243 +346 @@
- * @param   pVM         Pointer to the shared VM structure.
- * @param   enmIf       The interface identifier.
+ * @thread  Any.
- */
-DBGFR3DECL(void *) DBGFR3OSQueryInterface(PVM pVM, DBGFOSINTERFACE enmIf)
-{
-    AssertMsgReturn(enmIf > DBGFOSINTERFACE_INVALID && enmIf < DBGFOSINTERFACE_END, ("%d\n", enmIf), NULL);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+