libbpf-rs: Few changes to recent patches

This patch changes a few nuisances from recent pull requests:
- Rename `Linker::add()` to `add_file` to follow libbpf naming more
  closely (I still kept `Linker::link()` (as opposed to finalize)) as it
  seems apt.
- Fix `SEC` used in `test_skeleton_builder_deterministic`. The program
  would no longer load with libbpf 1.0.
- Use `vmlinux.h` instead of `<linux/bpf.h>` for consistency with other
  skeletons.

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

Author: d-e-s-o

libbpf-cargo/src/build.rs

@@ -118,7 +118,7 @@ fn strip_dwarf_info(file: &Path) -> Result<()> {
     let mut linker =
         libbpf_rs::Linker::new(file).context("Failed to instantiate libbpf object file linker")?;
     linker
-        .add(temp_file)
+        .add_file(temp_file)
         .context("Failed to add object file to BPF linker")?;
     linker.link().context("Failed to link object file")?;
     Ok(())

libbpf-cargo/src/test.rs

@@ -929,14 +929,14 @@ fn test_skeleton_builder_deterministic() {
     write(
         proj_dir.join("src/bpf/prog.bpf.c"),
         r#"
-            #include <linux/bpf.h>
+            #include "vmlinux.h"
             #include <bpf/bpf_helpers.h>
 
             struct {
                 __uint(type, BPF_MAP_TYPE_REUSEPORT_SOCKARRAY);
             } sock_map SEC(".maps");
 
-            SEC("sk_reuseport/reuse_pass")
+            SEC("sk_reuseport")
             long prog_select_sk(struct sk_reuseport_md *reuse_md)
             {
                 unsigned int index = 0;
@@ -947,6 +947,8 @@ fn test_skeleton_builder_deterministic() {
     )
     .expect("failed to write prog.bpf.c");
 
+    add_vmlinux_header(&proj_dir);
+
     let skel1 = NamedTempFile::new().unwrap();
     SkeletonBuilder::new()
         .source(proj_dir.join("src/bpf/prog.bpf.c"))

libbpf-rs/src/linker.rs

@@ -37,7 +37,7 @@ impl Linker {
     }
 
     /// Add a file to the set of files to link.
-    pub fn add<P>(&mut self, file: P) -> Result<()>
+    pub fn add_file<P>(&mut self, file: P) -> Result<()>
     where
         P: AsRef<Path>,
     {
@@ -52,7 +52,8 @@ impl Linker {
         }
     }
 
-    /// Link all BPF object files [`add`](Self::add)ed to this object into a single one.
+    /// Link all BPF object files [added](Self::add_file) to this object into
+    /// a single one.
     pub fn link(&self) -> Result<()> {
         // SAFETY: `linker` is a valid pointer.
         let err = unsafe { libbpf_sys::bpf_linker__finalize(self.linker) };

libbpf-rs/tests/test.rs

@@ -1027,7 +1027,7 @@ fn test_object_link_files() {
         let mut linker = Linker::new(output_file.path()).unwrap();
         let () = files
             .into_iter()
-            .try_for_each(|file| linker.add(file))
+            .try_for_each(|file| linker.add_file(file))
             .unwrap();
         let () = linker.link().unwrap();