examples: include bpf_helpers.h from common.h

Since bpf_helpers.h includes bpf_helper_defs.h, which depends on certain types like __u64 being defined, work with a single common.h include in examples to make sure this is all set up properly. This ensures any future vendor updates to bpf_*.h continue to function. Signed-off-by: Timo Beckers <[email protected]>
cilium · Mar 30, 2022 · e0ada27 · e0ada27
1 parent a4ccb18
commit e0ada27
Show file tree

Hide file tree

Showing 19 changed files with 5 additions and 12 deletions.
diff --git a/examples/cgroup_skb/cgroup_skb.c b/examples/cgroup_skb/cgroup_skb.c
@@ -1,6 +1,6 @@
 // +build ignore
 
-#include "bpf_helpers.h"
+#include "common.h"
 
 char __license[] SEC("license") = "Dual MIT/GPL";
 

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
@@ -3,7 +3,6 @@
 #include "common.h"
 
 #include "bpf_endian.h"
-#include "bpf_helpers.h"
 #include "bpf_tracing.h"
 
 #define AF_INET 2

diff --git a/examples/headers/bpf_helpers.h b/examples/headers/bpf_helpers.h
@@ -8,7 +8,6 @@
  * in advance since bpf_helper_defs.h uses such types
  * as __u64.
  */
-#include "common.h"
 #include "bpf_helper_defs.h"
 
 #define __uint(name, val) int (*name)[val]

diff --git a/examples/headers/common.h b/examples/headers/common.h
@@ -22,6 +22,8 @@ typedef __u32 __be32;
 typedef __u64 __be64;
 typedef __u32 __wsum;
 
+#include "bpf_helpers.h"
+
 enum bpf_map_type {
 	BPF_MAP_TYPE_UNSPEC                = 0,
 	BPF_MAP_TYPE_HASH                  = 1,

diff --git a/examples/kprobe/kprobe.c b/examples/kprobe/kprobe.c
@@ -1,6 +1,6 @@
 // +build ignore
 
-#include "bpf_helpers.h"
+#include "common.h"
 
 char __license[] SEC("license") = "Dual MIT/GPL";
 

diff --git a/examples/kprobe_percpu/bpf_bpfeb.o b/examples/kprobe_percpu/bpf_bpfeb.o
diff --git a/examples/kprobe_percpu/bpf_bpfel.o b/examples/kprobe_percpu/bpf_bpfel.o
diff --git a/examples/kprobe_percpu/kprobe_percpu.c b/examples/kprobe_percpu/kprobe_percpu.c
@@ -2,8 +2,6 @@
 
 #include "common.h"
 
-#include "bpf_helpers.h"
-
 char __license[] SEC("license") = "Dual MIT/GPL";
 
 struct bpf_map_def SEC("maps") kprobe_map = {

diff --git a/examples/kprobepin/kprobe_pin.c b/examples/kprobepin/kprobe_pin.c
@@ -1,6 +1,6 @@
 // +build ignore
 
-#include "bpf_helpers.h"
+#include "common.h"
 
 char __license[] SEC("license") = "Dual MIT/GPL";
 

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
@@ -2,8 +2,6 @@
 
 #include "common.h"
 
-#include "bpf_helpers.h"
-
 char __license[] SEC("license") = "Dual MIT/GPL";
 
 struct event {

diff --git a/examples/tracepoint_in_c/bpf_bpfeb.o b/examples/tracepoint_in_c/bpf_bpfeb.o
diff --git a/examples/tracepoint_in_c/bpf_bpfel.o b/examples/tracepoint_in_c/bpf_bpfel.o
diff --git a/examples/tracepoint_in_c/tracepoint.c b/examples/tracepoint_in_c/tracepoint.c
@@ -2,8 +2,6 @@
 
 #include "common.h"
 
-#include "bpf_helpers.h"
-
 char __license[] SEC("license") = "Dual MIT/GPL";
 
 struct bpf_map_def SEC("maps") counting_map = {

diff --git a/examples/uretprobe/bpf_bpfel_x86.o b/examples/uretprobe/bpf_bpfel_x86.o
diff --git a/examples/uretprobe/uretprobe.c b/examples/uretprobe/uretprobe.c
@@ -2,7 +2,6 @@
 
 #include "common.h"
 
-#include "bpf_helpers.h"
 #include "bpf_tracing.h"
 
 char __license[] SEC("license") = "Dual MIT/GPL";