1 files changed, 3 insertions, 14 deletions

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 0bd2944eafb9..9b87198deea2 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -282,6 +282,7 @@ void bpf_map_put(struct bpf_map *map)
 {
         __bpf_map_put(map, true);
 }
+EXPORT_SYMBOL_GPL(bpf_map_put);
 
 void bpf_map_put_with_uref(struct bpf_map *map)
 {
@@ -503,7 +504,6 @@ static int map_create(union bpf_attr *attr)
                 return err;
         }
 
-        trace_bpf_map_create(map, err);
         return err;
 
 free_map:
@@ -544,6 +544,7 @@ struct bpf_map *bpf_map_inc(struct bpf_map *map, bool uref)
                 atomic_inc(&map->usercnt);
         return map;
 }
+EXPORT_SYMBOL_GPL(bpf_map_inc);
 
 struct bpf_map *bpf_map_get_with_uref(u32 ufd)
 {
@@ -663,7 +664,6 @@ static int map_lookup_elem(union bpf_attr *attr)
         if (copy_to_user(uvalue, value, value_size) != 0)
                 goto free_value;
 
-        trace_bpf_map_lookup_elem(map, ufd, key, value);
         err = 0;
 
 free_value:
@@ -760,8 +760,6 @@ static int map_update_elem(union bpf_attr *attr)
         __this_cpu_dec(bpf_prog_active);
         preempt_enable();
 out:
-        if (!err)
-                trace_bpf_map_update_elem(map, ufd, key, value);
 free_value:
         kfree(value);
 free_key:
@@ -814,8 +812,6 @@ static int map_delete_elem(union bpf_attr *attr)
         __this_cpu_dec(bpf_prog_active);
         preempt_enable();
 out:
-        if (!err)
-                trace_bpf_map_delete_elem(map, ufd, key);
         kfree(key);
 err_put:
         fdput(f);
@@ -879,7 +875,6 @@ out:
         if (copy_to_user(unext_key, next_key, map->key_size) != 0)
                 goto free_next_key;
 
-        trace_bpf_map_next_key(map, ufd, key, next_key);
         err = 0;
 
 free_next_key:
@@ -1027,7 +1022,6 @@ static void __bpf_prog_put(struct bpf_prog *prog, bool do_idr_lock)
         if (atomic_dec_and_test(&prog->aux->refcnt)) {
                 int i;
 
-                trace_bpf_prog_put_rcu(prog);
                 /* bpf_prog_free_id() must be called first */
                 bpf_prog_free_id(prog, do_idr_lock);
 
@@ -1194,11 +1188,7 @@ struct bpf_prog *bpf_prog_get(u32 ufd)
 struct bpf_prog *bpf_prog_get_type_dev(u32 ufd, enum bpf_prog_type type,
                                        bool attach_drv)
 {
-        struct bpf_prog *prog = __bpf_prog_get(ufd, &type, attach_drv);
-
-        if (!IS_ERR(prog))
-                trace_bpf_prog_get_type(prog);
-        return prog;
+        return __bpf_prog_get(ufd, &type, attach_drv);
 }
 EXPORT_SYMBOL_GPL(bpf_prog_get_type_dev);
 
@@ -1373,7 +1363,6 @@ static int bpf_prog_load(union bpf_attr *attr)
         }
 
         bpf_prog_kallsyms_add(prog);
-        trace_bpf_prog_load(prog, err);
         return err;
 
 free_used_maps: