5 files changed, 13 insertions, 1 deletions

diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 195e3606ddd7..2bf677cb2d6f 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -148,6 +148,8 @@ enum trace_reg {
         TRACE_REG_PERF_UNREGISTER,
         TRACE_REG_PERF_OPEN,
         TRACE_REG_PERF_CLOSE,
+        TRACE_REG_PERF_ADD,
+        TRACE_REG_PERF_DEL,
 };
 
 struct ftrace_event_call;
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c
index 0cfcc37f63de..d72af0b03822 100644
--- a/kernel/trace/trace_event_perf.c
+++ b/kernel/trace/trace_event_perf.c
@@ -211,12 +211,14 @@ int perf_trace_add(struct perf_event *p_event, int flags)
         list = this_cpu_ptr(pcpu_list);
         hlist_add_head_rcu(&p_event->hlist_entry, list);
 
-        return 0;
+        return tp_event->class->reg(tp_event, TRACE_REG_PERF_ADD, p_event);
 }
 
 void perf_trace_del(struct perf_event *p_event, int flags)
 {
+        struct ftrace_event_call *tp_event = p_event->tp_event;
         hlist_del_rcu(&p_event->hlist_entry);
+        tp_event->class->reg(tp_event, TRACE_REG_PERF_DEL, p_event);
 }
 
 __kprobes void *perf_trace_buf_prepare(int size, unsigned short type,
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 5138fea37908..079a93ae8a9d 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -173,6 +173,8 @@ int ftrace_event_reg(struct ftrace_event_call *call,
                 return 0;
         case TRACE_REG_PERF_OPEN:
         case TRACE_REG_PERF_CLOSE:
+        case TRACE_REG_PERF_ADD:
+        case TRACE_REG_PERF_DEL:
                 return 0;
 #endif
         }
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 5667f8958cc9..580a05ec926b 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1912,6 +1912,8 @@ int kprobe_register(struct ftrace_event_call *event,
                 return 0;
         case TRACE_REG_PERF_OPEN:
         case TRACE_REG_PERF_CLOSE:
+        case TRACE_REG_PERF_ADD:
+        case TRACE_REG_PERF_DEL:
                 return 0;
 #endif
         }
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index e23515f51ed4..96fc73369099 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -666,6 +666,8 @@ static int syscall_enter_register(struct ftrace_event_call *event,
                 return 0;
         case TRACE_REG_PERF_OPEN:
         case TRACE_REG_PERF_CLOSE:
+        case TRACE_REG_PERF_ADD:
+        case TRACE_REG_PERF_DEL:
                 return 0;
 #endif
         }
@@ -690,6 +692,8 @@ static int syscall_exit_register(struct ftrace_event_call *event,
                 return 0;
         case TRACE_REG_PERF_OPEN:
         case TRACE_REG_PERF_CLOSE:
+        case TRACE_REG_PERF_ADD:
+        case TRACE_REG_PERF_DEL:
                 return 0;
 #endif
         }