kprobes: fix module compilation error with CONFIG_KPROBES=n
PATCH 1/1 kprobes: fix module compilation error with CONFIG_KPROBES=n
Define kprobes related data structures even if CONFIG_KPROBES is not set. This fixes compilation errors which occur if CONFIG_KPROBES is not set, in kprobe using modules.
--- include/linux/kprobes.h | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-)
include/linux/kprobes.h +23 -22
@@ -37,9 +37,9 @@#include <linux/spinlock.h> #include <linux/rcupdate.h> #include <linux/mutex.h> +#include <asm/kprobes.h> #ifdef CONFIG_KPROBES -#include <asm/kprobes.h> /* kprobe_status settings */ #define KPROBE_HIT_ACTIVE 0x00000001
@@ -49,6 +49,9 @@/* Attach to insert probes on any functions which should be ignored*/ #define __kprobes __attribute__((__section__(".kprobes.text"))) notrace +#else /* CONFIG_KPROBES */ +#define __kprobes notrace +#endif /* CONFIG_KPROBES */ struct kprobe ;struct pt_regs ;
@@ -131,23 +134,6 @@ struct jprobe {/* For backward compatibility with old code using JPROBE_ENTRY() */ #define JPROBE_ENTRY (handler) (handler) -DECLARE_PER_CPU(struct kprobe *, current_kprobe); -DECLARE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); - -#ifdef CONFIG_KRETPROBES -extern void arch_prepare_kretprobe (struct kretprobe_instance *ri, -struct pt_regs *regs); -extern int arch_trampoline_kprobe (struct kprobe *p); -#else /* CONFIG_KRETPROBES */ -static inline void arch_prepare_kretprobe (struct kretprobe *rp, -struct pt_regs *regs) -{ -} -static inline int arch_trampoline_kprobe (struct kprobe *p) -{ -return 0 ; -} -#endif /* CONFIG_KRETPROBES */ /* * Function-return probe - * Note:
@@ -188,6 +174,25 @@ struct kprobe_blackpoint {unsigned long range; }; +#ifdef CONFIG_KPROBES +DECLARE_PER_CPU(struct kprobe *, current_kprobe); +DECLARE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); + +#ifdef CONFIG_KRETPROBES +extern void arch_prepare_kretprobe (struct kretprobe_instance *ri, +struct pt_regs *regs); +extern int arch_trampoline_kprobe (struct kprobe *p); +#else /* CONFIG_KRETPROBES */ +static inline void arch_prepare_kretprobe (struct kretprobe *rp, +struct pt_regs *regs) +{ +} +static inline int arch_trampoline_kprobe (struct kprobe *p) +{ +return 0 ; +} +#endif /* CONFIG_KRETPROBES */ +extern struct kretprobe_blackpoint kretprobe_blacklist[]; static inline void kretprobe_assert(struct kretprobe_instance *ri,
@@ -264,10 +269,6 @@ void recycle_rp_inst(struct kretprobe_in#else /* CONFIG_KPROBES */ -#define __kprobes notrace -struct jprobe ; -struct kretprobe ; -static inline struct kprobe *get_kprobe (void *addr) {return NULL ;
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: [email protected]
Oops, this patch was actually for -mm tree.
Quoted 96 lines · Masami Hiramatsu
Define kprobes related data structures even if
CONFIG_KPROBESis not set. This fixes compilation errors which occur ifCONFIG_KPROBESis not set, in kprobe using modules.Reviewed-by Ananth N Mavinakayanahalli <[email protected]>Signed-off-by Masami Hiramatsu <[email protected]>--- include/linux/kprobes.h | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-)Index:
2.6.28/include/linux/kprobes.h
===================================================================include/linux/kprobes.h +23
-22@@ -37,9 +37,9 @@#include <linux/spinlock.h> #include <linux/rcupdate.h> #include <linux/mutex.h> +#include <asm/kprobes.h> #ifdef CONFIG_KPROBES -#include <asm/kprobes.h> /* kprobe_status settings */ #define KPROBE_HIT_ACTIVE 0x00000001@@ -49,6 +49,9 @@/* Attach to insert probes on any functions which should be ignored*/ #define __kprobes __attribute__((__section__(".kprobes.text"))) notrace +#else /* CONFIG_KPROBES */ +#define __kprobes notrace +#endif /* CONFIG_KPROBES */ struct kprobe ;struct pt_regs ;@@ -131,23 +134,6 @@ struct jprobe {/* For backward compatibility with old code using JPROBE_ENTRY() */ #define JPROBE_ENTRY (handler) (handler) -DECLARE_PER_CPU(struct kprobe *, current_kprobe); -DECLARE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); - -#ifdef CONFIG_KRETPROBES -extern void arch_prepare_kretprobe (struct kretprobe_instance *ri, -struct pt_regs *regs); -extern int arch_trampoline_kprobe (struct kprobe *p); -#else /* CONFIG_KRETPROBES */ -static inline void arch_prepare_kretprobe (struct kretprobe *rp, -struct pt_regs *regs) -{ -} -static inline int arch_trampoline_kprobe (struct kprobe *p) -{ -return 0 ; -} -#endif /* CONFIG_KRETPROBES */ /* * Function-return probe - * Note: @@ -188,6 +174,25 @@ struct kprobe_blackpoint {unsigned long range; }; +#ifdef CONFIG_KPROBES +DECLARE_PER_CPU(struct kprobe *, current_kprobe); +DECLARE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); + +#ifdef CONFIG_KRETPROBES +extern void arch_prepare_kretprobe (struct kretprobe_instance *ri, +struct pt_regs *regs); +extern int arch_trampoline_kprobe (struct kprobe *p); +#else /* CONFIG_KRETPROBES */ +static inline void arch_prepare_kretprobe (struct kretprobe *rp, +struct pt_regs *regs) +{ +} +static inline int arch_trampoline_kprobe (struct kprobe *p) +{ +return 0 ; +} +#endif /* CONFIG_KRETPROBES */ +extern struct kretprobe_blackpoint kretprobe_blacklist[]; static inline void kretprobe_assert(struct kretprobe_instance *ri,@@ -264,10 +269,6 @@ void recycle_rp_inst(struct kretprobe_in#else /* CONFIG_KPROBES */ -#define __kprobes notrace -struct jprobe ; -struct kretprobe ; -static inline struct kprobe *get_kprobe (void *addr) {return NULL ;
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: [email protected]
Quoted 9 lines · On Tue, 06 Jan 2009 11:39:39 -0500 Masami Hiramatsu <[email protected]> wrote:
Quoted 4 lines · Masami Hiramatsu
Define kprobes related data structures even if
CONFIG_KPROBESis not set. This fixes compilation errors which occur ifCONFIG_KPROBESis not set, in kprobe using modules.Oops, this patch was actually for -mm tree.
I assume it's needed in mainline now.
Quoted 5 lines · Andrew Morton
Quoted 2 lines · On Tue, 06 Jan 2009 11:39:39 -0500 Masami Hiramatsu <[email protected]> wrote:
Masami Hiramatsu wrote:
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Define kprobes related data structures even if
CONFIG_KPROBESis not set. This fixes compilation errors which occur ifCONFIG_KPROBESis not set, in kprobe using modules.Oops, this patch was actually for -mm tree.
I assume it's needed in mainline now.
Agreed.
Thank you,
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: [email protected]
Quoted 15 lines · On Mon, 05 Jan 2009 17:23:05 -0500 Masami Hiramatsu <[email protected]> wrote:
Define kprobes related data structures even if
CONFIG_KPROBESis not set. This fixes compilation errors which occur ifCONFIG_KPROBESis not set, in kprobe using modules.Reviewed-by Ananth N Mavinakayanahalli <[email protected]>Signed-off-by Masami Hiramatsu <[email protected]>--- include/linux/kprobes.h | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-)Index:
2.6.28/include/linux/kprobes.h
===================================================================
include/linux/kprobes.h line 43
Quoted 8 lines
include/linux/kprobes.h +1
-1@@ -37,9 +37,9 @@#include <linux/spinlock.h> #include <linux/rcupdate.h> #include <linux/mutex.h> +#include <asm/kprobes.h> #ifdef CONFIG_KPROBES -#include <asm/kprobes.h>
The above change breaks alpha, and any other architecture which has no asm/kprobes.h.
I undid that change, but maybe that rebroke things?
Quoted 22 lines · Andrew Morton
Quoted 20 lines · On Mon, 05 Jan 2009 17:23:05 -0500 Masami Hiramatsu <[email protected]> wrote:
Define kprobes related data structures even if
CONFIG_KPROBESis not set. This fixes compilation errors which occur ifCONFIG_KPROBESis not set, in kprobe using modules.Reviewed-by Ananth N Mavinakayanahalli <[email protected]>Signed-off-by Masami Hiramatsu <[email protected]>--- include/linux/kprobes.h | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-)Index:
2.6.28/include/linux/kprobes.h
===================================================================include/linux/kprobes.h +1
-0@@ -37,9 +37,9 @@#include <linux/spinlock.h> #include <linux/rcupdate.h> #include <linux/mutex.h> +#include <asm/kprobes.h>
Quoted 6 lines
include/linux/kprobes.h line 43
Quoted 3 lines
include/linux/kprobes.h +0
-1#ifdef CONFIG_KPROBES -#include <asm/kprobes.h> The above change breaks alpha, and any other architecture which has no
asm/kprobes.h.
Oops, indeed. Thank you for finding it!
Quoted 1 line
I undid that change, but maybe that rebroke things?
Yes, some structures should be defined in asm/kprobes.h, so here is an additional fix patch.
------------------------------------------------------
From: Masami Hiramatsu <[email protected]>
Add dummy definitions of kprobe_opcode_t and arch_specific_insn when CONFIG_KPROBES=n.
--- include/linux/kprobes.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/kprobes.h +4 -0
@@ -50,6 +50,10 @@/* Attach to insert probes on any functions which should be ignored*/ #define __kprobes __attribute__((__section__(".kprobes.text"))) notrace#else /* CONFIG_KPROBES */ +typedef int kprobe_opcode_t ; +struct arch_specific_insn { +int dummy; +};#define __kprobes notrace#endif /* CONFIG_KPROBES */
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: [email protected]