Use vmlinux.h provided headers

Switch over to using the architecture specific vmlinux.h headers from
the vmlinux.h submodule.

Signed-off-by: Daniel Müller <deso@posteo.net>

Author: d-e-s-o

examples/c/CMakeLists.txt

@@ -68,7 +68,7 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "loongarch64")
 endif()
 
 set(BPFOBJECT_BPFTOOL_EXE ${CMAKE_CURRENT_BINARY_DIR}/bpftool/bootstrap/bpftool)
-set(BPFOBJECT_VMLINUX_H ${CMAKE_CURRENT_SOURCE_DIR}/../../vmlinux/${ARCH}/vmlinux.h)
+set(BPFOBJECT_VMLINUX_H ${CMAKE_CURRENT_SOURCE_DIR}/../../vmlinux.h/include/${ARCH}/vmlinux.h)
 set(LIBBPF_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/libbpf)
 set(LIBBPF_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/libbpf/libbpf.a)
 find_package(BpfObject REQUIRED)

examples/c/Makefile

@@ -16,7 +16,7 @@ ARCH ?= $(shell uname -m | sed 's/x86_64/x86/' \
 			 | sed 's/mips.*/mips/' \
 			 | sed 's/riscv64/riscv/' \
 			 | sed 's/loongarch64/loongarch/')
-VMLINUX := ../../vmlinux/$(ARCH)/vmlinux.h
+VMLINUX := ../../vmlinux.h/include/$(ARCH)/vmlinux.h
 # Use our own libbpf API headers and Linux UAPI headers distributed with
 # libbpf to avoid dependency on system-wide headers, which could be missing or
 # outdated

examples/c/xmake.lua

@@ -26,19 +26,19 @@ end
 set_symbols("none")
 
 if is_arch("arm64", "arm64-v8a") then
-    add_includedirs("../../vmlinux/arm64")
+    add_includedirs("../../vmlinux.h/include/arm64")
 elseif is_arch("arm.*") then
-    add_includedirs("../../vmlinux/arm")
+    add_includedirs("../../vmlinux.h/include/arm")
 elseif is_arch("riscv32", "riscv64") then
-    add_includedirs("../../vmlinux/riscv")
+    add_includedirs("../../vmlinux.h/include/riscv")
 elseif is_arch("loongarch") then
-    add_includedirs("../../vmlinux/loongarch")
+    add_includedirs("../../vmlinux.h/include/loongarch")
 elseif is_arch("ppc", "powerpc") then
-    add_includedirs("../../vmlinux/powerpc")
+    add_includedirs("../../vmlinux.h/include/powerpc")
 elseif is_arch("x86_64", "i386") then
-    add_includedirs("../../vmlinux/x86")
+    add_includedirs("../../vmlinux.h/include/x86")
 else
-    add_includedirs("../../vmlinux")
+    add_includedirs("../../vmlinux.h/include")
 end
 
 -- we can run `xmake f --require-bpftool=y` to pull bpftool from xmake-repo repository

examples/rust/profile/build.rs

@@ -18,16 +18,7 @@ fn main() {
         .source(SRC)
         .clang_args(format!(
             "-I{}",
-            Path::new("../../../vmlinux")
-                .join(match arch.as_ref() {
-                    "aarch64" => "arm64",
-                    "loongarch64" => "loongarch",
-                    "powerpc64" => "powerpc",
-                    "riscv64" => "riscv",
-                    "x86_64" => "x86",
-                    _ => &arch,
-                })
-                .display()
+            Path::new("../../../vmlinux.h/include").join(arch).display()
         ))
         .build_and_generate(out)
         .expect("bpf compilation failed");

examples/rust/tracecon/build.rs

@@ -18,16 +18,7 @@ fn main() {
         .source(SRC)
         .clang_args(format!(
             "-I{}",
-            Path::new("../../../vmlinux")
-                .join(match arch.as_ref() {
-                    "aarch64" => "arm64",
-                    "loongarch64" => "loongarch",
-                    "powerpc64" => "powerpc",
-                    "riscv64" => "riscv",
-                    "x86_64" => "x86",
-                    _ => &arch,
-                })
-                .display()
+            Path::new("../../../vmlinux.h/include").join(arch).display()
         ))
         .build_and_generate(&out)
         .expect("bpf compilation failed");

examples/rust/xdp/build.rs

@@ -18,16 +18,7 @@ fn main() {
         .source(SRC)
         .clang_args(format!(
             "-I{}",
-            Path::new("../../../vmlinux")
-                .join(match arch.as_ref() {
-                    "aarch64" => "arm64",
-                    "loongarch64" => "loongarch",
-                    "powerpc64" => "powerpc",
-                    "riscv64" => "riscv",
-                    "x86_64" => "x86",
-                    _ => &arch,
-                })
-                .display()
+            Path::new("../../../vmlinux.h/include").join(arch).display()
         ))
         .build_and_generate(out)
         .unwrap();