kprobes: Support per-kprobe disabling
Subsystems (2)
RFC PATCH 5/6 kprobes: Support per-kprobe disabling
Add disable_kprobe() and enable_kprobe() to disable/enable kprobes temporarily.
disable_kprobe() asynchronously disables probe handlers of specified kprobe. So, after calling it, some handlers can be called at a while. enable_kprobe() enables specified kprobe.
aggr_pre_handler and aggr_post_handler check disabled probes. On the other hand aggr_break_handler and aggr_fault_handler don't check it because these handlers will be called while executing pre or post handlers and usually those help error handling.
Signed-off-by Masami Hiramatsu <[email protected]>
--- Documentation/kprobes.txt | 34 +++++++-- include/linux/kprobes.h | 22 +++++- kernel/kprobes.c | 167 ++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 190 insertions(+), 33 deletions(-)
include/linux/kprobes.h +21 -1
@@ -108,18 +108,28 @@ struct kprobe {/* copy of the original instruction */ struct arch_specific_insn ainsn; -/* Indicates various status flags. Protected by kprobe_mutex. */ +/* +* Indicates various status flags. +* Protected by kprobe_mutex after this kprobe is registered. +*/ u32 flags; };/* Kprobe status flags */ #define KPROBE_FLAG_GONE 1/* breakpoint has already gone */ +#define KPROBE_FLAG_DISABLED 2/* probe is temporarily disabled */ +/* Has this kprobe gone ? */ static inline int kprobe_gone (struct kprobe *p) {return p->flags &KPROBE_FLAG_GONE ; } +/* Is this kprobe disabled ? */ +static inline int kprobe_disabled (struct kprobe *p) +{ +return p->flags & (KPROBE_FLAG_DISABLED |KPROBE_FLAG_GONE ); +}/* * Special probe type that uses setjmp-longjmp type tricks to resume * execution at a specified entry with a matching prototype corresponding
@@ -271,6 +281,8 @@ void unregister_kretprobes(struct kretprvoid kprobe_flush_task (struct task_struct *tk);void recycle_rp_inst (struct kretprobe_instance *ri,struct hlist_head *head); +int disable_kprobe (struct kprobe *kp); +int enable_kprobe (struct kprobe *kp);#else /* CONFIG_KPROBES */ static inline struct kprobe *get_kprobe (void *addr)
@@ -329,5 +341,13 @@ static inline void unregister_kretprobesstatic inline void kprobe_flush_task (struct task_struct *tk) { } +static inline int disable_kprobe (struct kprobe *kp) +{ +return -ENOSYS ; +} +static inline int enable_kprobe (struct kprobe *kp) +{ +return -ENOSYS ; +}#endif /* CONFIG_KPROBES */ #endif /* _LINUX_KPROBES_H */
kernel/kprobes.c +141 -26
277 lines not on this page · raw message
Documentation/kprobes.txt +28 -6
@@ -212,7 +212,9 @@ hit, Kprobes calls kp->pre_handler. Aft is single-stepped, Kprobe calls kp->post_handler. If a fault occurs during execution of kp->pre_handler or kp->post_handler, or during single-stepping of the probed instruction, Kprobes calls -kp->fault_handler. Any or all handlers can be NULL. +kp->fault_handler. Any or all handlers can be NULL. If kp->flags +is set KPROBE_FLAG_DISABLED, that kp will be registered but disabled, +so, it's handlers aren't hit until calling enable_kprobe(kp). NOTE: 1. With the introduction of the "symbol_name" field to struct kprobe,
@@ -363,6 +365,22 @@ probes) in the specified array, they cle incorrect probes. However, other probes in the array are unregistered correctly. +4.7 disable_kprobe + +#include <linux/kprobes.h> +int disable_kprobe(struct kprobe *kp); + +Temporarily disables the specified kprobe. You can enable it again by using +enable_kprobe(). You must specify the kprobe which has been registered. + +4.8 enable_kprobe + +#include <linux/kprobes.h> +int enable_kprobe(struct kprobe *kp); + +Enables kprobe which has been disabled by disable_kprobe(). You must specify +the kprobe which has been registered. + 5. Kprobes Features and Limitations Kprobes allows multiple probes at the same address. Currently,
@@ -500,10 +518,14 @@ the probe. If the probed function belong is also specified. Following columns show probe status. If the probe is on a virtual address that is no longer valid (module init sections, module virtual addresses that correspond to modules that've been unloaded), -such probes are marked with [GONE]. +such probes are marked with [GONE]. If the probe is temporarily disabled, +such probes are marked with [DISABLED]. -/debug/kprobes/enabled: Turn kprobes ON/OFF +/debug/kprobes/enabled: Turn kprobes ON/OFF forcibly. -Provides a knob to globally turn registered kprobes ON or OFF. By default, -all kprobes are enabled. By echoing "0" to this file, all registered probes -will be disarmed, till such time a "1" is echoed to this file. +Provides a knob to globally and forcibly turn registered kprobes ON or OFF. +By default, all kprobes are enabled. By echoing "0" to this file, all +registered probes will be disarmed, till such time a "1" is echoed to this +file. Note that this knob just disarms and arms all kprobes and doesn't +change each probe's disabling state. This means that disabled kprobes (marked +[DISABLED]) will be not enabled if you turn ON all kprobes by this knob.
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: [email protected]