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

Restore the trap type argument to the DTrace trap hook, removed in r268600.

Browse Source 
It's redundant at the moment since it can be obtained from the trapframe
on the architectures where DTrace is supported, but this won't be the case
with ARM.
This commit is contained in:
markj 2014-12-23 15:38:19 +00:00
parent 5130d48f9c
commit 7ea63e4fb4
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -614,7 +614,8 @@ trap_check(struct trapframe *frame)
{
#ifdef KDTRACE_HOOKS
if (dtrace_trap_func != NULL && (*dtrace_trap_func)(frame))
if (dtrace_trap_func != NULL &&
(*dtrace_trap_func)(frame, frame->tf_trapno) != 0)
return;
#endif
trap(frame);

4
sys/cddl/dev/dtrace/amd64/dtrace_subr.c
View File

@ -464,7 +464,7 @@ dtrace_gethrestime(void)
/* Function to handle DTrace traps during probes. See amd64/amd64/trap.c. */
int
dtrace_trap(struct trapframe *frame)
dtrace_trap(struct trapframe *frame, u_int type)
{
/*
* A trap can occur while DTrace executes a probe. Before
@ -480,7 +480,7 @@ dtrace_trap(struct trapframe *frame)
* There are only a couple of trap types that are expected.
* All the rest will be handled in the usual way.
*/
switch (frame->tf_trapno) {
switch (type) {
/* General protection fault. */
case T_PROTFLT:
/* Flag an illegal operation. */

4
sys/cddl/dev/dtrace/i386/dtrace_subr.c
View File

@ -473,7 +473,7 @@ dtrace_gethrestime(void)
/* Function to handle DTrace traps during probes. See i386/i386/trap.c */
int
dtrace_trap(struct trapframe *frame)
dtrace_trap(struct trapframe *frame, u_int type)
{
/*
* A trap can occur while DTrace executes a probe. Before
@ -489,7 +489,7 @@ dtrace_trap(struct trapframe *frame)
* There are only a couple of trap types that are expected.
* All the rest will be handled in the usual way.
*/
switch (frame->tf_trapno) {
switch (type) {
/* General protection fault. */
case T_PROTFLT:
/* Flag an illegal operation. */

5
sys/cddl/dev/dtrace/mips/dtrace_subr.c
View File

@ -137,11 +137,8 @@ dtrace_gethrestime(void)
/* Function to handle DTrace traps during probes. See amd64/amd64/trap.c */
int
dtrace_trap(struct trapframe *frame)
dtrace_trap(struct trapframe *frame, u_int type)
{
u_int type;
type = (trapframe->cause & MIPS_CR_EXC_CODE) >> MIPS_CR_EXC_CODE_SHIFT;
/*
* A trap can occur while DTrace executes a probe. Before

5
sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
View File

@ -262,8 +262,9 @@ dtrace_gethrestime(void)
/* Function to handle DTrace traps during probes. See powerpc/powerpc/trap.c */
int
dtrace_trap(struct trapframe *frame)
dtrace_trap(struct trapframe *frame, u_int type)
{
/*
* A trap can occur while DTrace executes a probe. Before
* executing the probe, DTrace blocks re-scheduling and sets
@ -278,7 +279,7 @@ dtrace_trap(struct trapframe *frame)
* There are only a couple of trap types that are expected.
* All the rest will be handled in the usual way.
*/
switch (frame->exc) {
switch (type) {
/* Page fault. */
case EXC_DSI:
case EXC_DSE:

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

@ -246,7 +246,7 @@ trap(struct trapframe *frame)
* flag is cleared and finally re-scheduling is enabled.
*/
if ((type == T_PROTFLT || type == T_PAGEFLT) &&
dtrace_trap_func != NULL && (*dtrace_trap_func)(frame))
dtrace_trap_func != NULL && (*dtrace_trap_func)(frame, type))
goto out;
#endif

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

@ -617,7 +617,8 @@ trap(struct trapframe *trapframe)
* XXXDTRACE: add pid probe handler here (if ever)
*/
if (!usermode) {
if (dtrace_trap_func != NULL && (*dtrace_trap_func)(trapframe))
if (dtrace_trap_func != NULL &&
(*dtrace_trap_func)(trapframe, type) != 0)
return (trapframe->pc);
}
#endif

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

@ -177,7 +177,7 @@ trap(struct trapframe *frame)
* handled the trap and modified the trap frame so that this
* function can return normally.
*/
if (dtrace_trap_func != NULL && (*dtrace_trap_func)(frame))
if (dtrace_trap_func != NULL && (*dtrace_trap_func)(frame, type) != 0)
return;
#endif

4
sys/sys/dtrace_bsd.h
View File

@ -39,14 +39,14 @@ struct vattr;
struct vnode;
struct reg;
int dtrace_trap(struct trapframe *);
int dtrace_trap(struct trapframe *, u_int);
/*
* The dtrace module handles traps that occur during a DTrace probe.
* This type definition is used in the trap handler to provide a
* hook for the dtrace module to register its handler with.
*/
typedef int (*dtrace_trap_func_t)(struct trapframe *);
typedef int (*dtrace_trap_func_t)(struct trapframe *, u_int);
extern dtrace_trap_func_t dtrace_trap_func;
/*