diff options
| author | gnn <gnn@FreeBSD.org> | 2015-02-10 19:41:30 +0000 |
|---|---|---|
| committer | gnn <gnn@FreeBSD.org> | 2015-02-10 19:41:30 +0000 |
| commit | b9be305241681da7846cc34819d953dd56af8657 (patch) | |
| tree | 04f2661f10ad407d8e68f760bfcd884bcfdc5cc3 /sys/arm | |
| parent | 60d8f84855602577b09503d0f815be913e016d7e (diff) | |
| download | FreeBSD-src-b9be305241681da7846cc34819d953dd56af8657.zip FreeBSD-src-b9be305241681da7846cc34819d953dd56af8657.tar.gz | |
Initial version of DTrace on ARM32.
Submitted by: Howard Su based on work by Oleksandr Tymoshenko
Reviewed by: ian, andrew, rpaulo, markj
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/arm/exception.S | 15 | ||||
| -rw-r--r-- | sys/arm/arm/identcpu.c | 2 | ||||
| -rw-r--r-- | sys/arm/arm/trap.c | 10 | ||||
| -rw-r--r-- | sys/arm/conf/BEAGLEBONE | 6 | ||||
| -rw-r--r-- | sys/arm/include/cpufunc.h | 2 |
5 files changed, 33 insertions, 2 deletions
diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S index 17172f8..58ae612 100644 --- a/sys/arm/arm/exception.S +++ b/sys/arm/arm/exception.S @@ -48,11 +48,26 @@ #include "assym.s" +#include "opt_kdtrace.h" #include <machine/asm.h> #include <machine/armreg.h> #include <machine/asmacros.h> __FBSDID("$FreeBSD$"); +#ifdef KDTRACE_HOOKS + .bss + .align 4 + .global _C_LABEL(dtrace_invop_jump_addr) +_C_LABEL(dtrace_invop_jump_addr): + .word 0 + .word 0 + + .global _C_LABEL(dtrace_invop_calltrap_addr) +_C_LABEL(dtrace_invop_calltrap_addr): + .word 0 + .word 0 +#endif + .text .align 2 diff --git a/sys/arm/arm/identcpu.c b/sys/arm/arm/identcpu.c index b37a1b3..75bf08c 100644 --- a/sys/arm/arm/identcpu.c +++ b/sys/arm/arm/identcpu.c @@ -387,7 +387,7 @@ identify_arm_cpu(void) u_int8_t type, linesize; int i; - cpuid = cpu_id(); + cpuid = cpu_ident(); if (cpuid == 0) { printf("Processor failed probe - no CPU ID\n"); diff --git a/sys/arm/arm/trap.c b/sys/arm/arm/trap.c index 081cfaa..0f142ce 100644 --- a/sys/arm/arm/trap.c +++ b/sys/arm/arm/trap.c @@ -78,6 +78,9 @@ * Created : 28/11/94 */ +#ifdef KDTRACE_HOOKS +#include <sys/dtrace_bsd.h> +#endif #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -427,6 +430,13 @@ dab_fatal(struct trapframe *tf, u_int fsr, u_int far, struct thread *td, { const char *mode; +#ifdef KDTRACE_HOOKS + if (!TRAP_USERMODE(tf)) { + if (dtrace_trap_func != NULL && (*dtrace_trap_func)(tf, far & FAULT_TYPE_MASK)) + return (0); + } +#endif + mode = TRAP_USERMODE(tf) ? "user" : "kernel"; disable_interrupts(PSR_I|PSR_F); diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE index 44e5c4e..975d6b2 100644 --- a/sys/arm/conf/BEAGLEBONE +++ b/sys/arm/conf/BEAGLEBONE @@ -27,6 +27,12 @@ include "../ti/am335x/std.am335x" makeoptions WITHOUT_MODULES="ahc" +# DTrace support +options KDTRACE_HOOKS # Kernel DTrace hooks +options DDB_CTF # all architectures - kernel ELF linker loads CTF data +makeoptions WITH_CTF=1 +makeoptions MODULES_OVERRIDE="opensolaris dtrace dtrace/lockstat dtrace/profile dtrace/fbt" + options HZ=100 options SCHED_4BSD # 4BSD scheduler options PREEMPTION # Enable kernel thread preemption diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h index ae2f979..25e5efe 100644 --- a/sys/arm/include/cpufunc.h +++ b/sys/arm/include/cpufunc.h @@ -175,7 +175,7 @@ struct cpu_functions { extern struct cpu_functions cpufuncs; extern u_int cputype; -#define cpu_id() cpufuncs.cf_id() +#define cpu_ident() cpufuncs.cf_id() #define cpu_cpwait() cpufuncs.cf_cpwait() #define cpu_control(c, e) cpufuncs.cf_control(c, e) |
