Revert "libbpf-rs, libbpf-cargo: Update to libbpf-sys v 1.1.0"

This reverts commit 271895a.

libbpf-sys has updated to 1.1.1 and the changes to compile
against 1.1.0 now cause breaks.

Signed-off-by: Michael Mullin <mimullin@blackberry.com>

Author: mimullin-bbry

Cargo.lock

@@ -32,7 +32,7 @@ novendor = ["libbpf-sys/novendor"]
 [dependencies]
 anyhow = "1.0"
 cargo_metadata = "0.14"
-libbpf-sys = { version = "1.1.0" }
+libbpf-sys = { version = "1.0.3" }
 memmap2 = "0.5"
 num_enum = "0.5"
 regex = { version = "1.6.0", default-features = false, features = ["std", "unicode-perl"] }

libbpf-cargo/Cargo.toml

@@ -5,7 +5,7 @@ use std::ffi::{c_void, CStr, CString};
 use std::fmt::Write;
 use std::marker::PhantomData;
 use std::mem::size_of;
-use std::os::raw::c_char;
+use std::os::raw::{c_char, c_ulong};
 use std::ptr;
 use std::slice;
 
@@ -375,14 +375,14 @@ impl Btf {
     pub fn new(name: &str, object_file: &[u8]) -> Result<Option<Self>> {
         let cname = CString::new(name)?;
         let obj_opts = libbpf_sys::bpf_object_open_opts {
-            sz: std::mem::size_of::<libbpf_sys::bpf_object_open_opts>(),
+            sz: std::mem::size_of::<libbpf_sys::bpf_object_open_opts>() as libbpf_sys::size_t,
             object_name: cname.as_ptr(),
             ..Default::default()
         };
         let bpf_obj = unsafe {
             libbpf_sys::bpf_object__open_mem(
                 object_file.as_ptr() as *const c_void,
-                object_file.len(),
+                object_file.len() as c_ulong,
                 &obj_opts,
             )
         };

libbpf-cargo/src/btf/btf.rs

@@ -7,6 +7,7 @@ use std::fs::File;
 use std::io::stdout;
 use std::io::ErrorKind;
 use std::io::Write;
+use std::os::raw::c_ulong;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 use std::ptr;
@@ -603,12 +604,16 @@ fn gen_skel_link_getter(skel: &mut String, object: &mut BpfObj, obj_name: &str)
 fn open_bpf_object(name: &str, data: &[u8]) -> Result<BpfObj> {
     let cname = CString::new(name)?;
     let obj_opts = libbpf_sys::bpf_object_open_opts {
-        sz: std::mem::size_of::<libbpf_sys::bpf_object_open_opts>(),
+        sz: std::mem::size_of::<libbpf_sys::bpf_object_open_opts>() as libbpf_sys::size_t,
         object_name: cname.as_ptr(),
         ..Default::default()
     };
     let object = unsafe {
-        libbpf_sys::bpf_object__open_mem(data.as_ptr() as *const c_void, data.len(), &obj_opts)
+        libbpf_sys::bpf_object__open_mem(
+            data.as_ptr() as *const c_void,
+            data.len() as c_ulong,
+            &obj_opts,
+        )
     };
     if object.is_null() {
         bail!("Failed to bpf_object__open_mem()");

libbpf-cargo/src/gen.rs

@@ -23,7 +23,7 @@ static = ["libbpf-sys/static"]
 [dependencies]
 bitflags = "1.3"
 lazy_static = "1.4"
-libbpf-sys = { version = "1.1.0" }
+libbpf-sys = { version = "1.0.3" }
 nix = { version = "0.24", default-features = false, features = ["net", "user"] }
 num_enum = "0.5"
 strum_macros = "0.23"

libbpf-rs/Cargo.toml

@@ -57,7 +57,7 @@ impl OpenMap {
             libbpf_sys::bpf_map__set_initial_value(
                 self.ptr,
                 data.as_ptr() as *const std::ffi::c_void,
-                data.len(),
+                data.len() as libbpf_sys::size_t,
             )
         };
 

libbpf-rs/src/map.rs

@@ -39,7 +39,7 @@ impl ObjectBuilder {
     /// Get an instance of libbpf_sys::bpf_object_open_opts.
     pub fn opts(&mut self, name: *const c_char) -> libbpf_sys::bpf_object_open_opts {
         libbpf_sys::bpf_object_open_opts {
-            sz: mem::size_of::<libbpf_sys::bpf_object_open_opts>(),
+            sz: mem::size_of::<libbpf_sys::bpf_object_open_opts>() as libbpf_sys::size_t,
             object_name: name,
             relaxed_maps: self.relaxed_maps,
             pin_root_path: ptr::null(),
@@ -97,7 +97,11 @@ impl ObjectBuilder {
         let opts = self.opts(name_ptr);
 
         let obj = unsafe {
-            libbpf_sys::bpf_object__open_mem(mem.as_ptr() as *const c_void, mem.len(), &opts)
+            libbpf_sys::bpf_object__open_mem(
+                mem.as_ptr() as *const c_void,
+                mem.len() as libbpf_sys::size_t,
+                &opts,
+            )
         };
         let err = unsafe { libbpf_sys::libbpf_get_error(obj as *const _) };
         if err != 0 {

libbpf-rs/src/object.rs

@@ -113,7 +113,7 @@ impl<'a, 'b> PerfBufferBuilder<'a, 'b> {
         let ptr = unsafe {
             libbpf_sys::perf_buffer__new(
                 self.map.fd(),
-                self.pages,
+                self.pages as libbpf_sys::size_t,
                 c_sample_cb,
                 c_lost_cb,
                 callback_struct_ptr as *mut _,
@@ -175,16 +175,19 @@ impl<'b> PerfBuffer<'b> {
     }
 
     pub fn consume_buffer(&self, buf_idx: usize) -> Result<()> {
-        let ret = unsafe { libbpf_sys::perf_buffer__consume_buffer(self.ptr, buf_idx) };
+        let ret = unsafe {
+            libbpf_sys::perf_buffer__consume_buffer(self.ptr, buf_idx as libbpf_sys::size_t)
+        };
         util::parse_ret(ret)
     }
 
     pub fn buffer_cnt(&self) -> usize {
-        unsafe { libbpf_sys::perf_buffer__buffer_cnt(self.ptr) }
+        unsafe { libbpf_sys::perf_buffer__buffer_cnt(self.ptr) as usize }
     }
 
     pub fn buffer_fd(&self, buf_idx: usize) -> Result<i32> {
-        let ret = unsafe { libbpf_sys::perf_buffer__buffer_fd(self.ptr, buf_idx) };
+        let ret =
+            unsafe { libbpf_sys::perf_buffer__buffer_fd(self.ptr, buf_idx as libbpf_sys::size_t) };
         util::parse_ret_i32(ret)
     }
 }

libbpf-rs/src/perf_buffer.rs

@@ -105,7 +105,7 @@ impl OpenProgram {
     /// So [`OpenProgram::insn_cnt`] and [`Program::insn_cnt`] may return different values.
     ///
     pub fn insn_cnt(&self) -> usize {
-        unsafe { libbpf_sys::bpf_program__insn_cnt(self.ptr) }
+        unsafe { libbpf_sys::bpf_program__insn_cnt(self.ptr) as usize }
     }
 
     /// Gives read-only access to BPF program's underlying BPF instructions.
@@ -374,7 +374,13 @@ impl Program {
         let path = util::path_to_cstring(binary_path.as_ref())?;
         let path_ptr = path.as_ptr();
         let ptr = unsafe {
-            libbpf_sys::bpf_program__attach_uprobe(self.ptr, retprobe, pid, path_ptr, func_offset)
+            libbpf_sys::bpf_program__attach_uprobe(
+                self.ptr,
+                retprobe,
+                pid,
+                path_ptr,
+                func_offset as libbpf_sys::size_t,
+            )
         };
         let err = unsafe { libbpf_sys::libbpf_get_error(ptr as *const _) };
         if err != 0 {
@@ -520,7 +526,7 @@ impl Program {
     ///
     /// Please see note in [`OpenProgram::insn_cnt`].
     pub fn insn_cnt(&self) -> usize {
-        unsafe { libbpf_sys::bpf_program__insn_cnt(self.ptr) }
+        unsafe { libbpf_sys::bpf_program__insn_cnt(self.ptr) as usize }
     }
 
     /// Gives read-only access to BPF program's underlying BPF instructions.

libbpf-rs/src/program.rs

@@ -1,5 +1,6 @@
 use core::ffi::c_void;
 use std::boxed::Box;
+use std::os::raw::c_ulong;
 use std::ptr;
 use std::slice;
 use std::time::Duration;
@@ -109,11 +110,11 @@ impl<'a> RingBufferBuilder<'a> {
         Ok(RingBuffer { ptr, _cbs: cbs })
     }
 
-    unsafe extern "C" fn call_sample_cb(ctx: *mut c_void, data: *mut c_void, size: usize) -> i32 {
+    unsafe extern "C" fn call_sample_cb(ctx: *mut c_void, data: *mut c_void, size: c_ulong) -> i32 {
         let callback_struct = ctx as *mut RingBufferCallback;
         let callback = (*callback_struct).cb.as_mut();
 
-        callback(slice::from_raw_parts(data as *const u8, size))
+        callback(slice::from_raw_parts(data as *const u8, size as usize))
     }
 }