Changeset 53641 in vbox for trunk/src/VBox/ExtPacks

Timestamp:

Jan 2, 2015 12:14:42 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: Made it to line 11272. (r11)

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace

Files:

• include/VBoxDTraceTypes.h (modified) (6 diffs)
• onnv/uts/common/dtrace/dtrace.c (modified) (52 diffs)
• onnv/uts/common/sys/dtrace.h (modified) (1 diff)

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

@@ -58 +58 @@
     zoneid_t                cr_zone;
 } cred_t;
-
-typedef struct VBoxDtVMem       vmem_t;
+#define PRIV_POLICY_ONLY(a_pCred, a_uPriv, a_fAll) (true)
+#define crgetuid(a_pCred)       ((a_pCred)->cr_uid)
+#define crgetzoneid(a_pCred)    ((a_pCred)->cr_zone)
+
+
 typedef struct VBoxDtCyclicId  *cyclic_id_t;
 
@@ -78 +81 @@
 {
     uint32_t                p_flag;
+    struct dtrace_helpers  *p_dtrace_helpers;
 } proc_t;
+proc_t *VBoxDtGetCurrentProc(void);
+#define curproc                     (VBoxDtGetCurrentProc())
 
 #define SNOCD                   RT_BIT(0)
@@ -91 +97 @@
     RTSPINLOCK hSpinlock;
 } kmutex_t;
+#define mutex_enter             VBoxDtMutexEnter
+#define mutex_exit              VBoxDtMutexExit
+#define MUTEX_HELD(a_pMtx)      VBoxDtMutexIsOwner(a_pMtx)
+#define mod_lock                g_DummyMtx
+#define cpu_lock                g_DummyMtx
+void VBoxDtMutexEnter(struct VBoxDtMutex *pMtx);
+void VBoxDtMutexExit(struct VBoxDtMutex *pMtx);
+bool VBoxDtMutexIsOwner(struct VBoxDtMutex *pMtx);
+extern struct VBoxDtMutex       g_DummyMtx;
+
 
 typedef struct VBoxDtCpuCore
@@ -125 +141 @@
 
 #define ASSERT(a_Expr)          Assert(a_Expr)
+#define panic                   VBoxDtPanic
+void VBoxDtPanic(const char *psz, ...);
+#define cmn_err                 VBoxDtCmnErr
+void VBoxDtCmnErr(int iLevel, const char *pszMsg, ...);
+#define CE_WARN                 10
+#define CE_NOTE                 11
+#define uprintf                 VBoxDtUPrintf
+#define vuprintf                VBoxDtUPrintfV
+void VBoxDtUPrintf(const char *pszFormat, ...);
+void VBoxDtUPrintfV(const char *pszFormat, va_list va);
+
 
 #if 1 /* */
@@ -137 +164 @@
 #define NBBY                    8
 #define NCPU                    RTCPUSET_MAX_CPUS
-#define P2ROUNDUP(uWhat, uAlign) ( ((uWhat) + (uAlign) - 1) & ~(uAlign - 1) )
+#define P2ROUNDUP(uWhat, uAlign)    ( ((uWhat) + (uAlign) - 1) & ~(uAlign - 1) )
+#define roundup(uWhat, uUnit)       ( ( (uWhat) + ((uUnit) - 1)) / (uUnit) * (uUnit) )
+
 #define CPU_ON_INTR(a_pCpu)     (false)
+
+#define KERNELBASE              VBoxDtGetKernelBase()
+uintptr_t VBoxDtGetKernelBase(void);
 
 
@@ -158 +190 @@
  * Avoids lots of \#ifdef VBOX otherwise needed to mark up the changes. */
 #define VBDTCAST(a_Type)        (a_Type)
+/** Mark a type change made when porting the code to VBox.
+ * This is usually signed -> unsigned type changes that avoids a whole lot of
+ * comparsion warnings. */
+#define VBDTTYPE(a_VBox, a_Org) a_VBox
+
+/*
+ * Memory allocation wrappers.
+ */
+#define KM_SLEEP                RT_BIT(0)
+#define KM_NOSLEEP              RT_BIT(1)
+#define kmem_alloc              VBoxDtKMemAlloc
+#define kmem_zalloc             VBoxDtKMemAllocZ
+#define kmem_free               VBoxDtKMemFree
+void *VBoxDtKMemAlloc(size_t cbMem, uint32_t fFlags);
+void *VBoxDtKMemAllocZ(size_t cbMem, uint32_t fFlags);
+void  VBoxDtKMemFree(void *pvMem, size_t cbMem);
+
+typedef struct VBoxDtVMem
+{
+    size_t                  cbTodo;
+    void                   *pvTodo;
+} vmem_t;
+#define VM_SLEEP                RT_BIT(0)
+#define VM_BESTFIT              RT_BIT(1)
+#define vmem_alloc              VBoxDtVMemAlloc
+#define vmem_free               VBoxDtVMemFree
+void *VBoxDtVMemAlloc(struct VBoxDtVMem *pVMemArena, size_t cbMem, uint32_t fFlags);
+void  VBoxDtVMemFree(struct VBoxDtVMem *pVMemArena, void *pvMem, size_t cbMem);
+
+
+/*
+ * Errno defines compatible with the CRT of the given host...
+ */
+#define EINVAL                  (22)
+#define EBUSY                   (16)
+#define EFBIG                   (27)
+#define ENOMEM                  (12)
+#define ENOSPC                  (28)
+#define ENOENT                  (2)
+
+/*
+ * string
+ */
+#define bcopy(a_pSrc, a_pDst, a_cb) memmove(a_pDst, a_pSrc, a_cb)
+#define bzero(a_pDst, a_cb)         RT_BZERO(a_pDst, a_cb)
 
 RT_C_DECLS_END

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

@@ -96 +96 @@
 # include <sys/dtrace_impl.h>
 # include <iprt/assert.h>
+# include <iprt/cpuset.h>
 # include <iprt/mp.h>
+# include <iprt/string.h>
 # include <iprt/process.h>
 # include <iprt/thread.h>
+# include <limits.h>
 
 # undef NULL
@@ -176 +179 @@
 static taskq_t          *dtrace_taskq;          /* task queue */
 static dtrace_probe_t   **dtrace_probes;        /* array of all probes */
-static int              dtrace_nprobes;         /* number of probes */
+static VBDTTYPE(uint32_t,int) dtrace_nprobes;           /* number of probes */
 static dtrace_provider_t *dtrace_provider;      /* provider list */
 static dtrace_meta_t    *dtrace_meta_pid;       /* user-land meta provider */
@@ -5703 +5706 @@
         hrtime_t now;
 
+#ifndef VBOX
         /*
          * Kick out immediately if this CPU is still being born (in which case
@@ -5710 +5714 @@
         if (((uintptr_t)curthread & 1) || (curthread->t_flag & T_DONTDTRACE))
                 return;
+#endif
 
         cookie = dtrace_interrupt_disable();
@@ -5726 +5731 @@
         }
 
+#ifndef VBOX
         if (panic_quiesce) {
                 /*
@@ -5733 +5739 @@
                 return;
         }
+#endif
 
         now = dtrace_gethrtime();
@@ -5856 +5863 @@
                                     s_cr->cr_gid != cr->cr_rgid ||
                                     s_cr->cr_gid != cr->cr_sgid ||
-                                    (proc = ttoproc(curthread)) == NULL ||
+                                    (proc = VBDT_GET_PROC()) == NULL ||
                                     (proc->p_flag & SNOCD))
                                         continue;
                         }
 
+#ifndef VBOX
                         if (ecb->dte_cond & DTRACE_COND_ZONEOWNER) {
                                 cred_t *cr;
@@ -5873 +5881 @@
                                         continue;
                         }
+#endif
                 }
 
@@ -6004 +6013 @@
 
                                 dtrace_getpcstack((pc_t *)(tomax + valoffs),
-                                    size / sizeof (pc_t), probe->dtpr_aframes,
+                                    VBDTCAST(int)(size / sizeof (pc_t)), probe->dtpr_aframes,
                                     DTRACE_ANCHORED(probe) ? NULL :
                                     (uint32_t *)arg0);
@@ -6144 +6153 @@
                         case DTRACEACT_UMOD:
                         case DTRACEACT_UADDR: {
+#ifndef VBOX
                                 struct pid *pid = curthread->t_procp->p_pidp;
 
@@ -6153 +6163 @@
                                 DTRACE_STORE(uint64_t, tomax,
                                     valoffs + sizeof (uint64_t), val);
-
+#else
+                                DTRACE_CPUFLAG_SET(CPU_DTRACE_UPRIV);
+#endif
                                 continue;
                         }
@@ -6925 +6937 @@
          */
         if (hash == NULL) {
-                for (i = 0; i < dtrace_nprobes; i++) {
+                for (i = 0; i < VBDTCAST(dtrace_id_t)dtrace_nprobes; i++) {
                         if ((probe = dtrace_probes[i]) == NULL ||
                             dtrace_match_probe(probe, pkp, priv, uid,
@@ -7177 +7189 @@
         dtrace_provider_t *old = (dtrace_provider_t *)id;
         dtrace_provider_t *prev = NULL;
-        int i, self = 0;
+        VBDTTYPE(uint32_t,int) i, self = 0;
         dtrace_probe_t *probe, *first = NULL;
 
@@ -7361 +7373 @@
 {
         dtrace_provider_t *prov = (dtrace_provider_t *)id;
-        int i;
+        VBDTTYPE(uint32_t,int) i;
         dtrace_probe_t *probe;
 
@@ -7601 +7613 @@
 dtrace_probe_provide(dtrace_probedesc_t *desc, dtrace_provider_t *prv)
 {
+#ifndef VBOX
         struct modctl *ctl;
+#endif
         int all = 0;
 
@@ -7617 +7631 @@
                 prv->dtpv_pops.dtps_provide(prv->dtpv_arg, desc);
 
+#ifndef VBOX
                 /*
                  * Now call the per-module provide operation.  We will grab
@@ -7635 +7650 @@
 
                 mutex_exit(&mod_lock);
+#endif
         } while (all && (prv = prv->dtpv_next) != NULL);
 }
@@ -7649 +7665 @@
         dtrace_probe_t *probe;
         dtrace_icookie_t cookie;
-        int i;
+        VBDTTYPE(uint32_t,int) i;
 
         /*
@@ -7825 +7841 @@
         uintptr_t daddr = (uintptr_t)dhp->dofhp_dof;
         dof_hdr_t *dof = (dof_hdr_t *)daddr;
-        int i;
+        VBDTTYPE(uint32_t,int) i;
 
         ASSERT(MUTEX_HELD(&dtrace_meta_lock));
@@ -7882 +7898 @@
         uintptr_t daddr = (uintptr_t)dhp->dofhp_dof;
         dof_hdr_t *dof = (dof_hdr_t *)daddr;
-        int i;
+        VBDTTYPE(uint32_t,int) i;
 
         ASSERT(MUTEX_HELD(&dtrace_meta_lock));
@@ -7909 +7925 @@
         dtrace_meta_t *meta;
         dtrace_helpers_t *help, *next;
-        int i;
+        VBDTTYPE(uint32_t,int) i;
 
         *idp = DTRACE_METAPROVNONE;
@@ -8051 +8067 @@
     cred_t *cr)
 {
+#ifndef VBOX
         int err = 0, i;
+#else
+        int err = 0;
+        uint_t i;
+#endif
         int (*efunc)(uint_t pc, const char *, ...) = dtrace_difo_err;
         int kcheckload;
@@ -8370 +8391 @@
                 switch (v->dtdv_scope) {
                 case DIFV_SCOPE_GLOBAL:
-                        if (ndx < vstate->dtvs_nglobals) {
+                        if (VBDTCAST(int64_t)ndx < vstate->dtvs_nglobals) {
                                 dtrace_statvar_t *svar;
 
@@ -8380 +8401 @@
 
                 case DIFV_SCOPE_THREAD:
-                        if (ndx < vstate->dtvs_ntlocals)
+                        if (VBDTCAST(int64_t)ndx < vstate->dtvs_ntlocals)
                                 existing = &vstate->dtvs_tlocals[ndx];
                         break;
 
                 case DIFV_SCOPE_LOCAL:
-                        if (ndx < vstate->dtvs_nlocals) {
+                        if (VBDTCAST(int64_t)ndx < vstate->dtvs_nlocals) {
                                 dtrace_statvar_t *svar;
 
@@ -8597 +8618 @@
 dtrace_difo_cacheable(dtrace_difo_t *dp)
 {
-        int i;
+        VBDTTYPE(uint_t,int) i;
 
         if (dp == NULL)
@@ -8642 +8663 @@
 dtrace_difo_hold(dtrace_difo_t *dp)
 {
-        int i;
+        VBDTTYPE(uint_t,int) i;
 
         ASSERT(MUTEX_HELD(&dtrace_lock));
@@ -8809 +8830 @@
 dtrace_difo_init(dtrace_difo_t *dp, dtrace_vstate_t *vstate)
 {
+#ifndef VBOX
         int i, oldsvars, osz, nsz, otlocals, ntlocals;
+#else
+        int oldsvars, osz, nsz, otlocals, ntlocals;
+        uint_t i;
+#endif
         uint_t id;
 
@@ -8829 +8855 @@
                 switch (scope) {
                 case DIFV_SCOPE_THREAD:
-                        while (id >= (otlocals = vstate->dtvs_ntlocals)) {
+                        while (VBDTCAST(int64_t)id >= (otlocals = vstate->dtvs_ntlocals)) {
                                 dtrace_difv_t *tlocals;
 
@@ -8879 +8905 @@
                 }
 
-                while (id >= (oldsvars = *np)) {
+                while (VBDTCAST(int64_t)id >= (oldsvars = *np)) {
                         dtrace_statvar_t **statics;
                         int newsvars, oldsize, newsize;
@@ -8966 +8992 @@
 dtrace_difo_destroy(dtrace_difo_t *dp, dtrace_vstate_t *vstate)
 {
-        int i;
+        VBDTTYPE(uint_t,int)  i;
 
         ASSERT(dp->dtdo_refcnt == 0);
@@ -8999 +9025 @@
 
                 id -= DIF_VAR_OTHER_UBASE;
-                ASSERT(id < *np);
+                ASSERT(VBDTCAST(int64_t)id < *np);
 
                 svar = svarp[id];
@@ -9029 +9055 @@
 dtrace_difo_release(dtrace_difo_t *dp, dtrace_vstate_t *vstate)
 {
-        int i;
+        VBDTTYPE(uint_t,int)  i;
 
         ASSERT(MUTEX_HELD(&dtrace_lock));
@@ -9056 +9082 @@
 {
         char *fmt, **new;
-        uint16_t ndx, len = strlen(str) + 1;
+        uint16_t ndx, len = VBDTCAST(uint16_t)strlen(str) + 1;
 
         fmt = kmem_zalloc(len, KM_SLEEP);
@@ -9276 +9302 @@
         epid = state->dts_epid++;
 
-        if (epid - 1 >= state->dts_necbs) {
+        if (VBDTCAST(int64_t)epid - 1 >= state->dts_necbs) {
                 dtrace_ecb_t **oecbs = state->dts_ecbs, **ecbs;
                 int necbs = state->dts_necbs << 1;
@@ -9557 +9583 @@
         }
 
-        agg->dtag_action.dta_rec.dtrd_size = size;
+        agg->dtag_action.dta_rec.dtrd_size = VBDTCAST(uint32_t)size;
 
         if (ntuple == 0)
@@ -9607 +9633 @@
             VM_BESTFIT | VM_SLEEP);
 
-        if (aggid - 1 >= state->dts_naggregations) {
+        if (VBDTCAST(int64_t)aggid - 1 >= state->dts_naggregations) {
                 dtrace_aggregation_t **oaggs = state->dts_aggregations;
                 dtrace_aggregation_t **aggs;
@@ -9747 +9773 @@
                         }
 
-                        size = nframes * sizeof (pc_t);
+                        size = VBDTCAST(uint32_t)(nframes * sizeof (pc_t));
                         break;
 
@@ -9772 +9798 @@
                          * Save a slot for the pid.
                          */
-                        size = (nframes + 1) * sizeof (uint64_t);
+                        size = VBDTCAST(uint32_t)((nframes + 1) * sizeof (uint64_t));
                         size += DTRACE_USTACK_STRSIZE(arg);
                         size = P2ROUNDUP(size, (uint32_t)(sizeof (uintptr_t)));
@@ -10160 +10186 @@
         ASSERT(MUTEX_HELD(&dtrace_lock));
 
-        if (id == 0 || id > state->dts_necbs)
+        if (id == 0 || VBDTCAST(int64_t)id > state->dts_necbs)
                 return (NULL);
 
@@ -10176 +10202 @@
         ASSERT(MUTEX_HELD(&dtrace_lock));
 
-        if (id == 0 || id > state->dts_naggregations)
+        if (id == 0 || VBDTCAST(int64_t)id > state->dts_naggregations)
                 return (NULL);
 
@@ -10256 +10282 @@
     processorid_t cpu)
 {
+#ifndef VBOX
         cpu_t *cp;
+#else
+        RTCPUSET CpuSet;
+        unsigned iCpu;
+#endif
         dtrace_buffer_t *buf;
 
@@ -10262 +10293 @@
         ASSERT(MUTEX_HELD(&dtrace_lock));
 
-        if (size > dtrace_nonroot_maxsize &&
-            !PRIV_POLICY_CHOICE(CRED(), PRIV_ALL, B_FALSE))
+        if (VBDTCAST(int64_t)size > dtrace_nonroot_maxsize
+#ifndef VBOX
+            && !PRIV_POLICY_CHOICE(CRED(), PRIV_ALL, B_FALSE)
+#endif
+            )
                 return (EFBIG);
 
+#ifndef VBOX
         cp = cpu_list;
-
+#else
+        RTMpGetSet(&CpuSet);
+#endif
+
+#ifndef VBOX
         do {
                 if (cpu != DTRACE_CPUALL && cpu != cp->cpu_id)
@@ -10273 +10312 @@
 
                 buf = &bufs[cp->cpu_id];
+#else
+    for (iCpu = 0; iCpu < RTCPUSET_MAX_CPUS; iCpu++) {
+                if (   !RTCpuSetIsMember(&CpuSet, iCpu)
+                        || (cpu != DTRACE_CPUALL && cpu != iCpu))
+                        continue;
+
+                buf = &bufs[iCpu];
+#endif
 
                 /*
@@ -10299 +10346 @@
                 if ((buf->dtb_xamot = kmem_zalloc(size, KM_NOSLEEP)) == NULL)
                         goto err;
+#ifndef VBOX
         } while ((cp = cp->cpu_next) != cpu_list);
+#else
+        }
+#endif
 
         return (0);
 
 err:
+#ifndef VBOX
         cp = cpu_list;
 
@@ -10311 +10363 @@
 
                 buf = &bufs[cp->cpu_id];
+#else
+                for (iCpu = 0; iCpu < RTCPUSET_MAX_CPUS; iCpu++) {
+                        if (   !RTCpuSetIsMember(&CpuSet, iCpu)
+                                || (cpu != DTRACE_CPUALL && cpu != iCpu))
+                                continue;
+
+                        buf = &bufs[iCpu];
+#endif
 
                 if (buf->dtb_xamot != NULL) {
@@ -10326 +10386 @@
                 buf->dtb_xamot = NULL;
                 buf->dtb_size = 0;
+#ifndef VBOX
         } while ((cp = cp->cpu_next) != cpu_list);
+#else
+        }
+#endif
 
         return (ENOMEM);
@@ -10379 +10443 @@
                 }
 
-                if ((soffs = offs + needed) > buf->dtb_size) {
+                if (VBDTCAST(uintptr_t)(soffs = offs + needed) > buf->dtb_size) {
                         dtrace_buffer_drop(buf);
                         return (-1);
@@ -10450 +10514 @@
                          * offset to the end (there may be old gunk there).
                          */
-                        while (offs < buf->dtb_size)
+                        while (VBDTCAST(uintptr_t)offs < buf->dtb_size)
                                 tomax[offs++] = 0;
 
@@ -10487 +10551 @@
                 }
 
-                while (offs + total > woffs) {
+                while (VBDTCAST(uintptr_t)offs + total > VBDTCAST(uintptr_t)woffs) {
                         dtrace_epid_t epid = *(uint32_t *)(tomax + woffs);
                         size_t size;
@@ -10494 +10558 @@
                                 size = sizeof (uint32_t);
                         } else {
-                                ASSERT(epid <= state->dts_necbs);
+                                ASSERT(VBDTCAST(int64_t)epid <= state->dts_necbs);
                                 ASSERT(state->dts_ecbs[epid - 1] != NULL);
 
@@ -10529 +10593 @@
                                         woffs = total;
 
-                                        while (woffs < buf->dtb_size)
+                                        while (VBDTCAST(uintptr_t)woffs < buf->dtb_size)
                                                 tomax[woffs++] = 0;
                                 }
@@ -11016 +11080 @@
                 cred_t *cr = enab->dten_vstate->dtvs_state->dts_cred.dcr_cred;
 
+#ifndef VBOX
                 if (INGLOBALZONE(curproc) ||
                     cr != NULL && getzoneid() == crgetzoneid(cr))
+#endif
                         (void) dtrace_enabling_match(enab, NULL);
         }

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common/sys/dtrace.h

@@ -625 +625 @@
 typedef uint32_t dof_stridx_t;  /* string table index type */
 
-#define DOF_SECIDX_NONE (-1U)   /* null value for section indices */
-#define DOF_STRIDX_NONE (-1U)   /* null value for string indices */
+#define DOF_SECIDX_NONE (~1U)   /* null value for section indices */
+#define DOF_STRIDX_NONE (~1U)   /* null value for string indices */
 
 typedef struct dof_sec {