summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/amd64/amd64/trap.c15
-rw-r--r--sys/cddl/dev/dtrace/amd64/dtrace_subr.c8
-rw-r--r--sys/i386/i386/trap.c14
-rw-r--r--sys/mips/mips/trap.c5
-rw-r--r--sys/powerpc/aim/trap.c5
-rw-r--r--sys/sys/dtrace_bsd.h2
-rw-r--r--sys/x86/include/trap.h1
7 files changed, 11 insertions, 39 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 4691014..3d319cd 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -114,9 +114,8 @@ dtrace_doubletrap_func_t dtrace_doubletrap_func;
systrace_probe_func_t systrace_probe_func;
/*
- * These hooks are necessary for the pid, usdt and fasttrap providers.
+ * These hooks are necessary for the pid and usdt providers.
*/
-dtrace_fasttrap_probe_ptr_t dtrace_fasttrap_probe_ptr;
dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
dtrace_return_probe_ptr_t dtrace_return_probe_ptr;
#endif
@@ -128,7 +127,7 @@ void dblfault_handler(struct trapframe *frame);
static int trap_pfault(struct trapframe *, int);
static void trap_fatal(struct trapframe *, vm_offset_t);
-#define MAX_TRAP_MSG 33
+#define MAX_TRAP_MSG 32
static char *trap_msg[] = {
"", /* 0 unused */
"privileged instruction fault", /* 1 T_PRIVINFLT */
@@ -163,7 +162,6 @@ static char *trap_msg[] = {
"reserved (unknown) fault", /* 30 T_RESERVED */
"", /* 31 unused (reserved) */
"DTrace pid return trap", /* 32 T_DTRACE_RET */
- "DTrace fasttrap probe trap", /* 33 T_DTRACE_PROBE */
};
#ifdef KDB
@@ -255,16 +253,11 @@ trap(struct trapframe *frame)
* handled the trap and modified the trap frame so that this
* function can return normally.
*/
- if (type == T_DTRACE_PROBE || type == T_DTRACE_RET ||
- type == T_BPTFLT) {
+ if (type == T_DTRACE_RET || type == T_BPTFLT) {
struct reg regs;
fill_frame_regs(frame, &regs);
- if (type == T_DTRACE_PROBE &&
- dtrace_fasttrap_probe_ptr != NULL &&
- dtrace_fasttrap_probe_ptr(&regs) == 0)
- goto out;
- else if (type == T_BPTFLT &&
+ if (type == T_BPTFLT &&
dtrace_pid_probe_ptr != NULL &&
dtrace_pid_probe_ptr(&regs) == 0)
goto out;
diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
index 1ec1509..bdd6fbe 100644
--- a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
@@ -142,7 +142,6 @@ dtrace_sync(void)
}
#ifdef notyet
-int (*dtrace_fasttrap_probe_ptr)(struct regs *);
int (*dtrace_pid_probe_ptr)(struct regs *);
int (*dtrace_return_probe_ptr)(struct regs *);
@@ -213,13 +212,6 @@ dtrace_user_probe(struct regs *rp, caddr_t addr, processorid_t cpuid)
rw_exit(rwp);
rp->r_pc = npc;
- } else if (rp->r_trapno == T_DTRACE_PROBE) {
- rwp = &CPU->cpu_ft_lock;
- rw_enter(rwp, RW_READER);
- if (dtrace_fasttrap_probe_ptr != NULL)
- (void) (*dtrace_fasttrap_probe_ptr)(rp);
- rw_exit(rwp);
-
} else if (rp->r_trapno == T_BPTFLT) {
uint8_t instr;
rwp = &CPU->cpu_ft_lock;
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 3fe7c0c..f9a5bff 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -123,9 +123,8 @@ dtrace_doubletrap_func_t dtrace_doubletrap_func;
systrace_probe_func_t systrace_probe_func;
/*
- * These hooks are necessary for the pid, usdt and fasttrap providers.
+ * These hooks are necessary for the pid and usdt providers.
*/
-dtrace_fasttrap_probe_ptr_t dtrace_fasttrap_probe_ptr;
dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
dtrace_return_probe_ptr_t dtrace_return_probe_ptr;
#endif
@@ -139,7 +138,7 @@ void dblfault_handler(void);
extern inthand_t IDTVEC(lcall_syscall);
-#define MAX_TRAP_MSG 33
+#define MAX_TRAP_MSG 32
static char *trap_msg[] = {
"", /* 0 unused */
"privileged instruction fault", /* 1 T_PRIVINFLT */
@@ -174,8 +173,6 @@ static char *trap_msg[] = {
"reserved (unknown) fault", /* 30 T_RESERVED */
"", /* 31 unused (reserved) */
"DTrace pid return trap", /* 32 T_DTRACE_RET */
- "DTrace fasttrap probe trap", /* 33 T_DTRACE_PROBE */
-
};
#if defined(I586_CPU) && !defined(NO_F00F_HACK)
@@ -275,15 +272,10 @@ trap(struct trapframe *frame)
* handled the trap and modified the trap frame so that this
* function can return normally.
*/
- if (type == T_DTRACE_PROBE || type == T_DTRACE_RET ||
- type == T_BPTFLT) {
+ if (type == T_DTRACE_RET || type == T_BPTFLT) {
struct reg regs;
fill_frame_regs(frame, &regs);
- if (type == T_DTRACE_PROBE &&
- dtrace_fasttrap_probe_ptr != NULL &&
- dtrace_fasttrap_probe_ptr(&regs) == 0)
- goto out;
if (type == T_BPTFLT &&
dtrace_pid_probe_ptr != NULL &&
dtrace_pid_probe_ptr(&regs) == 0)
diff --git a/sys/mips/mips/trap.c b/sys/mips/mips/trap.c
index c194112..9e1f9b8 100644
--- a/sys/mips/mips/trap.c
+++ b/sys/mips/mips/trap.c
@@ -112,9 +112,8 @@ dtrace_doubletrap_func_t dtrace_doubletrap_func;
systrace_probe_func_t systrace_probe_func;
/*
- * These hooks are necessary for the pid, usdt and fasttrap providers.
+ * These hooks are necessary for the pid and usdt providers.
*/
-dtrace_fasttrap_probe_ptr_t dtrace_fasttrap_probe_ptr;
dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
dtrace_return_probe_ptr_t dtrace_return_probe_ptr;
#endif
@@ -639,7 +638,7 @@ trap(struct trapframe *trapframe)
* function can return normally.
*/
/*
- * XXXDTRACE: add fasttrap and pid probes handlers here (if ever)
+ * XXXDTRACE: add pid probe handler here (if ever)
*/
if (!usermode) {
if (dtrace_trap_func != NULL && (*dtrace_trap_func)(trapframe, type))
diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c
index 41e1a79..d234ba2 100644
--- a/sys/powerpc/aim/trap.c
+++ b/sys/powerpc/aim/trap.c
@@ -121,9 +121,8 @@ dtrace_doubletrap_func_t dtrace_doubletrap_func;
systrace_probe_func_t systrace_probe_func;
/*
- * These hooks are necessary for the pid, usdt and fasttrap providers.
+ * These hooks are necessary for the pid and usdt providers.
*/
-dtrace_fasttrap_probe_ptr_t dtrace_fasttrap_probe_ptr;
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 *);
@@ -208,7 +207,7 @@ trap(struct trapframe *frame)
* function can return normally.
*/
/*
- * XXXDTRACE: add fasttrap and pid probes handlers here (if ever)
+ * XXXDTRACE: add pid probe handler here (if ever)
*/
if (dtrace_trap_func != NULL && (*dtrace_trap_func)(frame, type))
return;
diff --git a/sys/sys/dtrace_bsd.h b/sys/sys/dtrace_bsd.h
index 2198b26..fa54d7e 100644
--- a/sys/sys/dtrace_bsd.h
+++ b/sys/sys/dtrace_bsd.h
@@ -70,8 +70,6 @@ extern dtrace_invop_func_t dtrace_invop_func;
extern dtrace_doubletrap_func_t dtrace_doubletrap_func;
/* Pid provider hooks */
-typedef int (*dtrace_fasttrap_probe_ptr_t)(struct reg *);
-extern dtrace_fasttrap_probe_ptr_t dtrace_fasttrap_probe_ptr;
typedef int (*dtrace_pid_probe_ptr_t)(struct reg *);
extern dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
typedef int (*dtrace_return_probe_ptr_t)(struct reg *);
diff --git a/sys/x86/include/trap.h b/sys/x86/include/trap.h
index a395d62..c0d9e16 100644
--- a/sys/x86/include/trap.h
+++ b/sys/x86/include/trap.h
@@ -63,7 +63,6 @@
#define T_XMMFLT 29 /* SIMD floating-point exception */
#define T_RESERVED 30 /* reserved (unknown) */
#define T_DTRACE_RET 32 /* DTrace pid return */
-#define T_DTRACE_PROBE 33 /* DTrace fasttrap probe */
/* XXX most of the following codes aren't used, but could be. */
OpenPOWER on IntegriCloud