* [PATCH net-next] samples/bpf: fix bpf_perf_event_output prototype
@ 2016-08-10 16:45 Alexei Starovoitov
2016-08-11 6:13 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Alexei Starovoitov @ 2016-08-10 16:45 UTC (permalink / raw)
To: David S . Miller; +Cc: Daniel Borkmann, Adam Barth, netdev, kernel-team
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(-)
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;
--
2.8.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH net-next] samples/bpf: fix bpf_perf_event_output prototype
2016-08-10 16:45 [PATCH net-next] samples/bpf: fix bpf_perf_event_output prototype Alexei Starovoitov
@ 2016-08-11 6:13 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-08-11 6:13 UTC (permalink / raw)
To: ast; +Cc: daniel, arb, netdev, kernel-team
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-11 6:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-10 16:45 [PATCH net-next] samples/bpf: fix bpf_perf_event_output prototype Alexei Starovoitov
2016-08-11 6:13 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).