perf_event_detach_bpf_prog() broken?
Subsystems (4)
Hi guys,
Per commit 170a7e3ea070 ("bpf: bpf_prog_array_copy() should return -ENOENT if exclude_prog not found") perf_event_detach_bpf_prog() can now return without doing bpf_prog_put() and leaving event->prog set.
This is very 'unexpected' behaviour.
I'm not sure what's sane from the BPF side of things here, but leaving event->prog set is really rather unexpected.
Help?
Quoted 6 lines · Peter Zijlstra
Hi guys,
Per commit
170a7e3ea070("bpf:bpf_prog_array_copy()should return-ENOENTifexclude_prognot found")perf_event_detach_bpf_prog()can now return without doingbpf_prog_put()and leavingevent->progset.
Quoted 6 lines
This is very 'unexpected' behaviour.
I'm not sure what's sane from the BPF side of things here, but leaving
event->progset is really rather unexpected.Help?
IIUC the ENOENT should never happen in perf event context, so not sure why we have that check.. also does not seem to be used from lirc code, Sean?
perf_event_detach_bpf_prog is called when the event is being freed so I think we should always put and clear the event->prog
jirka
Quoted 9 lines · Jiri Olsa
Quoted 8 lines · Peter Zijlstra
Hi guys,
Per commit
170a7e3ea070("bpf:bpf_prog_array_copy()should return-ENOENTifexclude_prognot found")perf_event_detach_bpf_prog()can now return without doingbpf_prog_put()and leavingevent->progset.This is very 'unexpected' behaviour.
Quoted 8 lines
Quoted 4 lines
I'm not sure what's sane from the BPF side of things here, but leaving
event->progset is really rather unexpected.Help?
IIUC the ENOENT should never happen in perf event context, so not sure why we have that check.. also does not seem to be used from lirc code, Sean?
You can deattach a lirc program using the bpf syscall with command BPF_PROG_DETACH, and if you pass an incorrect (as in, not attached) program, then this commit ensures you get ENOENT rather than success.
Sean
Quoted 4 lines
perf_event_detach_bpf_progis called when the event is being freed so I think we should always put and clear theevent->progjirka
Quoted 15 lines · Sean Young
Quoted 14 lines · Jiri Olsa
Quoted 12 lines · Peter Zijlstra
Hi guys,
Per commit
170a7e3ea070("bpf:bpf_prog_array_copy()should return-ENOENTifexclude_prognot found")perf_event_detach_bpf_prog()can now return without doingbpf_prog_put()and leavingevent->progset.This is very 'unexpected' behaviour.
I'm not sure what's sane from the BPF side of things here, but leaving
event->progset is really rather unexpected.Help?
Quoted 7 lines
Quoted 3 lines
IIUC the ENOENT should never happen in perf event context, so not sure why we have that check.. also does not seem to be used from lirc code, Sean?
You can deattach a lirc program using the bpf syscall with command
BPF_PROG_DETACH, and if you pass an incorrect (as in, not attached) program, then this commit ensures you get ENOENT rather than success.
I see.. so that's for lirc programs, but we can't detach perf event's program like that
the program is stored in event and is detached and released only when the event is freed, so even for ENOENT error (which can't happen) we still need to release the event's program
I think we can just remove the check like below
jirka
---
kernel/trace/bpf_trace.c +0 -2
@@ -2240,8 +2240,6 @@ void perf_event_detach_bpf_prog(struct perf_event *event) old_array =bpf_event_rcu_dereference (event->tp_event->prog_array); ret =bpf_prog_array_copy (old_array, event->prog,NULL ,0 , &new_array); -if (ret == -ENOENT ) - goto unlock;if (ret <0 ) {bpf_prog_array_delete_safe (old_array, event->prog); }else {
+ bpf ML
Quoted 8 lines · Jiri Olsa
Quoted 6 lines · Peter Zijlstra
Hi guys,
Per commit
170a7e3ea070("bpf:bpf_prog_array_copy()should return-ENOENTifexclude_prognot found")perf_event_detach_bpf_prog()can now return without doingbpf_prog_put()and leavingevent->progset.
Quoted 8 lines
Quoted 6 lines
This is very 'unexpected' behaviour.
I'm not sure what's sane from the BPF side of things here, but leaving
event->progset is really rather unexpected.Help?
IIUC the ENOENT should never happen in perf event context, so not
yep, if it does return an error it's a bug, right? So we can add WARN_ONCE() or just drop the check, probably.
Quoted 7 lines
sure why we have that check.. also does not seem to be used from lirc code, Sean?
perf_event_detach_bpf_progis called when the event is being freed so I think we should always put and clear theevent->progjirka
Quoted 16 lines · Andrii Nakryiko
+ bpf ML
Quoted 13 lines · Jiri Olsa
Quoted 11 lines · Peter Zijlstra
Hi guys,
Per commit
170a7e3ea070("bpf:bpf_prog_array_copy()should return-ENOENTifexclude_prognot found")perf_event_detach_bpf_prog()can now return without doingbpf_prog_put()and leavingevent->progset.This is very 'unexpected' behaviour.
I'm not sure what's sane from the BPF side of things here, but leaving
event->progset is really rather unexpected.
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Help?
IIUC the ENOENT should never happen in perf event context, so not
yep, if it does return an error it's a bug, right? So we can add
WARN_ONCE()or just drop the check, probably.
I'm now more inclined to have the WARN there, because it's possible return value of bpf_prog_array_copy .. I'll send the patch and let's discuss over the change
jirka
Quoted 8 lines
Quoted 8 lines
sure why we have that check.. also does not seem to be used from lirc code, Sean?
perf_event_detach_bpf_progis called when the event is being freed so I think we should always put and clear theevent->progjirka