Changeset 53663 in vbox for trunk/src/VBox

Timestamp:

Jan 2, 2015 12:31:45 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: working on the interfaces between the two modules... (r40)

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace

Files:

• VBoxDTraceR0/VBoxDTraceR0.cpp (modified) (4 diffs)
• include/VBoxDTraceTypes.h (modified) (5 diffs)
• onnv/lib/libdtrace/common/dt_subr.c (modified) (6 diffs)
• onnv/uts/common/dtrace/dtrace.c (modified) (3 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0/VBoxDTraceR0.cpp

@@ -54 +54 @@
 struct VBoxDtMutex      g_DummyMtx;
 
+void           (*dtrace_cpu_init)(processorid_t);
+void           (*dtrace_modload)(struct modctl *);
+void           (*dtrace_modunload)(struct modctl *);
+void           (*dtrace_helpers_cleanup)(void);
+void           (*dtrace_helpers_fork)(proc_t *, proc_t *);
+void           (*dtrace_cpustart_init)(void);
+void           (*dtrace_cpustart_fini)(void);
+void           (*dtrace_cpc_fire)(uint64_t);
+void           (*dtrace_debugger_init)(void);
+void           (*dtrace_debugger_fini)(void);
+dtrace_cacheid_t dtrace_predcache_id = DTRACE_CACHEIDNONE + 1;
+
+
+void dtrace_toxic_ranges(void (*pfnAddOne)(uintptr_t uBase, uintptr_t cbRange))
+{
+    /** @todo ? */
+}
+
 
 
@@ -156 +174 @@
     }
     return u64;
+}
+
+
+/** copyin implementation */
+int  VBoxDtCopyIn(void const *pvUser, void *pvDst, size_t cb)
+{
+    int rc = RTR0MemUserCopyFrom(pvDst, (uintptr_t)pvUser, cb);
+    return RT_SUCCESS(rc) ? 0 : -1;
+}
+
+
+/** copyout implementation */
+int  VBoxDtCopyOut(void const *pvSrc, void *pvUser, size_t cb)
+{
+    int rc = RTR0MemUserCopyTo((uintptr_t)pvUser, pvSrc, cb);
+    return RT_SUCCESS(rc) ? 0 : -1;
 }
 
@@ -451 +485 @@
 }
 
+
+/** uprintf implementation */
+void VBoxDtUPrintf(const char *pszFormat, ...)
+{
+    va_list va;
+    va_start(va, pszFormat);
+    VBoxDtUPrintfV(pszFormat, va);
+    va_end(va);
+}
+
+
+/** vuprintf implementation */
+void VBoxDtUPrintfV(const char *pszFormat, va_list va)
+{
+    SUPR0Printf("%N", pszFormat, va);
+}
+
+
+/* CRED implementation. */
+cred_t *VBoxDtGetCurrentCreds(void)
+{
+    struct VBoxDtThread *pThread = VBoxDtGetCurrentThread();
+    if (!pThread)
+        return NULL;
+    return pThread->t_proc->p_cred;
+}
+
+
+/* crhold implementation */
+void VBoxDtCredHold(struct VBoxDtCred *pCred)
+{
+    int32_t cRefs = ASMAtomicIncS32(&pCred->cr_refs);
+    Assert(cRefs > 1);
+}
+
+
+/* crfree implementation */
+void VBoxDtCredFree(struct VBoxDtCred *pCred)
+{
+    int32_t cRefs = ASMAtomicDecS32(&pCred->cr_refs);
+    Assert(cRefs >= 0);
+    if (!cRefs)
+        RTMemFree(pCred);
+}
+
+
 #if 0
-dtrace_probe_error
-
-VBoxDtGetCurrentCreds
+VBoxDtDdiDriverMajor
+VBoxDtDdiReportDev
+VBoxDtDdiSoftStateAllocZ
+VBoxDtDdiSoftStateFree
+VBoxDtDdiSoftStateGet
+VBoxDtDdiSoftStateInit
+VBoxDtDdiSoftStateTerm
+
 VBoxDtGetCurrentProc
 VBoxDtGetCurrentThread
 VBoxDtGetKernelBase
+
 VBoxDtKMemAlloc
 VBoxDtKMemAllocZ
+VBoxDtKMemCacheAlloc
+VBoxDtKMemCacheCreate
+VBoxDtKMemCacheDestroy
+VBoxDtKMemCacheFree
 VBoxDtKMemFree
 VBoxDtMutexEnter
@@ -465 +555 @@
 VBoxDtMutexIsOwner
 VBoxDtVMemAlloc
+VBoxDtVMemCreate
+VBoxDtVMemDestroy
 VBoxDtVMemFree
+
+
+dtrace_xcall
+nocrt_strncpy
+RTErrConvertToErrno
 #endif

trunk/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h

@@ -189 +189 @@
 typedef struct VBoxDtCred
 {
+    int32_t                 cr_refs;
     RTUID                   cr_uid;
     RTUID                   cr_ruid;
@@ -219 +220 @@
     uintptr_t               t_dtrace_astpc;
     uint32_t                t_predcache;
+    struct VBoxDtProcess   *t_proc;
 } kthread_t;
-extern kthread_t *VBoxDtGetCurrentThread(void);
+struct VBoxDtThread *VBoxDtGetCurrentThread(void);
 #define curthread               (VBoxDtGetCurrentThread())
 
@@ -229 +231 @@
     RTPROCESS               p_pid;
     struct dtrace_helpers  *p_dtrace_helpers;
+    struct VBoxDtCred      *p_cred;
 } proc_t;
 proc_t *VBoxDtGetCurrentProc(void);
@@ -280 +283 @@
 #define cpu_core                (g_aVBoxDtCpuCores)
 
-cred_t *VBoxDtGetCurrentCreds(void);
+struct VBoxDtCred *VBoxDtGetCurrentCreds(void);
 #define CRED()                  VBoxDtGetCurrentCreds()
 
@@ -386 +389 @@
 void    VBoxDtDdiReportDev(struct VBoxDtDevInfo *pDevInfo);
 
+/*
+ * DTrace bits we've made external.
+ */
+extern int dtrace_attach(dev_info_t *devi, ddi_attach_cmd_t cmd);
+extern int dtrace_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv);
+
 #endif /* IN_RING0 */
 

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_subr.c

@@ -47 +47 @@
 #  include <unistd.h>
 # endif
+# include <VBox/sup.h>
 #endif /* VBOX */
 
@@ -483 +484 @@
 {
         const dtrace_vector_t *v = dtp->dt_vector;
+#ifdef VBOX
+        int rc;
+#endif
 
         if (v != NULL)
@@ -491 +495 @@
                 return (ioctl(dtp->dt_fd, val, arg));
 #else
+# if 1
+        rc = SUPR3CallR0Service(RT_STR_TUPLE("VBoxDTrace"), val, (uintptr_t)arg, NULL);
+        if (RT_SUCCESS(rc)) {
+
+        }
+# else
         /* Fake ioctl */
         switch (val) {
@@ -531 +541 @@
 
         }
-        AssertFailed(); /** @todo FIXME */
+# endif
 #endif
 
@@ -538 +548 @@
 }
 
+#ifndef /* VBOX - who needs this? */
 int
 dt_status(dtrace_hdl_t *dtp, processorid_t cpu)
@@ -553 +564 @@
         return (v->dtv_status(dtp->dt_varg, cpu));
 }
+#endif
 
 #ifndef VBOX

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common/dtrace/dtrace.c

@@ -14695 +14695 @@
  * DTrace Driver Cookbook Functions
  */
+#ifndef VBOX
 /*ARGSUSED*/
 static int
 dtrace_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
+#else
+int dtrace_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
+#endif
 {
         dtrace_provider_id_t id;
@@ -15037 +15041 @@
 
 /*ARGSUSED*/
+#ifndef VBOX
 static int
 dtrace_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv)
+#else
+int dtrace_ioctl(dev_t dev, int cmd, intptr_t arg, int md, cred_t *cr, int *rv)
+#endif
 {
         minor_t minor = getminor(dev);
@@ -15793 +15801 @@
 }
 
+#ifndef VBOX
 /*ARGSUSED*/
 static int
 dtrace_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
+#else
+int dtrace_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
+#endif
 {
         dtrace_state_t *state;