diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index 5012b524283d..60248d644b6f 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -277,6 +277,7 @@ struct trace_event_call { int perf_refcount; struct hlist_head __percpu *perf_events; struct bpf_prog *prog; + struct perf_event *bpf_prog_owner; int (*perf_perm)(struct trace_event_call *, struct perf_event *); diff --git a/kernel/events/core.c b/kernel/events/core.c index 03ac9c8b02fb..7242a6e1ec76 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8121,6 +8121,7 @@ static int perf_event_set_bpf_prog(struct perf_event *event, u32 prog_fd) } } event->tp_event->prog = prog; + event->tp_event->bpf_prog_owner = event; return 0; } @@ -8135,7 +8136,7 @@ static void perf_event_free_bpf_prog(struct perf_event *event) return; prog = event->tp_event->prog; - if (prog) { + if (prog && event->tp_event->bpf_prog_owner == event) { event->tp_event->prog = NULL; bpf_prog_put(prog); }