aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMasami Hiramatsu <mhiramat@redhat.com>2008-01-30 07:31:21 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:31:21 -0500
commitd6be29b871e285d33be0e3025929e2d6bcabb0c0 (patch)
tree5dbcd8ef953d19e3978062d337c76e4fa103150b /include
parent8533bbe9f87b01f49ff951f665ea1988252fa3c2 (diff)
x86: kprobes code for x86 unification
This patch unifies kprobes code. - Unify kprobes_*.h to kprobes.h - Unify kprobes_*.c to kprobes.c (Differences are separated by ifdefs) - Most differences are related to REX prefix and rip relatives. - Two inline assembly code are different. - One difference in kprobe_handlre() - One fixup exception code is different, but it will be unified if mm/extable_*.c are unified. - Merge history logs into arch/x86/kernel/kprobes.c. Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com> Signed-off-by: Jim Keniston <jkenisto@us.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/kprobes.h103
-rw-r--r--include/asm-x86/kprobes_32.h102
-rw-r--r--include/asm-x86/kprobes_64.h102
3 files changed, 98 insertions, 209 deletions
diff --git a/include/asm-x86/kprobes.h b/include/asm-x86/kprobes.h
index b7bbd25ba2a6..6e6371a856e7 100644
--- a/include/asm-x86/kprobes.h
+++ b/include/asm-x86/kprobes.h
@@ -1,5 +1,98 @@
1#ifdef CONFIG_X86_32 1#ifndef _ASM_KPROBES_H
2# include "kprobes_32.h" 2#define _ASM_KPROBES_H
3#else 3/*
4# include "kprobes_64.h" 4 * Kernel Probes (KProbes)
5#endif 5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19 *
20 * Copyright (C) IBM Corporation, 2002, 2004
21 *
22 * See arch/x86/kernel/kprobes.c for x86 kprobes history.
23 */
24#include <linux/types.h>
25#include <linux/ptrace.h>
26#include <linux/percpu.h>
27
28#define __ARCH_WANT_KPROBES_INSN_SLOT
29
30struct pt_regs;
31struct kprobe;
32
33typedef u8 kprobe_opcode_t;
34#define BREAKPOINT_INSTRUCTION 0xcc
35#define RELATIVEJUMP_INSTRUCTION 0xe9
36#define MAX_INSN_SIZE 16
37#define MAX_STACK_SIZE 64
38#define MIN_STACK_SIZE(ADDR) (((MAX_STACK_SIZE) < \
39 (((unsigned long)current_thread_info()) + THREAD_SIZE \
40 - (unsigned long)(ADDR))) \
41 ? (MAX_STACK_SIZE) \
42 : (((unsigned long)current_thread_info()) + THREAD_SIZE \
43 - (unsigned long)(ADDR)))
44
45#define ARCH_SUPPORTS_KRETPROBES
46#define flush_insn_slot(p) do { } while (0)
47
48extern const int kretprobe_blacklist_size;
49
50void arch_remove_kprobe(struct kprobe *p);
51void kretprobe_trampoline(void);
52
53/* Architecture specific copy of original instruction*/
54struct arch_specific_insn {
55 /* copy of the original instruction */
56 kprobe_opcode_t *insn;
57 /*
58 * boostable = -1: This instruction type is not boostable.
59 * boostable = 0: This instruction type is boostable.
60 * boostable = 1: This instruction has been boosted: we have
61 * added a relative jump after the instruction copy in insn,
62 * so no single-step and fixup are needed (unless there's
63 * a post_handler or break_handler).
64 */
65 int boostable;
66};
67
68struct prev_kprobe {
69 struct kprobe *kp;
70 unsigned long status;
71 unsigned long old_flags;
72 unsigned long saved_flags;
73};
74
75/* per-cpu kprobe control block */
76struct kprobe_ctlblk {
77 unsigned long kprobe_status;
78 unsigned long kprobe_old_flags;
79 unsigned long kprobe_saved_flags;
80 unsigned long *jprobe_saved_sp;
81 struct pt_regs jprobe_saved_regs;
82 kprobe_opcode_t jprobes_stack[MAX_STACK_SIZE];
83 struct prev_kprobe prev_kprobe;
84};
85
86/* trap3/1 are intr gates for kprobes. So, restore the status of IF,
87 * if necessary, before executing the original int3/1 (trap) handler.
88 */
89static inline void restore_interrupts(struct pt_regs *regs)
90{
91 if (regs->flags & IF_MASK)
92 local_irq_enable();
93}
94
95extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
96extern int kprobe_exceptions_notify(struct notifier_block *self,
97 unsigned long val, void *data);
98#endif /* _ASM_KPROBES_H */
diff --git a/include/asm-x86/kprobes_32.h b/include/asm-x86/kprobes_32.h
deleted file mode 100644
index 94dff09b2ebe..000000000000
--- a/include/asm-x86/kprobes_32.h
+++ /dev/null
@@ -1,102 +0,0 @@
1#ifndef _ASM_KPROBES_H
2#define _ASM_KPROBES_H
3/*
4 * Kernel Probes (KProbes)
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19 *
20 * Copyright (C) IBM Corporation, 2002, 2004
21 *
22 * 2002-Oct Created by Vamsi Krishna S <vamsi_krishna@in.ibm.com> Kernel
23 * Probes initial implementation ( includes suggestions from
24 * Rusty Russell).
25 * 2004-Oct Prasanna S Panchamukhi <prasanna@in.ibm.com> and Jim Keniston
26 * kenistoj@us.ibm.com adopted from i386.
27 */
28#include <linux/types.h>
29#include <linux/ptrace.h>
30#include <linux/percpu.h>
31
32#define __ARCH_WANT_KPROBES_INSN_SLOT
33
34struct pt_regs;
35struct kprobe;
36
37typedef u8 kprobe_opcode_t;
38#define BREAKPOINT_INSTRUCTION 0xcc
39#define RELATIVEJUMP_INSTRUCTION 0xe9
40#define MAX_INSN_SIZE 16
41#define MAX_STACK_SIZE 64
42#define MIN_STACK_SIZE(ADDR) (((MAX_STACK_SIZE) < \
43 (((unsigned long)current_thread_info()) + THREAD_SIZE \
44 - (unsigned long)(ADDR))) \
45 ? (MAX_STACK_SIZE) \
46 : (((unsigned long)current_thread_info()) + THREAD_SIZE \
47 - (unsigned long)(ADDR)))
48
49#define ARCH_SUPPORTS_KRETPROBES
50#define flush_insn_slot(p) do { } while (0)
51
52extern const int kretprobe_blacklist_size;
53
54void arch_remove_kprobe(struct kprobe *p);
55void kretprobe_trampoline(void);
56
57/* Architecture specific copy of original instruction*/
58struct arch_specific_insn {
59 /* copy of the original instruction */
60 kprobe_opcode_t *insn;
61 /*
62 * boostable = -1: This instruction type is not boostable.
63 * boostable = 0: This instruction type is boostable.
64 * boostable = 1: This instruction has been boosted: we have
65 * added a relative jump after the instruction copy in insn,
66 * so no single-step and fixup are needed (unless there's
67 * a post_handler or break_handler).
68 */
69 int boostable;
70};
71
72struct prev_kprobe {
73 struct kprobe *kp;
74 unsigned long status;
75 unsigned long old_flags;
76 unsigned long saved_flags;
77};
78
79/* per-cpu kprobe control block */
80struct kprobe_ctlblk {
81 unsigned long kprobe_status;
82 unsigned long kprobe_old_flags;
83 unsigned long kprobe_saved_flags;
84 unsigned long *jprobe_saved_sp;
85 struct pt_regs jprobe_saved_regs;
86 kprobe_opcode_t jprobes_stack[MAX_STACK_SIZE];
87 struct prev_kprobe prev_kprobe;
88};
89
90/* trap3/1 are intr gates for kprobes. So, restore the status of IF,
91 * if necessary, before executing the original int3/1 (trap) handler.
92 */
93static inline void restore_interrupts(struct pt_regs *regs)
94{
95 if (regs->flags & IF_MASK)
96 local_irq_enable();
97}
98
99extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
100extern int kprobe_exceptions_notify(struct notifier_block *self,
101 unsigned long val, void *data);
102#endif /* _ASM_KPROBES_H */
diff --git a/include/asm-x86/kprobes_64.h b/include/asm-x86/kprobes_64.h
deleted file mode 100644
index 94dff09b2ebe..000000000000
--- a/include/asm-x86/kprobes_64.h
+++ /dev/null
@@ -1,102 +0,0 @@
1#ifndef _ASM_KPROBES_H
2#define _ASM_KPROBES_H
3/*
4 * Kernel Probes (KProbes)
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19 *
20 * Copyright (C) IBM Corporation, 2002, 2004
21 *
22 * 2002-Oct Created by Vamsi Krishna S <vamsi_krishna@in.ibm.com> Kernel
23 * Probes initial implementation ( includes suggestions from
24 * Rusty Russell).
25 * 2004-Oct Prasanna S Panchamukhi <prasanna@in.ibm.com> and Jim Keniston
26 * kenistoj@us.ibm.com adopted from i386.
27 */
28#include <linux/types.h>
29#include <linux/ptrace.h>
30#include <linux/percpu.h>
31
32#define __ARCH_WANT_KPROBES_INSN_SLOT
33
34struct pt_regs;
35struct kprobe;
36
37typedef u8 kprobe_opcode_t;
38#define BREAKPOINT_INSTRUCTION 0xcc
39#define RELATIVEJUMP_INSTRUCTION 0xe9
40#define MAX_INSN_SIZE 16
41#define MAX_STACK_SIZE 64
42#define MIN_STACK_SIZE(ADDR) (((MAX_STACK_SIZE) < \
43 (((unsigned long)current_thread_info()) + THREAD_SIZE \
44 - (unsigned long)(ADDR))) \
45 ? (MAX_STACK_SIZE) \
46 : (((unsigned long)current_thread_info()) + THREAD_SIZE \
47 - (unsigned long)(ADDR)))
48
49#define ARCH_SUPPORTS_KRETPROBES
50#define flush_insn_slot(p) do { } while (0)
51
52extern const int kretprobe_blacklist_size;
53
54void arch_remove_kprobe(struct kprobe *p);
55void kretprobe_trampoline(void);
56
57/* Architecture specific copy of original instruction*/
58struct arch_specific_insn {
59 /* copy of the original instruction */
60 kprobe_opcode_t *insn;
61 /*
62 * boostable = -1: This instruction type is not boostable.
63 * boostable = 0: This instruction type is boostable.
64 * boostable = 1: This instruction has been boosted: we have
65 * added a relative jump after the instruction copy in insn,
66 * so no single-step and fixup are needed (unless there's
67 * a post_handler or break_handler).
68 */
69 int boostable;
70};
71
72struct prev_kprobe {
73 struct kprobe *kp;
74 unsigned long status;
75 unsigned long old_flags;
76 unsigned long saved_flags;
77};
78
79/* per-cpu kprobe control block */
80struct kprobe_ctlblk {
81 unsigned long kprobe_status;
82 unsigned long kprobe_old_flags;
83 unsigned long kprobe_saved_flags;
84 unsigned long *jprobe_saved_sp;
85 struct pt_regs jprobe_saved_regs;
86 kprobe_opcode_t jprobes_stack[MAX_STACK_SIZE];
87 struct prev_kprobe prev_kprobe;
88};
89
90/* trap3/1 are intr gates for kprobes. So, restore the status of IF,
91 * if necessary, before executing the original int3/1 (trap) handler.
92 */
93static inline void restore_interrupts(struct pt_regs *regs)
94{
95 if (regs->flags & IF_MASK)
96 local_irq_enable();
97}
98
99extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
100extern int kprobe_exceptions_notify(struct notifier_block *self,
101 unsigned long val, void *data);
102#endif /* _ASM_KPROBES_H */
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-20 00:07:40 -0500