From: Kyle Huey <me@kylehuey.com>
Date: Fri, 12 Apr 2024 01:50:15 +0000 (-0700)
Subject: perf/bpf: Remove #ifdef CONFIG_BPF_SYSCALL from struct perf_event members
X-Git-Tag: v6.10-rc1~210^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14e40a9578b70cc5323e55f61292a7e021f6037c;p=thirdparty%2Fkernel%2Flinux.git

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@kernel.org>
Signed-off-by: Kyle Huey <khuey@kylehuey.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240412015019.7060-4-khuey@kylehuey.com
---

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 3e33b366347a1..50e01db083ee6 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;