diff mbox

[net-next] samples/bpf: fix bpf_perf_event_output prototype

Message ID 1470847539-2048114-1-git-send-email-ast@fb.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Alexei Starovoitov Aug. 10, 2016, 4:45 p.m. UTC 
From: Adam Barth <arb@fb.com>

The commit 555c8a8623a3 ("bpf: avoid stack copy and use skb ctx for event output")
started using 20 of initially reserved upper 32-bits of 'flags' argument
in bpf_perf_event_output(). Adjust corresponding prototype in samples/bpf/bpf_helpers.h

Signed-off-by: Adam Barth <arb@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
---
 samples/bpf/bpf_helpers.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

David Miller Aug. 11, 2016, 6:13 a.m. UTC | #1 
From: Alexei Starovoitov <ast@fb.com>
Date: Wed, 10 Aug 2016 09:45:39 -0700

> From: Adam Barth <arb@fb.com>
> 
> The commit 555c8a8623a3 ("bpf: avoid stack copy and use skb ctx for event output")
> started using 20 of initially reserved upper 32-bits of 'flags' argument
> in bpf_perf_event_output(). Adjust corresponding prototype in samples/bpf/bpf_helpers.h
> 
> Signed-off-by: Adam Barth <arb@fb.com>
> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
> Acked-by: Daniel Borkmann <daniel@iogearbox.net>

Applied, thanks.
diff mbox

Patch

diff --git a/samples/bpf/bpf_helpers.h b/samples/bpf/bpf_helpers.h
index 217c8d507f2e..cbc52df165b4 100644
--- a/samples/bpf/bpf_helpers.h
+++ b/samples/bpf/bpf_helpers.h
@@ -37,7 +37,9 @@  static int (*bpf_clone_redirect)(void *ctx, int ifindex, int flags) =
 	(void *) BPF_FUNC_clone_redirect;
 static int (*bpf_redirect)(int ifindex, int flags) =
 	(void *) BPF_FUNC_redirect;
-static int (*bpf_perf_event_output)(void *ctx, void *map, int index, void *data, int size) =
+static int (*bpf_perf_event_output)(void *ctx, void *map,
+				    unsigned long long flags, void *data,
+				    int size) =
 	(void *) BPF_FUNC_perf_event_output;
 static int (*bpf_get_stackid)(void *ctx, void *map, int flags) =
 	(void *) BPF_FUNC_get_stackid;