Changeset 53669 in vbox for trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts

Timestamp:

Jan 2, 2015 12:33:32 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: Implemented all the fake solaris stuff. (r46)

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common/dtrace/dtrace.c (modified) (6 diffs)

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

@@ -97 +97 @@
 # include <iprt/assert.h>
 # include <iprt/cpuset.h>
+# include <iprt/mem.h>
 # include <iprt/mp.h>
 # include <iprt/string.h>
@@ -138 +139 @@
 # define NULL (0)
 #endif /* VBOX */
+
+/** Check if the given address is a valid kernel address.
+ * The value can be uintptr_t or uint64_t.  */
+#ifndef VBOX
+# define VBDT_IS_VALID_KRNL_ADDR(a_uAddr)   ((a_uAddr) >= KERNELBASE)
+#else
+# define VBDT_IS_VALID_KRNL_ADDR(a_uAddr)   \
+    (   (sizeof(a_uAddr) == sizeof(uintptr_t) || (uintptr_t)(a_uAddr) == (a_uAddr)) \
+     && RTR0MemKernelIsValidAddr((void *)(uintptr_t)(a_uAddr)) )
+#endif
+
 
 /*
@@ -232 +244 @@
 static kmem_cache_t     *dtrace_state_cache;    /* cache for dynamic state */
 static uint64_t         dtrace_vtime_references; /* number of vtimestamp refs */
+#ifndef VBOX
 static kthread_t        *dtrace_panicked;       /* panicking thread */
+#endif
 static dtrace_ecb_t     *dtrace_ecb_create_cache; /* cached created ECB */
 static dtrace_genid_t   dtrace_probegen;        /* current probe generation */
@@ -9367 +9381 @@
 
         ASSERT(!DTRACEACT_ISPRINTFLIKE(kind) || (arg != NULL &&
-            arg >= KERNELBASE) || (arg == NULL && kind == DTRACEACT_PRINTA));
+            VBDT_IS_VALID_KRNL_ADDR(arg)) || (arg == NULL && kind == DTRACEACT_PRINTA));
 
         act = kmem_zalloc(sizeof (dtrace_actdesc_t), KM_SLEEP);
@@ -9403 +9417 @@
                 char *str = (char *)(uintptr_t)act->dtad_arg;
 
-                ASSERT((str != NULL && (uintptr_t)str >= KERNELBASE) ||
+                ASSERT((str != NULL && VBDT_IS_VALID_KRNL_ADDR((uintptr_t)str)) ||
                     (str == NULL && act->dtad_kind == DTRACEACT_PRINTA));
 
@@ -9878 +9892 @@
                         } else {
                                 ASSERT(arg != NULL);
-                                ASSERT(arg > KERNELBASE);
+                                ASSERT(VBDT_IS_VALID_KRNL_ADDR(arg));
                                 format = dtrace_format_add(state,
                                     (char *)(uintptr_t)arg);