kprobes: support respawn probes for module probing
RFC PATCH v2 4/5 kprobes: support respawn probes for module probing
Add module_*probe API's to respawn probes on kernel modules.
changes from v1:
- check !CONFIG_MODULES case.
- fix to define empty inline functions for !CONFIG_KPROBES||!CONFIG_MODULES.
---
include/linux/kprobes.h | 44 ++++++++ kernel/kprobes.c | 252 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 296 insertions(+), 0 deletions(-)
include/linux/kprobes.h +44 -0
@@ -37,6 +37,7 @@#include <linux/spinlock.h> #include <linux/rcupdate.h> #include <linux/mutex.h> +#include <linux/module.h> #ifdef CONFIG_KPROBES #include <asm/kprobes.h>
@@ -69,6 +70,7 @@ typedef int (*kprobe_fault_handler_t) (struct kprobe *, struct pt_regs *, int trapnr);typedef int (*kretprobe_handler_t ) (struct kretprobe_instance *,struct pt_regs *); +typedef int (*probe_activate_handler_t )(void *,struct module *);struct kprobe {struct hlist_node hlist;
@@ -279,6 +281,18 @@ void unregister_kretprobes(struct kretprobe **rps, int num);void kprobe_flush_task (struct task_struct *tk);void recycle_rp_inst (struct kretprobe_instance *ri,struct hlist_head *head); +#ifdef CONFIG_MODULES +int register_module_kprobe (struct kprobe *kp, +probe_activate_handler_t handler,void *data); +int register_module_kretprobe (struct kretprobe *rp, +probe_activate_handler_t handler,void *data); +int register_module_jprobe (struct jprobe *jp, +probe_activate_handler_t handler,void *data); +void unregister_module_kprobe (struct kprobe *kp); +void unregister_module_kretprobe (struct kretprobe *rp); +void unregister_module_jprobe (struct jprobe *jp); +#endif /* CONFIG_MODULES */ +#else /* !CONFIG_KPROBES: */ static inline int kprobes_built_in (void )
@@ -346,4 +360,34 @@ static inline void kprobe_flush_task(struct task_struct *tk) { }#endif /* CONFIG_KPROBES */ + +#if !defined(CONFIG_KPROBES ) || !defined(CONFIG_MODULES ) +static inline int register_module_kprobe (struct kprobe *kp, +probe_activate_handler_t handler, +void *data) +{ +return -ENOSYS ; +} +static inline int register_module_kretprobe (struct kretprobe *rp, +probe_activate_handler_t handler, +void *data) +{ +return -ENOSYS ; +} +static inline int register_module_jprobe (struct jprobe *jp, +probe_activate_handler_t handler, +void *data) +{ +return -ENOSYS ; +} +static inline void unregister_module_kprobe (struct kprobe *kp) +{ +} +static inline void unregister_module_kretprobe (struct kretprobe *rp) +{ +} +static inline void unregister_module_jprobe (struct jprobe *jp) +{ +} +#endif /* !CONFIG_KPROBES || !CONFIG_MODULES */ #endif /* _LINUX_KPROBES_H */
kernel/kprobes.c +252 -0
258 lines not on this page · raw message
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: [email protected]
Quoted 182 lines · Masami Hiramatsu
Add module_*probe API's to respawn probes on kernel modules.
changes from v1:
- check !CONFIG_MODULES case.
- fix to define empty inline functions for !CONFIG_KPROBES||!CONFIG_MODULES.Signed-off-by Masami Hiramatsu <[email protected]>Cc Ananth N Mavinakayanahalli <[email protected]>Cc Frederic Weisbecker <[email protected]>---
include/linux/kprobes.h | 44 ++++++++ kernel/kprobes.c | 252 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 296 insertions(+), 0 deletions(-)include/linux/kprobes.h +44
-0@@ -37,6 +37,7 @@#include <linux/spinlock.h> #include <linux/rcupdate.h> #include <linux/mutex.h> +#include <linux/module.h> #ifdef CONFIG_KPROBES #include <asm/kprobes.h> @@ -69,6 +70,7 @@ typedef int (*kprobe_fault_handler_t) (struct kprobe *, struct pt_regs *, int trapnr);typedef int (*kretprobe_handler_t ) (struct kretprobe_instance *,struct pt_regs *); +typedef int (*probe_activate_handler_t )(void *,struct module *);struct kprobe {struct hlist_node hlist;@@ -279,6 +281,18 @@ void unregister_kretprobes(struct kretprobe **rps, int num);void kprobe_flush_task (struct task_struct *tk);void recycle_rp_inst (struct kretprobe_instance *ri,struct hlist_head *head); +#ifdef CONFIG_MODULES +int register_module_kprobe (struct kprobe *kp, +probe_activate_handler_t handler,void *data); +int register_module_kretprobe (struct kretprobe *rp, +probe_activate_handler_t handler,void *data); +int register_module_jprobe (struct jprobe *jp, +probe_activate_handler_t handler,void *data); +void unregister_module_kprobe (struct kprobe *kp); +void unregister_module_kretprobe (struct kretprobe *rp); +void unregister_module_jprobe (struct jprobe *jp); +#endif /* CONFIG_MODULES */ +#else /* !CONFIG_KPROBES: */ static inline int kprobes_built_in (void )@@ -346,4 +360,34 @@ static inline void kprobe_flush_task(struct task_struct *tk) { }#endif /* CONFIG_KPROBES */ + +#if !defined(CONFIG_KPROBES ) || !defined(CONFIG_MODULES ) +static inline int register_module_kprobe (struct kprobe *kp, +probe_activate_handler_t handler, +void *data) +{ +return -ENOSYS ; +} +static inline int register_module_kretprobe (struct kretprobe *rp, +probe_activate_handler_t handler, +void *data) +{ +return -ENOSYS ; +} +static inline int register_module_jprobe (struct jprobe *jp, +probe_activate_handler_t handler, +void *data) +{ +return -ENOSYS ; +} +static inline void unregister_module_kprobe (struct kprobe *kp) +{ +} +static inline void unregister_module_kretprobe (struct kretprobe *rp) +{ +} +static inline void unregister_module_jprobe (struct jprobe *jp) +{ +} +#endif /* !CONFIG_KPROBES || !CONFIG_MODULES */ #endif /* _LINUX_KPROBES_H */ kernel/kprobes.c +84
-0@@ -1416,6 +1416,258 @@ static int __kprobes debugfs_kprobe_init(void)late_initcall (debugfs_kprobe_init);#endif /* CONFIG_DEBUG_FS */ +#ifdef CONFIG_MODULES +/* Kprobes module respawn support */ +enum probe_type { +PROBE_TYPE_KPROBE , +PROBE_TYPE_KRETPROBE , +PROBE_TYPE_JPROBE , +}; + +struct module_probe_client { +struct list_head list; +const char *module;/* including symbol name */ +int active; +void *data; +probe_activate_handler_t handler; +enum probe_type type; +union { +struct kprobe *kp; +struct kretprobe *rp; +struct jprobe *jp; + }; +}; + +static DEFINE_MUTEX (module_probe_mutex); +static LIST_HEAD (module_probe_list); + +static int activate_module_probe (struct module_probe_client *pc) +{ +int ret =0 ; +if (pc->active) +return 0 ; +switch (pc->type) { +case PROBE_TYPE_KPROBE : + ret =register_kprobe (pc->kp); +break ; +case PROBE_TYPE_KRETPROBE : + ret =register_kretprobe (pc->rp); +break ; +case PROBE_TYPE_JPROBE : + ret =register_jprobe (pc->jp); +break ; +default : +WARN_ON (1 ); +break ; + } +if (!ret) + pc->active =1 ; +return ret; +} + +static void deactivate_module_probe (struct module_probe_client *pc) +{ +if (!pc->active) +return ; +switch (pc->type) { +case PROBE_TYPE_KPROBE : +unregister_kprobe (pc->kp); +break ; +case PROBE_TYPE_KRETPROBE : +unregister_kretprobe (pc->rp); +break ; +case PROBE_TYPE_JPROBE : +unregister_jprobe (pc->jp); +break ; +default : +WARN_ON (1 ); +break ; + } + pc->active =0 ; +} + +static const char *probed_module_name (struct kprobe *kp) +{ +if ((kp->symbol_name) &&strchr (kp->symbol_name,':' )) +return kp->symbol_name; +return NULL ; +} + +static int module_is_exist (const char *module) +{ +char buf[MODULE_NAME_LEN +8 ]; +snprintf (buf,MODULE_NAME_LEN +8 ,"%s:__stext" , module); +return module_kallsyms_lookup_name (buf) ?1 :0 ; +} +
kernel/kprobes.c static int __kprobes debugfs_kprobe_init(void) · line 1512
Quoted 10 lines
kernel/kprobes.c +10
-0+static int add_module_probe (const char *module,void *p,enum probe_type type, +probe_activate_handler_t handler,void *data) +{ +struct module_probe_client *pc; +int ret =0 ; + +if (!handler) +return -EINVAL ; + + pc =kzalloc (sizeof (struct module_probe_client ),GFP_KERNEL );
You forgot something here. Right? ;-)
Frederic.
Quoted 171 lines
kernel/kprobes.c +158
-0+ pc->kp = p; + pc->type = type; + pc->module = module; + pc->handler = handler; + pc->data = data; +INIT_LIST_HEAD (&pc->list); + +mutex_lock (&module_probe_mutex); +if (module_is_exist (module)) + ret =activate_module_probe (pc); +if (ret) +kfree (pc); +else +list_add_tail (&pc->list, &module_probe_list); +mutex_unlock (&module_probe_mutex); +return ret; +} + +static void __del_module_probe (struct module_probe_client *pc) +{ +list_del (&pc->list); +deactivate_module_probe (pc); +kfree (pc); +} + +static int del_module_probe (void *p) +{ +struct module_probe_client *pc; +int ret; + +mutex_lock (&module_probe_mutex); +list_for_each_entry (pc, &module_probe_list, list) +if (pc->kp == p) { +/* don't need safe loop, we exit soon */ +__del_module_probe (pc); + goto found; + } + ret = -ENOENT ; +found: +mutex_unlock (&module_probe_mutex); +return ret; +} + +int __kprobes +register_module_kprobe (struct kprobe *kp, +probe_activate_handler_t handler,void *data) +{ +const char *module; + module =probed_module_name (kp); +if (!module) +return register_kprobe (kp); +return add_module_probe (module, kp,PROBE_TYPE_KPROBE , + handler, data); +} +EXPORT_SYMBOL_GPL (register_module_kprobe); + +int __kprobes +register_module_kretprobe (struct kretprobe *rp, +probe_activate_handler_t handler,void *data) +{ +const char *module; + module =probed_module_name (&rp->kp); +if (!module) +return register_kretprobe (rp); +return add_module_probe (module, rp,PROBE_TYPE_KRETPROBE , + handler, data); +} +EXPORT_SYMBOL_GPL (register_module_kretprobe); + +int __kprobes +register_module_jprobe (struct jprobe *jp, +probe_activate_handler_t handler,void *data) +{ +const char *module; + module =probed_module_name (&jp->kp); +if (!module) +return register_jprobe (jp); +return add_module_probe (module, jp,PROBE_TYPE_JPROBE , + handler, data); +} +EXPORT_SYMBOL_GPL (register_module_jprobe); + +void __kprobes unregister_module_kprobe (struct kprobe *kp) +{ +const char *module; + module =probed_module_name (kp); +if (!module) +unregister_kprobe (kp); +else +del_module_probe (kp); +} +EXPORT_SYMBOL_GPL (unregister_module_kprobe); + +void __kprobes unregister_module_kretprobe (struct kretprobe *rp) +{ +const char *module; + module =probed_module_name (&rp->kp); +if (!module) +unregister_kretprobe (rp); +else +del_module_probe (rp); +} +EXPORT_SYMBOL_GPL (unregister_module_kretprobe); + +void __kprobes unregister_module_jprobe (struct jprobe *jp) +{ +const char *module; + module =probed_module_name (&jp->kp); +if (!module) +unregister_jprobe (jp); +else +del_module_probe (jp); +} +EXPORT_SYMBOL_GPL (unregister_module_jprobe); + +static int module_is_probed (const char *mod,const char *sym) +{ +int len =strlen (mod); +return strncmp (mod, sym, len) ==0 && sym[len] ==':' ; +} + +static int module_probe_callback (struct notifier_block *nb, +unsigned long state,void *module) +{ +struct module_probe_client *pc; +struct module *mod = module; +if (state ==MODULE_STATE_LIVE ) +return NOTIFY_DONE ; + +mutex_lock (&module_probe_mutex); +list_for_each_entry (pc, &module_probe_list, list) { +if (!module_is_probed (mod->name, pc->module)) +continue ; +if (state ==MODULE_STATE_COMING && + pc->handler (pc->data, module)) { +activate_module_probe (pc); + }else if (state ==MODULE_STATE_GOING ) +deactivate_module_probe (pc); + } +mutex_unlock (&module_probe_mutex); +return NOTIFY_DONE ; +} + +struct notifier_block module_probe_nb = { + .notifier_call = module_probe_callback +}; + +static int __init init_module_probes (void ) +{ +int ret; + ret =register_module_notifier (&module_probe_nb); +if (ret) +pr_warning ("Failed to register module notifier\n" ); +return ret; +} +module_init (init_module_probes); +#endif /* CONFIG_MODULES */ +module_init (init_kprobes);EXPORT_SYMBOL_GPL (register_kprobe);Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: [email protected]
Quoted 1 line · Frederic Weisbecker
On Fri, Mar 20, 2009 at 09:34:03PM -0400, Masami Hiramatsu wrote:
[...]
Quoted 5 lines
Quoted 5 lines
kernel/kprobes.c +5
-0+static int add_module_probe (const char *module,void *p,enum probe_type type, +probe_activate_handler_t handler,void *data) +{ +struct module_probe_client *pc; +int ret =0 ;
Quoted 8 lines
kernel/kprobes.c static int __kprobes debugfs_kprobe_init(void) · line 1512
Quoted 5 lines
kernel/kprobes.c +5
-0+ +if (!handler) +return -EINVAL ; + + pc =kzalloc (sizeof (struct module_probe_client ),GFP_KERNEL );You forgot something here. Right? ;-)
Oops, sure...
Thank you!
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: [email protected]