Replace vmlinux crate with vmlinux.h repository

Switch to using the centrally-managed vmlinux.h repository [0] for
pulling in vmlinux.h headers used for development purposes. Doing so
means that the burden of management of these headers is no longer with
this repository and that a bunch of data is outsourced as well.

[0] https://github.com/libbpf/vmlinux.h

Signed-off-by: Daniel Müller <[email protected]>

Author: d-e-s-o

Cargo.lock

@@ -8,7 +8,6 @@ homepage = "https://github.com/libbpf/libbpf-rs"
 
 [workspace]
 members = [
-  "vmlinux",
   "libbpf-cargo",
   "libbpf-rs",
   "examples/bpf_query",

Cargo.toml

@@ -7,7 +7,7 @@ license = "LGPL-2.1-only OR BSD-2-Clause"
 
 [build-dependencies]
 libbpf-cargo = { path = "../../libbpf-cargo" }
-vmlinux = { path = "../../vmlinux" }
+vmlinux = { version = "0.0", git = "https://github.com/libbpf/vmlinux.h.git", rev = "a9c092aa771310bf8b00b5018f7d40a1fdb6ec82" }
 
 [dependencies]
 anyhow = "1.0.4"

examples/capable/Cargo.toml

@@ -7,7 +7,7 @@ license = "LGPL-2.1-only OR BSD-2-Clause"
 
 [build-dependencies]
 libbpf-cargo = { path = "../../libbpf-cargo" }
-vmlinux = { path = "../../vmlinux" }
+vmlinux = { version = "0.0", git = "https://github.com/libbpf/vmlinux.h.git", rev = "a9c092aa771310bf8b00b5018f7d40a1fdb6ec82" }
 
 [dependencies]
 anyhow = "1.0"

examples/runqslower/Cargo.toml

@@ -7,7 +7,7 @@ license = "LGPL-2.1-only OR BSD-2-Clause"
 
 [build-dependencies]
 libbpf-cargo = { path = "../../libbpf-cargo" }
-vmlinux = { path = "../../vmlinux" }
+vmlinux = { version = "0.0", git = "https://github.com/libbpf/vmlinux.h.git", rev = "a9c092aa771310bf8b00b5018f7d40a1fdb6ec82" }
 
 [dependencies]
 anyhow = "1.0"

examples/tc_port_whitelist/Cargo.toml

@@ -7,7 +7,7 @@ license = "LGPL-2.1-only OR BSD-2-Clause"
 
 [build-dependencies]
 libbpf-cargo = { path = "../../libbpf-cargo" }
-vmlinux = { path = "../../vmlinux" }
+vmlinux = { version = "0.0", git = "https://github.com/libbpf/vmlinux.h.git", rev = "a9c092aa771310bf8b00b5018f7d40a1fdb6ec82" }
 
 [dependencies]
 clap = { version = "4.0.32", features = ["derive"] }

examples/tcp_ca/Cargo.toml

@@ -6,7 +6,7 @@ license = "LGPL-2.1-only OR BSD-2-Clause"
 
 [build-dependencies]
 libbpf-cargo = { path = "../../libbpf-cargo" }
-vmlinux = { path = "../../vmlinux" }
+vmlinux = { version = "0.0", git = "https://github.com/libbpf/vmlinux.h.git", rev = "a9c092aa771310bf8b00b5018f7d40a1fdb6ec82" }
 
 [dependencies]
 anyhow = "1.0"

examples/tcp_option/Cargo.toml

@@ -10,7 +10,7 @@ name = "proxy"
 
 [build-dependencies]
 libbpf-cargo = { path = "../../libbpf-cargo" }
-vmlinux = { path = "../../vmlinux" }
+vmlinux = { version = "0.0", git = "https://github.com/libbpf/vmlinux.h.git", rev = "a9c092aa771310bf8b00b5018f7d40a1fdb6ec82" }
 
 [dependencies]
 anyhow = "1.0"

examples/tproxy/Cargo.toml

@@ -42,4 +42,4 @@ clap = { version = "4.0.32", features = ["derive"] }
 
 [dev-dependencies]
 goblin = "0.6"
-vmlinux = { path = "../vmlinux" }
+vmlinux = { version = "0.0", git = "https://github.com/libbpf/vmlinux.h.git", rev = "a9c092aa771310bf8b00b5018f7d40a1fdb6ec82" }

libbpf-cargo/Cargo.toml

@@ -9,6 +9,7 @@ use std::io::ErrorKind;
 use std::io::Result;
 use std::ops::Deref as _;
 use std::path::Path;
+use std::path::PathBuf;
 use std::process::Command;
 use std::process::Output;
 use std::process::Stdio;
@@ -66,13 +67,19 @@ where
 }
 
 
-fn run_impl<C, A, S>(command: C, args: A, stdout: Stdio) -> Result<Output>
+fn run_impl<C, A, S>(command: C, args: A, stdout: Stdio, cwd: Option<&Path>) -> Result<Output>
 where
     C: AsRef<OsStr>,
     A: IntoIterator<Item = S> + Clone,
     S: AsRef<OsStr>,
 {
-    let output = Command::new(command.as_ref())
+    let mut builder = Command::new(command.as_ref());
+
+    if let Some(cwd) = cwd {
+        builder.current_dir(cwd);
+    }
+
+    let output = builder
         .stdin(Stdio::null())
         .stdout(stdout)
         .env_clear()
@@ -100,10 +107,23 @@ where
     A: IntoIterator<Item = S> + Clone,
     S: AsRef<OsStr>,
 {
-    let _output = run_impl(command, args, Stdio::null())?;
+    let cwd = None;
+    let _output = run_impl(command, args, Stdio::null(), cwd)?;
     Ok(())
 }
 
+/// Run a command and capture its output.
+fn output<C, A, S, P>(command: C, args: A, cwd: P) -> Result<Vec<u8>>
+where
+    C: AsRef<OsStr>,
+    A: IntoIterator<Item = S> + Clone,
+    S: AsRef<OsStr>,
+    P: AsRef<Path>,
+{
+    let output = run_impl(command, args, Stdio::piped(), Some(cwd.as_ref()))?;
+    Ok(output.stdout)
+}
+
 fn adjust_mtime(path: &Path) -> Result<()> {
     // Note that `OUT_DIR` is only present at runtime.
     let out_dir = env::var("OUT_DIR").unwrap();
@@ -199,7 +219,13 @@ where
 fn prepare_test_files(crate_root: &Path) {
     let bin_dir = crate_root.join("tests").join("bin");
     let src_dir = bin_dir.join("src");
-    let include = crate_root.join("../vmlinux/include").join(ARCH);
+    let include_root = output(
+        "cargo",
+        ["run", "--quiet"],
+        crate_root.parent().unwrap().join("vmlinux-include"),
+    )
+    .unwrap();
+    let include = PathBuf::from(&String::from_utf8(include_root).unwrap().trim_end()).join(ARCH);
 
     with_bpf_headers(|bpf_hdr_dir| {
         for result in read_dir(&src_dir).unwrap() {