d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit the rest of the changes that were intended to be part of r266826.

Browse Source 
X-MFC-with:	r266826
This commit is contained in:
Mark Johnston 2014-05-29 01:42:22 +00:00
parent baf33863ef
commit f2789bd5c7
5 changed files with 9 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/amd64/amd64/trap.c
View File

@ -95,28 +95,6 @@ PMC_SOFT_DEFINE( , , page_fault, write);
#ifdef KDTRACE_HOOKS #ifdef KDTRACE_HOOKS
#include <sys/dtrace_bsd.h> #include <sys/dtrace_bsd.h>
/*
* This is a hook which is initialised by the dtrace module
* to handle traps which might occur during DTrace probe
* execution.
*/
dtrace_trap_func_t dtrace_trap_func;
dtrace_doubletrap_func_t dtrace_doubletrap_func;
/*
* This is a hook which is initialised by the systrace module
* when it is loaded. This keeps the DTrace syscall provider
* implementation opaque.
*/
systrace_probe_func_t systrace_probe_func;
/*
* These hooks are necessary for the pid and usdt providers.
*/
dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
dtrace_return_probe_ptr_t dtrace_return_probe_ptr;
#endif #endif
extern void trap(struct trapframe *frame); extern void trap(struct trapframe *frame);

22
sys/i386/i386/trap.c
View File

@ -104,28 +104,6 @@ PMC_SOFT_DEFINE( , , page_fault, write);
#ifdef KDTRACE_HOOKS #ifdef KDTRACE_HOOKS
#include <sys/dtrace_bsd.h> #include <sys/dtrace_bsd.h>
/*
* This is a hook which is initialised by the dtrace module
* to handle traps which might occur during DTrace probe
* execution.
*/
dtrace_trap_func_t dtrace_trap_func;
dtrace_doubletrap_func_t dtrace_doubletrap_func;
/*
* This is a hook which is initialised by the systrace module
* when it is loaded. This keeps the DTrace syscall provider
* implementation opaque.
*/
systrace_probe_func_t systrace_probe_func;
/*
* These hooks are necessary for the pid and usdt providers.
*/
dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
dtrace_return_probe_ptr_t dtrace_return_probe_ptr;
#endif #endif
extern void trap(struct trapframe *frame); extern void trap(struct trapframe *frame);

9
sys/kern/kern_dtrace.c
View File

@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
#include <sys/proc.h> #include <sys/proc.h>
#include <sys/dtrace_bsd.h> #include <sys/dtrace_bsd.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/sysent.h>
#define KDTRACE_PROC_SIZE 64 #define KDTRACE_PROC_SIZE 64
#define KDTRACE_THREAD_SIZE 256 #define KDTRACE_THREAD_SIZE 256
@ -47,6 +48,14 @@ FEATURE(kdtrace_hooks,
static MALLOC_DEFINE(M_KDTRACE, "kdtrace", "DTrace hooks"); static MALLOC_DEFINE(M_KDTRACE, "kdtrace", "DTrace hooks");
/* Hooks used in the machine-dependent trap handlers. */
dtrace_trap_func_t dtrace_trap_func;
dtrace_doubletrap_func_t dtrace_doubletrap_func;
dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
dtrace_return_probe_ptr_t dtrace_return_probe_ptr;
systrace_probe_func_t systrace_probe_func;
/* Return the DTrace process data size compiled in the kernel hooks. */ /* Return the DTrace process data size compiled in the kernel hooks. */
size_t size_t
kdtrace_proc_size() kdtrace_proc_size()

22
sys/mips/mips/trap.c
View File

@ -93,28 +93,6 @@ __FBSDID("$FreeBSD$");
#ifdef KDTRACE_HOOKS #ifdef KDTRACE_HOOKS
#include <sys/dtrace_bsd.h> #include <sys/dtrace_bsd.h>
/*
* This is a hook which is initialised by the dtrace module
* to handle traps which might occur during DTrace probe
* execution.
*/
dtrace_trap_func_t dtrace_trap_func;
dtrace_doubletrap_func_t dtrace_doubletrap_func;
/*
* This is a hook which is initialised by the systrace module
* when it is loaded. This keeps the DTrace syscall provider
* implementation opaque.
*/
systrace_probe_func_t systrace_probe_func;
/*
* These hooks are necessary for the pid and usdt providers.
*/
dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
dtrace_return_probe_ptr_t dtrace_return_probe_ptr;
#endif #endif
#ifdef TRAP_DEBUG #ifdef TRAP_DEBUG

21
sys/powerpc/aim/trap.c
View File

@ -95,27 +95,6 @@ struct powerpc_exception {
#ifdef KDTRACE_HOOKS #ifdef KDTRACE_HOOKS
#include <sys/dtrace_bsd.h> #include <sys/dtrace_bsd.h>
/*
* This is a hook which is initialised by the dtrace module
* to handle traps which might occur during DTrace probe
* execution.
*/
dtrace_trap_func_t dtrace_trap_func;
dtrace_doubletrap_func_t dtrace_doubletrap_func;
/*
* This is a hook which is initialised by the systrace module
* when it is loaded. This keeps the DTrace syscall provider
* implementation opaque.
*/
systrace_probe_func_t systrace_probe_func;
/*
* These hooks are necessary for the pid and usdt providers.
*/
dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
dtrace_return_probe_ptr_t dtrace_return_probe_ptr;
int (*dtrace_invop_jump_addr)(struct trapframe *); int (*dtrace_invop_jump_addr)(struct trapframe *);
#endif #endif