examples: annotate ringbuf and perf event arrays with value type info…

…rmation This obviates the need for declaring these unused variables, which would otherwise get included in bpf2go-generated Go code in a follow-up commit. Signed-off-by: Timo Beckers <timo@isovalent.com>
cilium · Dec 16, 2024 · 60405bb · 60405bb
1 parent e9bcebb
commit 60405bb
Show file tree

Hide file tree

Showing 14 changed files with 5 additions and 9 deletions.
diff --git a/examples/fentry/bpf_bpfeb.o b/examples/fentry/bpf_bpfeb.o
diff --git a/examples/fentry/bpf_bpfel.o b/examples/fentry/bpf_bpfel.o
diff --git a/examples/fentry/fentry.c b/examples/fentry/fentry.c
@@ -57,6 +57,7 @@ struct sock {
 struct {
 	__uint(type, BPF_MAP_TYPE_RINGBUF);
 	__uint(max_entries, 1 << 24);
+	__type(value, struct event);
 } events SEC(".maps");
 
 /**
@@ -71,7 +72,6 @@ struct event {
 	__be32 saddr;
 	__be32 daddr;
 };
-struct event *unused __attribute__((unused));
 
 SEC("fentry/tcp_connect")
 int BPF_PROG(tcp_connect, struct sock *sk) {

diff --git a/examples/ringbuffer/bpf_bpfeb.o b/examples/ringbuffer/bpf_bpfeb.o
diff --git a/examples/ringbuffer/bpf_bpfel.o b/examples/ringbuffer/bpf_bpfel.o
diff --git a/examples/ringbuffer/ringbuffer.c b/examples/ringbuffer/ringbuffer.c
@@ -16,11 +16,9 @@ struct event {
 struct {
 	__uint(type, BPF_MAP_TYPE_RINGBUF);
 	__uint(max_entries, 1 << 24);
+	__type(value, struct event);
 } events SEC(".maps");
 
-// Force emitting struct event into the ELF.
-const struct event *unused __attribute__((unused));
-
 SEC("kprobe/sys_execve")
 int kprobe_execve(struct pt_regs *ctx) {
 	u64 id   = bpf_get_current_pid_tgid();

diff --git a/examples/tcprtt/bpf_bpfeb.o b/examples/tcprtt/bpf_bpfeb.o
diff --git a/examples/tcprtt/bpf_bpfel.o b/examples/tcprtt/bpf_bpfel.o
diff --git a/examples/tcprtt/tcprtt.c b/examples/tcprtt/tcprtt.c
@@ -68,6 +68,7 @@ struct tcp_sock {
 struct {
 	__uint(type, BPF_MAP_TYPE_RINGBUF);
 	__uint(max_entries, 1 << 24);
+	__type(value, struct event);
 } events SEC(".maps");
 
 /**
@@ -82,7 +83,6 @@ struct event {
 	u32 daddr;
 	u32 srtt;
 };
-struct event *unused_event __attribute__((unused));
 
 SEC("fentry/tcp_close")
 int BPF_PROG(tcp_close, struct sock *sk) {

diff --git a/examples/tcprtt_sockops/bpf_bpfeb.o b/examples/tcprtt_sockops/bpf_bpfeb.o
diff --git a/examples/tcprtt_sockops/bpf_bpfel.o b/examples/tcprtt_sockops/bpf_bpfel.o
diff --git a/examples/tcprtt_sockops/tcprtt_sockops.c b/examples/tcprtt_sockops/tcprtt_sockops.c
@@ -38,6 +38,7 @@ struct sk_info {
 struct {
 	__uint(type, BPF_MAP_TYPE_RINGBUF);
 	__uint(max_entries, 1 << 24);
+	__type(value, struct rtt_event);
 } rtt_events SEC(".maps");
 
 struct rtt_event {
@@ -47,7 +48,6 @@ struct rtt_event {
 	u32 daddr;
 	u32 srtt;
 };
-struct rtt_event *unused_event __attribute__((unused));
 
 static inline void init_sk_key(struct bpf_sock_ops *skops, struct sk_key *sk_key) {
 	sk_key->local_ip4   = bpf_ntohl(skops->local_ip4);

diff --git a/examples/uretprobe/bpf_x86_bpfel.o b/examples/uretprobe/bpf_x86_bpfel.o
diff --git a/examples/uretprobe/uretprobe.c b/examples/uretprobe/uretprobe.c
@@ -13,11 +13,9 @@ struct event {
 
 struct {
 	__uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY);
+	__type(value, struct event);
 } events SEC(".maps");
 
-// Force emitting struct event into the ELF.
-const struct event *unused __attribute__((unused));
-
 SEC("uretprobe/bash_readline")
 int uretprobe_bash_readline(struct pt_regs *ctx) {
 	struct event event;