examples: Use vmlinux.h for current architecture

In order to compile the BPF byte code the examples need vmlinux.h to be available. This header is vendored alongside the examples, but it is specific to x86. That causes issues once said examples are compiled for any other architecture. This change fixes this problem by vendoring vmlinux.h for more architectures (copied from libbpf-bootstrap, where we maintain such a set of header files already). It also adjusts all examples to pick the appropriate header file for the architecture currently being targeted. Fixes: #615 Signed-off-by: Daniel Müller <[email protected]>
libbpf · Jan 18, 2024 · beff188 · beff188
1 parent 59b482a
commit beff188
Show file tree

Hide file tree

Showing 23 changed files with 845,234 additions and 103,191 deletions.
diff --git a/examples/capable/build.rs b/examples/capable/build.rs
@@ -1,7 +1,10 @@
-use libbpf_cargo::SkeletonBuilder;
 use std::env;
+use std::env::consts::ARCH;
+use std::path::Path;
 use std::path::PathBuf;
 
+use libbpf_cargo::SkeletonBuilder;
+
 const SRC: &str = "src/bpf/capable.bpf.c";
 
 fn main() {
@@ -10,6 +13,10 @@ fn main() {
     out.push("capable.skel.rs");
     SkeletonBuilder::new()
         .source(SRC)
+        .clang_args(format!(
+            "-I{}",
+            Path::new("../vmlinux").join(ARCH).display()
+        ))
         .build_and_generate(&out)
         .unwrap();
     println!("cargo:rerun-if-changed={SRC}");

diff --git a/examples/capable/src/bpf/vmlinux.h b/examples/capable/src/bpf/vmlinux.h
diff --git a/examples/runqslower/build.rs b/examples/runqslower/build.rs
@@ -1,7 +1,10 @@
-use libbpf_cargo::SkeletonBuilder;
 use std::env;
+use std::env::consts::ARCH;
+use std::path::Path;
 use std::path::PathBuf;
 
+use libbpf_cargo::SkeletonBuilder;
+
 const SRC: &str = "src/bpf/runqslower.bpf.c";
 
 fn main() {
@@ -10,6 +13,10 @@ fn main() {
     out.push("runqslower.skel.rs");
     SkeletonBuilder::new()
         .source(SRC)
+        .clang_args(format!(
+            "-I{}",
+            Path::new("../vmlinux").join(ARCH).display()
+        ))
         .build_and_generate(&out)
         .unwrap();
     println!("cargo:rerun-if-changed={SRC}");

diff --git a/examples/runqslower/src/bpf/vmlinux.h b/examples/runqslower/src/bpf/vmlinux.h
diff --git a/examples/tc_port_whitelist/build.rs b/examples/tc_port_whitelist/build.rs
@@ -1,7 +1,10 @@
-use libbpf_cargo::SkeletonBuilder;
 use std::env;
+use std::env::consts::ARCH;
+use std::path::Path;
 use std::path::PathBuf;
 
+use libbpf_cargo::SkeletonBuilder;
+
 const SRC: &str = "src/bpf/tc.bpf.c";
 
 fn main() {
@@ -10,6 +13,10 @@ fn main() {
     out.push("tc.skel.rs");
     SkeletonBuilder::new()
         .source(SRC)
+        .clang_args(format!(
+            "-I{}",
+            Path::new("../vmlinux").join(ARCH).display()
+        ))
         .build_and_generate(&out)
         .unwrap();
     println!("cargo:rerun-if-changed={SRC}");

diff --git a/examples/tc_port_whitelist/src/bpf/vmlinux.h b/examples/tc_port_whitelist/src/bpf/vmlinux.h
diff --git a/examples/tproxy/build.rs b/examples/tproxy/build.rs
@@ -1,7 +1,10 @@
-use libbpf_cargo::SkeletonBuilder;
 use std::env;
+use std::env::consts::ARCH;
+use std::path::Path;
 use std::path::PathBuf;
 
+use libbpf_cargo::SkeletonBuilder;
+
 const SRC: &str = "src/bpf/tproxy.bpf.c";
 
 fn main() {
@@ -10,7 +13,10 @@ fn main() {
     out.push("tproxy.skel.rs");
     SkeletonBuilder::new()
         .source(SRC)
-        .clang_args("-Wno-compare-distinct-pointer-types")
+        .clang_args(format!(
+            "-Wno-compare-distinct-pointer-types -I{}",
+            Path::new("../vmlinux").join(ARCH).display()
+        ))
         .build_and_generate(&out)
         .unwrap();
     println!("cargo:rerun-if-changed={SRC}");

diff --git a/examples/tproxy/src/bpf/vmlinux.h b/examples/tproxy/src/bpf/vmlinux.h
diff --git a/examples/vmlinux/aarch64/vmlinux.h b/examples/vmlinux/aarch64/vmlinux.h