1 files changed, 17 insertions, 8 deletions

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index d73f565b4e06..d0ce590f06e1 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -250,7 +250,7 @@ DEFINE_FETCH_symbol(string_size)
 #define fetch_file_offset_string_size   NULL
 
 /* Fetch type information table */
-const struct fetch_type kprobes_fetch_type_table[] = {
+static const struct fetch_type kprobes_fetch_type_table[] = {
         /* Special types */
         [FETCH_TYPE_STRING] = __ASSIGN_FETCH_TYPE("string", string, string,
                                         sizeof(u32), 1, "__data_loc char[]"),
@@ -760,7 +760,8 @@ static int create_trace_kprobe(int argc, char **argv)
 
                 /* Parse fetch argument */
                 ret = traceprobe_parse_probe_arg(arg, &tk->tp.size, parg,
-                                                is_return, true);
+                                                is_return, true,
+                                                kprobes_fetch_type_table);
                 if (ret) {
                         pr_info("Parse error at argument[%d]. (%d)\n", i, ret);
                         goto error;
@@ -1134,11 +1135,15 @@ static void
 kprobe_perf_func(struct trace_kprobe *tk, struct pt_regs *regs)
 {
         struct ftrace_event_call *call = &tk->tp.call;
+        struct bpf_prog *prog = call->prog;
         struct kprobe_trace_entry_head *entry;
         struct hlist_head *head;
         int size, __size, dsize;
         int rctx;
 
+        if (prog && !trace_call_bpf(prog, regs))
+                return;
+
         head = this_cpu_ptr(call->perf_events);
         if (hlist_empty(head))
                 return;
@@ -1165,11 +1170,15 @@ kretprobe_perf_func(struct trace_kprobe *tk, struct kretprobe_instance *ri,
                     struct pt_regs *regs)
 {
         struct ftrace_event_call *call = &tk->tp.call;
+        struct bpf_prog *prog = call->prog;
         struct kretprobe_trace_entry_head *entry;
         struct hlist_head *head;
         int size, __size, dsize;
         int rctx;
 
+        if (prog && !trace_call_bpf(prog, regs))
+                return;
+
         head = this_cpu_ptr(call->perf_events);
         if (hlist_empty(head))
                 return;
@@ -1286,7 +1295,7 @@ static int register_kprobe_event(struct trace_kprobe *tk)
                 kfree(call->print_fmt);
                 return -ENODEV;
         }
-        call->flags = 0;
+        call->flags = TRACE_EVENT_FL_KPROBE;
         call->class->reg = kprobe_register;
         call->data = tk;
         ret = trace_add_event_call(call);
@@ -1310,7 +1319,7 @@ static int unregister_kprobe_event(struct trace_kprobe *tk)
         return ret;
 }
 
-/* Make a debugfs interface for controlling probe points */
+/* Make a tracefs interface for controlling probe points */
 static __init int init_kprobe_trace(void)
 {
         struct dentry *d_tracer;
@@ -1323,20 +1332,20 @@ static __init int init_kprobe_trace(void)
         if (IS_ERR(d_tracer))
                 return 0;
 
-        entry = debugfs_create_file("kprobe_events", 0644, d_tracer,
+        entry = tracefs_create_file("kprobe_events", 0644, d_tracer,
                                     NULL, &kprobe_events_ops);
 
         /* Event list interface */
         if (!entry)
-                pr_warning("Could not create debugfs "
+                pr_warning("Could not create tracefs "
                            "'kprobe_events' entry\n");
 
         /* Profile interface */
-        entry = debugfs_create_file("kprobe_profile", 0444, d_tracer,
+        entry = tracefs_create_file("kprobe_profile", 0444, d_tracer,
                                     NULL, &kprobe_profile_ops);
 
         if (!entry)
-                pr_warning("Could not create debugfs "
+                pr_warning("Could not create tracefs "
                            "'kprobe_profile' entry\n");
         return 0;
 }