[PATCH, net-next] perf, bpf: fix conditional call to bpf_overflow_handler

The newly added bpf_overflow_handler function is only built of both
CONFIG_EVENT_TRACING and CONFIG_BPF_SYSCALL are enabled, but the caller
only checks the latter:

kernel/events/core.c: In function 'perf_event_alloc':
kernel/events/core.c:9106:27: error: 'bpf_overflow_handler' undeclared (first use in this function)

This changes the caller so we also skip this call if CONFIG_EVENT_TRACING
is disabled entirely.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: aa6a5f3cb2b2 ("perf, bpf: add perf events core support for BPF_PROG_TYPE_PERF_EVENT programs")
---
 kernel/events/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

I'm not entirely sure if this is the correct solution, please check before applying

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 73d0c6ddfd5b..d3f6374326d8 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c

@@ -9110,7 +9110,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
 	if (!overflow_handler && parent_event) {
 		overflow_handler = parent_event->overflow_handler;
 		context = parent_event->overflow_handler_context;
-#ifdef CONFIG_BPF_SYSCALL
+#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_EVENT_TRACING)
 		if (overflow_handler == bpf_overflow_handler) {
 			struct bpf_prog *prog = bpf_prog_inc(parent_event->prog);
 

-- 
2.9.0

On Tue, Sep 06, 2016 at 03:10:22PM +0200, Arnd Bergmann wrote:

The newly added bpf_overflow_handler function is only built of both
CONFIG_EVENT_TRACING and CONFIG_BPF_SYSCALL are enabled, but the caller
only checks the latter:

kernel/events/core.c: In function 'perf_event_alloc':
kernel/events/core.c:9106:27: error: 'bpf_overflow_handler' undeclared (first use in this function)

This changes the caller so we also skip this call if CONFIG_EVENT_TRACING
is disabled entirely.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: aa6a5f3cb2b2 ("perf, bpf: add perf events core support for BPF_PROG_TYPE_PERF_EVENT programs")
---
 kernel/events/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

I'm not entirely sure if this is the correct solution, please check before applying

Acked-by: Alexei Starovoitov <ast@kernel.org>

Thanks for the fix. Just saw build bot complaining last night and
by the morning your fix is already here. Thanks!

* Alexei Starovoitov [off-list ref] wrote:

On Tue, Sep 06, 2016 at 03:10:22PM +0200, Arnd Bergmann wrote:

quoted

The newly added bpf_overflow_handler function is only built of both
CONFIG_EVENT_TRACING and CONFIG_BPF_SYSCALL are enabled, but the caller
only checks the latter:

kernel/events/core.c: In function 'perf_event_alloc':
kernel/events/core.c:9106:27: error: 'bpf_overflow_handler' undeclared (first use in this function)

This changes the caller so we also skip this call if CONFIG_EVENT_TRACING
is disabled entirely.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: aa6a5f3cb2b2 ("perf, bpf: add perf events core support for BPF_PROG_TYPE_PERF_EVENT programs")
---
 kernel/events/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

I'm not entirely sure if this is the correct solution, please check before applying

Acked-by: Alexei Starovoitov <ast@kernel.org>

Thanks for the fix. Just saw build bot complaining last night and
by the morning your fix is already here. Thanks!

Guys, this is the first time I saw this patch (and presumably there's some other 
patch as well?) - could you please submit it properly for review and get an 
Acked-by from one of the perf maintainers before appying it?

Thanks,

	Ingo

On Thu, Sep 08, 2016 at 08:30:52AM +0200, Ingo Molnar wrote:

quoted

Thanks for the fix. Just saw build bot complaining last night and
by the morning your fix is already here. Thanks!

Guys, this is the first time I saw this patch (and presumably there's some other 
patch as well?) - could you please submit it properly for review and get an 
Acked-by from one of the perf maintainers before appying it?

I was involved with the original patch and Ack'ed it.

Ack on this one as well.

* Peter Zijlstra [off-list ref] wrote:

On Thu, Sep 08, 2016 at 08:30:52AM +0200, Ingo Molnar wrote:

quoted

quoted

Thanks for the fix. Just saw build bot complaining last night and
by the morning your fix is already here. Thanks!

Guys, this is the first time I saw this patch (and presumably there's some other 
patch as well?) - could you please submit it properly for review and get an 
Acked-by from one of the perf maintainers before appying it?

I was involved with the original patch and Ack'ed it.

Neither the Ack nor the Cc:s were preserved in the net-next commit:

  aa6a5f3cb2b2 ("perf, bpf: add perf events core support for BPF_PROG_TYPE_PERF_EVENT programs")

Ack on this one as well.

Great, thanks!

	Ingo

On 09/08/2016 09:01 AM, Ingo Molnar wrote:

* Peter Zijlstra [off-list ref] wrote:

quoted

On Thu, Sep 08, 2016 at 08:30:52AM +0200, Ingo Molnar wrote:

quoted

quoted

Thanks for the fix. Just saw build bot complaining last night and
by the morning your fix is already here. Thanks!

Guys, this is the first time I saw this patch (and presumably there's some other
patch as well?) - could you please submit it properly for review and get an
Acked-by from one of the perf maintainers before appying it?

I was involved with the original patch and Ack'ed it.

Neither the Ack nor the Cc:s were preserved in the net-next commit:

   aa6a5f3cb2b2 ("perf, bpf: add perf events core support for BPF_PROG_TYPE_PERF_EVENT programs")

Afaik patchwork doesn't pick up Acks when they are against the
cover letter of a series. For the series that includes mentioned
commit, Peter's Ack is here:

    4df20483ab28 ("Merge branch 'bpf-perf-hw-sw-events'")

quoted

Ack on this one as well.

Great, thanks!

	Ingo

* Daniel Borkmann [off-list ref] wrote:

On 09/08/2016 09:01 AM, Ingo Molnar wrote:

quoted

* Peter Zijlstra [off-list ref] wrote:

quoted

On Thu, Sep 08, 2016 at 08:30:52AM +0200, Ingo Molnar wrote:

quoted

quoted

Thanks for the fix. Just saw build bot complaining last night and
by the morning your fix is already here. Thanks!

Guys, this is the first time I saw this patch (and presumably there's some other
patch as well?) - could you please submit it properly for review and get an
Acked-by from one of the perf maintainers before appying it?

I was involved with the original patch and Ack'ed it.

Neither the Ack nor the Cc:s were preserved in the net-next commit:

  aa6a5f3cb2b2 ("perf, bpf: add perf events core support for BPF_PROG_TYPE_PERF_EVENT programs")

Afaik patchwork doesn't pick up Acks when they are against the
cover letter of a series. [...]

That's unfortunate - I usually add them in manually.

[...] For the series that includes mentioned commit, Peter's Ack is here:

    4df20483ab28 ("Merge branch 'bpf-perf-hw-sw-events'")

Looks good!

Thanks,

	Ingo