1 files changed, 16 insertions, 1 deletions

diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c
index 0b030c9126d3..fddcae801724 100644
--- a/kernel/bpf/inode.c
+++ b/kernel/bpf/inode.c
@@ -21,6 +21,7 @@
 #include <linux/parser.h>
 #include <linux/filter.h>
 #include <linux/bpf.h>
+#include <linux/bpf_trace.h>
 
 enum bpf_type {
         BPF_TYPE_UNSPEC = 0,
@@ -281,6 +282,13 @@ int bpf_obj_pin_user(u32 ufd, const char __user *pathname)
         ret = bpf_obj_do_pin(pname, raw, type);
         if (ret != 0)
                 bpf_any_put(raw, type);
+        if ((trace_bpf_obj_pin_prog_enabled() ||
+             trace_bpf_obj_pin_map_enabled()) && !ret) {
+                if (type == BPF_TYPE_PROG)
+                        trace_bpf_obj_pin_prog(raw, ufd, pname);
+                if (type == BPF_TYPE_MAP)
+                        trace_bpf_obj_pin_map(raw, ufd, pname);
+        }
 out:
         putname(pname);
         return ret;
@@ -342,8 +350,15 @@ int bpf_obj_get_user(const char __user *pathname)
         else
                 goto out;
 
-        if (ret < 0)
+        if (ret < 0) {
                 bpf_any_put(raw, type);
+        } else if (trace_bpf_obj_get_prog_enabled() ||
+                   trace_bpf_obj_get_map_enabled()) {
+                if (type == BPF_TYPE_PROG)
+                        trace_bpf_obj_get_prog(raw, ret, pname);
+                if (type == BPF_TYPE_MAP)
+                        trace_bpf_obj_get_map(raw, ret, pname);
+        }
 out:
         putname(pname);
         return ret;