diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index bd8860eeb291..eea80709d1ed 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -414,6 +414,7 @@ struct perf_event_attr {
union {
__u32 wakeup_events; /* wakeup every n events */
__u32 wakeup_watermark; /* bytes before wakeup */
+ __u32 probe_cnt; /* number of [k,u] probes */
};
__u32 bp_type;diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c
index a114549720d6..26078e40c299 100644
--- a/kernel/trace/trace_event_perf.c
+++ b/kernel/trace/trace_event_perf.c
@@ -245,23 +245,27 @@ void perf_trace_destroy(struct perf_event *p_event)
}
#ifdef CONFIG_KPROBE_EVENTS
-int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe)
+static struct trace_event_call*
+kprobe_init(bool is_retprobe, u64 kprobe_func, u64 kprobe_addr,
+ u64 probe_offset, struct trace_event_call *old)
{
int ret;
char *func = NULL;
struct trace_event_call *tp_event;
- if (p_event->attr.kprobe_func) {
+ if (kprobe_func) {
func = kzalloc(KSYM_NAME_LEN, GFP_KERNEL);
if (!func)
- return -ENOMEM;
+ return ERR_PTR(-ENOMEM);
ret = strncpy_from_user(
- func, u64_to_user_ptr(p_event->attr.kprobe_func),
+ func, u64_to_user_ptr(kprobe_func),
KSYM_NAME_LEN);
if (ret == KSYM_NAME_LEN)
ret = -E2BIG;
- if (ret < 0)
- goto out;
+ if (ret < 0) {
+ kfree(func);
+ return ERR_PTR(ret);
+ }
if (func[0] == '\0') {
kfree(func);@@ -270,20 +274,96 @@ int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe)
}
tp_event = create_local_trace_kprobe(
- func, (void *)(unsigned long)(p_event->attr.kprobe_addr),
- p_event->attr.probe_offset, is_retprobe);
- if (IS_ERR(tp_event)) {
- ret = PTR_ERR(tp_event);
- goto out;
+ func, (void *)(unsigned long)(kprobe_addr),
+ probe_offset, is_retprobe, old);
+ kfree(func);
+ return tp_event;
+}
+
+static struct trace_event_call*
+kprobe_init_multi(struct perf_event *p_event, bool is_retprobe)
+{
+ void __user *kprobe_func = u64_to_user_ptr(p_event->attr.kprobe_func);
+ void __user *kprobe_addr = u64_to_user_ptr(p_event->attr.kprobe_addr);
+ u64 *funcs = NULL, *addrs = NULL, *offs = NULL;
+ struct trace_event_call *tp_event, *tp_old = NULL;
+ u32 i, cnt = p_event->attr.probe_cnt;
+ int ret = -EINVAL;
+ size_t size;
+
+ if (!cnt)
+ return ERR_PTR(-EINVAL);
+
+ size = cnt * sizeof(u64);
+ if (kprobe_func) {
+ ret = -ENOMEM;
+ funcs = kmalloc(size, GFP_KERNEL);
+ if (!funcs)
+ goto out;
+ ret = -EFAULT;
+ if (copy_from_user(funcs, kprobe_func, size))
+ goto out;
+ }
+
+ if (kprobe_addr) {
+ ret = -ENOMEM;
+ addrs = kmalloc(size, GFP_KERNEL);
+ if (!addrs)
+ goto out;
+ ret = -EFAULT;
+ if (copy_from_user(addrs, kprobe_addr, size))
+ goto out;
+ /* addresses and ofsets share the same array */
+ offs = addrs;
}
+ for (i = 0; i < cnt; i++) {
+ tp_event = kprobe_init(is_retprobe, funcs ? funcs[i] : 0,
+ addrs ? addrs[i] : 0, offs ? offs[i] : 0,
+ tp_old);
+ if (IS_ERR(tp_event)) {
+ if (tp_old)
+ destroy_local_trace_kprobe(tp_old);
+ ret = PTR_ERR(tp_event);
+ goto out;
+ }
+ if (!tp_old)
+ tp_old = tp_event;
+ }
+ ret = 0;
+out:
+ kfree(funcs);
+ kfree(addrs);
+ return ret ? ERR_PTR(ret) : tp_old;
+}
+
+static struct trace_event_call*
+kprobe_init_single(struct perf_event *p_event, bool is_retprobe)
+{
+ struct perf_event_attr *attr = &p_event->attr;
+
+ return kprobe_init(is_retprobe, attr->kprobe_func, attr->kprobe_addr,
+ attr->probe_offset, NULL);
+}
+
+int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe)
+{
+ struct trace_event_call *tp_event;
+ int ret;
+
+ if (p_event->attr.probe_cnt)
+ tp_event = kprobe_init_multi(p_event, is_retprobe);
+ else
+ tp_event = kprobe_init_single(p_event, is_retprobe);
+
+ if (IS_ERR(tp_event))
+ return PTR_ERR(tp_event);
+
mutex_lock(&event_mutex);
ret = perf_trace_event_init(tp_event, p_event);
if (ret)
destroy_local_trace_kprobe(tp_event);
mutex_unlock(&event_mutex);
-out:
- kfree(func);
return ret;
}
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 33272a7b6912..86a7aada853a 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -237,13 +237,18 @@ static int kprobe_dispatcher(struct kprobe *kp, struct pt_regs *regs);
static int kretprobe_dispatcher(struct kretprobe_instance *ri,
struct pt_regs *regs);
+static void __free_trace_kprobe(struct trace_kprobe *tk)
+{
+ kfree(tk->symbol);
+ free_percpu(tk->nhit);
+ kfree(tk);
+}
+
static void free_trace_kprobe(struct trace_kprobe *tk)
{
if (tk) {
trace_probe_cleanup(&tk->tp);
- kfree(tk->symbol);
- free_percpu(tk->nhit);
- kfree(tk);
+ __free_trace_kprobe(tk);
}
}
@@ -1796,7 +1801,7 @@ static int unregister_kprobe_event(struct trace_kprobe *tk)
/* create a trace_kprobe, but don't add it to global lists */
struct trace_event_call *
create_local_trace_kprobe(char *func, void *addr, unsigned long offs,
- bool is_return)
+ bool is_return, struct trace_event_call *old)
{
enum probe_print_type ptype;
struct trace_kprobe *tk;@@ -1820,6 +1825,28 @@ create_local_trace_kprobe(char *func, void *addr, unsigned long offs,
return ERR_CAST(tk);
}
+ if (old) {
+ struct trace_kprobe *tk_old;
+
+ tk_old = trace_kprobe_primary_from_call(old);
+ if (!tk_old) {
+ ret = -EINVAL;
+ goto error;
+ }
+
+ /* Append to existing event */
+ ret = trace_probe_append(&tk->tp, &tk_old->tp);
+ if (ret)
+ goto error;
+
+ /* Register k*probe */
+ ret = __register_trace_kprobe(tk);
+ if (ret)
+ goto error;
+
+ return trace_probe_event_call(&tk->tp);
+ }
+
init_trace_event_call(tk);
ptype = trace_kprobe_is_return(tk) ?@@ -1841,6 +1868,8 @@ create_local_trace_kprobe(char *func, void *addr, unsigned long offs,
void destroy_local_trace_kprobe(struct trace_event_call *event_call)
{
+ struct trace_probe_event *event;
+ struct trace_probe *pos, *tmp;
struct trace_kprobe *tk;
tk = trace_kprobe_primary_from_call(event_call);@@ -1852,9 +1881,15 @@ void destroy_local_trace_kprobe(struct trace_event_call *event_call)
return;
}
- __unregister_trace_kprobe(tk);
+ event = tk->tp.event;
+ list_for_each_entry_safe(pos, tmp, &event->probes, list) {
+ tk = container_of(pos, struct trace_kprobe, tp);
+ list_del_init(&pos->list);
+ __unregister_trace_kprobe(tk);
+ __free_trace_kprobe(tk);
+ }
- free_trace_kprobe(tk);
+ trace_probe_event_free(event);
}
#endif /* CONFIG_PERF_EVENTS */
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index 3ed2a3f37297..2dff85aa21e9 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -974,7 +974,7 @@ int traceprobe_define_arg_fields(struct trace_event_call *event_call,
return 0;
}
-static void trace_probe_event_free(struct trace_probe_event *tpe)
+void trace_probe_event_free(struct trace_probe_event *tpe)
{
kfree(tpe->class.system);
kfree(tpe->call.name);diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h
index 99e7a5df025e..ba8e46c7efe8 100644
--- a/kernel/trace/trace_probe.h
+++ b/kernel/trace/trace_probe.h
@@ -333,6 +333,7 @@ int trace_probe_init(struct trace_probe *tp, const char *event,
const char *group, bool alloc_filter);
void trace_probe_cleanup(struct trace_probe *tp);
int trace_probe_append(struct trace_probe *tp, struct trace_probe *to);
+void trace_probe_event_free(struct trace_probe_event *tpe);
void trace_probe_unlink(struct trace_probe *tp);
int trace_probe_register_event_call(struct trace_probe *tp);
int trace_probe_add_file(struct trace_probe *tp, struct trace_event_file *file);
@@ -377,7 +378,7 @@ extern int traceprobe_set_print_fmt(struct trace_probe *tp, enum probe_print_typ
#ifdef CONFIG_PERF_EVENTS
extern struct trace_event_call *
create_local_trace_kprobe(char *func, void *addr, unsigned long offs,
- bool is_return);
+ bool is_return, struct trace_event_call *old);
extern void destroy_local_trace_kprobe(struct trace_event_call *event_call);
extern struct trace_event_call *
--
2.33.1