Skip to contentSkip to conversation

bpf: fix BPF_KPROBE_OVERRIDE dependencies

PATCH In review Arnd Bergmann 2 participants 2 messages Dec 19, 2017 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpf: fix BPF_KPROBE_OVERRIDE dependencies

CONFIG_BPF_KPROBE_OVERRIDE causes a link failure when CONFIG_KPROBE_EVENTS is disabled:

kernel/trace/bpf_trace.o: In function `bpf_override_return':
(.text+0x172): undefined reference to `bpf_kprobe_override'

This adds it to the list of dependencies.

Fixes 9802d86585db ("bpf: add a bpf_override_function helper")
---
 kernel/trace/Kconfig | 1 +
 1 file changed, 1 insertion(+)
kernel/trace/Kconfig +1 -0
index ace4547b7564..0d83668652ef 100644
@@ -534,6 +534,7 @@ config FUNCTION_PROFILER
 config BPF_KPROBE_OVERRIDE
 	bool "Enable BPF programs to override a kprobed function"
 	depends on BPF_EVENTS
+	depends on KPROBE_EVENTS
 	depends on KPROBES_ON_FTRACE
 	depends on HAVE_KPROBE_OVERRIDE
 	depends on DYNAMIC_FTRACE_WITH_REGS
Signature · 1 line
2.9.0
#1 lore raw
Quoted 10 lines · Arnd Bergmann

CONFIG_BPF_KPROBE_OVERRIDE causes a link failure when CONFIG_KPROBE_EVENTS is disabled:

kernel/trace/bpf_trace.o: In function `bpf_override_return':
(.text+0x172): undefined reference to `bpf_kprobe_override'

This adds it to the list of dependencies.

Fixes 9802d86585db ("bpf: add a bpf_override_function helper")

lgtm.
Could you please resubmit it to netdev targeting bpf-next tree?

Thanks!

Quoted 19 lines
---
 kernel/trace/Kconfig | 1 +
 1 file changed, 1 insertion(+)
kernel/trace/Kconfig +1 -0
index ace4547b7564..0d83668652ef 100644
@@ -534,6 +534,7 @@ config FUNCTION_PROFILER
 config BPF_KPROBE_OVERRIDE
 	bool "Enable BPF programs to override a kprobed function"
 	depends on BPF_EVENTS
+	depends on KPROBE_EVENTS
 	depends on KPROBES_ON_FTRACE
 	depends on HAVE_KPROBE_OVERRIDE
 	depends on DYNAMIC_FTRACE_WITH_REGS
Signature · 1 line
2.9.0