All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] bpf: fix BPF_KPROBE_OVERRIDE dependencies
@ 2017-12-19 10:12 Arnd Bergmann
  2017-12-19 23:11 ` Alexei Starovoitov
  0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2017-12-19 10:12 UTC (permalink / raw)
  To: Steven Rostedt, Ingo Molnar
  Cc: Arnd Bergmann, Alexei Starovoitov, Josef Bacik, linux-kernel

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")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 kernel/trace/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index ace4547b7564..0d83668652ef 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -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
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] bpf: fix BPF_KPROBE_OVERRIDE dependencies
  2017-12-19 10:12 [PATCH] bpf: fix BPF_KPROBE_OVERRIDE dependencies Arnd Bergmann
@ 2017-12-19 23:11 ` Alexei Starovoitov
  0 siblings, 0 replies; 2+ messages in thread
From: Alexei Starovoitov @ 2017-12-19 23:11 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Steven Rostedt, Ingo Molnar, Alexei Starovoitov, Josef Bacik,
	linux-kernel, Daniel Borkmann, David S. Miller

On Tue, Dec 19, 2017 at 11:12:04AM +0100, Arnd Bergmann wrote:
> 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")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

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

Thanks!

> ---
>  kernel/trace/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
> index ace4547b7564..0d83668652ef 100644
> --- a/kernel/trace/Kconfig
> +++ b/kernel/trace/Kconfig
> @@ -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
> -- 
> 2.9.0
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-12-19 23:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-19 10:12 [PATCH] bpf: fix BPF_KPROBE_OVERRIDE dependencies Arnd Bergmann
2017-12-19 23:11 ` Alexei Starovoitov

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.