Commit ceb56070 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

bpf, perf: delay release of BPF prog after grace period

Commit dead9f29 ("perf: Fix race in BPF program unregister") moved
destruction of BPF program from free_event_rcu() callback to __free_event(),
which is problematic if used with tail calls: if prog A is attached as
trace event directly, but at the same time present in a tail call map used
by another trace event program elsewhere, then we need to delay destruction
via RCU grace period since it can still be in use by the program doing the
tail call (the prog first needs to be dropped from the tail call map, then
trace event with prog A attached destroyed, so we get immediate destruction).

Fixes: dead9f29

 ("perf: Fix race in BPF program unregister")
Signed-off-by: default avatarDaniel Borkmann <>
Acked-by: default avatarAlexei Starovoitov <>
Cc: Jann Horn <>
Signed-off-by: default avatarDavid S. Miller <>
parent 565ce8f3
......@@ -264,6 +264,10 @@ static inline struct bpf_prog *bpf_prog_get(u32 ufd)
static inline void bpf_prog_put(struct bpf_prog *prog)
static inline void bpf_prog_put_rcu(struct bpf_prog *prog)
/* verifier prototypes for helper functions called from eBPF programs */
......@@ -7531,7 +7531,7 @@ static void perf_event_free_bpf_prog(struct perf_event *event)
prog = event->tp_event->prog;
if (prog) {
event->tp_event->prog = NULL;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment