The following commit has been merged into the perf/core branch of tip:
Commit-ID: 14e40a9578b70cc5323e55f61292a7e021f6037c
Gitweb: https://git.kernel.org/tip/14e40a9578b70cc5323e55f61292a7e021f6037c
Author: Kyle Huey <me@xxxxxxxxxxxx>
AuthorDate: Thu, 11 Apr 2024 18:50:15 -07:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Fri, 12 Apr 2024 11:49:49 +02:00
perf/bpf: Remove #ifdef CONFIG_BPF_SYSCALL from struct perf_event members
This will allow __perf_event_overflow() (which is independent of
CONFIG_BPF_SYSCALL) to use struct perf_event's prog to decide whether to
call bpf_overflow_handler().
Suggested-by: Ingo Molnar <mingo@xxxxxxxxxx>
Signed-off-by: Kyle Huey <khuey@xxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20240412015019.7060-4-khuey@xxxxxxxxxxxx
---
include/linux/perf_event.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 3e33b36..50e01db 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -809,11 +809,9 @@ struct perf_event {
u64 (*clock)(void);
perf_overflow_handler_t overflow_handler;
void *overflow_handler_context;
-#ifdef CONFIG_BPF_SYSCALL
perf_overflow_handler_t orig_overflow_handler;
struct bpf_prog *prog;
u64 bpf_cookie;
-#endif
#ifdef CONFIG_EVENT_TRACING
struct trace_event_call *tp_event;
|