@@ -98,6 +98,9 @@ struct kprobe {
* Protected by kprobe_mutex after this kprobe is registered.
*/
u32 flags;
+
+ /* For asynchronous unregistration callback */
+ struct rcu_head rcu;
};
/* Kprobe status flags */
@@ -364,6 +367,12 @@ void unregister_kretprobe(struct kretprobe *rp);
int register_kretprobes(struct kretprobe **rps, int num);
void unregister_kretprobes(struct kretprobe **rps, int num);
+/* Async unregister APIs (Do not wait for rcu sync) */
+void kprobe_free_callback(struct rcu_head *head);
+void kretprobe_free_callback(struct rcu_head *head);
+void unregister_kprobe_async(struct kprobe *kp, rcu_callback_t free_cb);
+void unregister_kretprobe_async(struct kretprobe *kp, rcu_callback_t free_cb);
+
void kprobe_flush_task(struct task_struct *tk);
void recycle_rp_inst(struct kretprobe_instance *ri, struct hlist_head *head);
@@ -1887,6 +1887,31 @@ void unregister_kprobes(struct kprobe **kps, int num)
}
EXPORT_SYMBOL_GPL(unregister_kprobes);
+void kprobe_free_callback(struct rcu_head *head)
+{
+ struct kprobe *kp = container_of(head, struct kprobe, rcu);
+
+ __unregister_kprobe_bottom(kp);
+}
+
+/*
+ * If you call this function, you must call kprobe_free_callback() at first
+ * in your free_cb(), or set free_cb = NULL.
+ */
+void unregister_kprobe_async(struct kprobe *kp, rcu_callback_t free_cb)
+{
+ mutex_lock(&kprobe_mutex);
+ if (__unregister_kprobe_top(kp) < 0)
+ kp->addr = NULL;
+ mutex_unlock(&kprobe_mutex);
+
+ if (!kp->addr)
+ return;
+ if (!free_cb)
+ free_cb = kprobe_free_callback;
+ call_rcu(&kp->rcu, free_cb);
+}
+
int __weak kprobe_exceptions_notify(struct notifier_block *self,
unsigned long val, void *data)
{
@@ -2080,6 +2105,29 @@ void unregister_kretprobes(struct kretprobe **rps, int num)
}
EXPORT_SYMBOL_GPL(unregister_kretprobes);
+void kretprobe_free_callback(struct rcu_head *head)
+{
+ struct kprobe *kp = container_of(head, struct kprobe, rcu);
+ struct kretprobe *rp = container_of(kp, struct kretprobe, kp);
+
+ __unregister_kprobe_bottom(kp);
+ cleanup_rp_inst(rp);
+}
+
+void unregister_kretprobe_async(struct kretprobe *rp, rcu_callback_t free_cb)
+{
+ mutex_lock(&kprobe_mutex);
+ if (__unregister_kprobe_top(&rp->kp) < 0)
+ rp->kp.addr = NULL;
+ mutex_unlock(&kprobe_mutex);
+
+ if (!rp->kp.addr)
+ return;
+ if (!free_cb)
+ free_cb = kretprobe_free_callback;
+ call_rcu(&rp->kp.rcu, free_cb);
+}
+
#else /* CONFIG_KRETPROBES */
int register_kretprobe(struct kretprobe *rp)
{
@@ -2109,6 +2157,14 @@ static int pre_handler_kretprobe(struct kprobe *p, struct pt_regs *regs)
}
NOKPROBE_SYMBOL(pre_handler_kretprobe);
+void kretprobe_free_callback(struct rcu_head *head)
+{
+}
+
+void unregister_kretprobe_async(struct kretprobe *rp, rcu_callback_t free_cb)
+{
+}
+
#endif /* CONFIG_KRETPROBES */
/* Set the kprobe gone and remove its instruction buffer. */
Add asynchronous unregistration APIs for kprobes and kretprobes. These APIs can accelerate the unregistration process of multiple probes because user do not need to wait for RCU sync. However, caller must take care of following notes. - If you wants to synchronize unregistration (for example, making sure all handlers are running out), you have to use synchronize_rcu() once at last. - If you need to free objects which related to the kprobes, you can pass a callback, but that callback must call kprobe_free_callback() or kretprobe_free_callback() at first. Since it is easy to shoot your foot, at this moment I don't export these APIs to modules. Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> --- include/linux/kprobes.h | 9 ++++++++ kernel/kprobes.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+)