diff --git a/Cargo.lock b/Cargo.lock index e66bdcf2..8573eb4e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -325,7 +325,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libbpf-cargo" -version = "0.25.0-beta.1" +version = "0.25.0" dependencies = [ "anyhow", "cargo_metadata", @@ -344,7 +344,7 @@ dependencies = [ [[package]] name = "libbpf-rs" -version = "0.25.0-beta.1" +version = "0.25.0" dependencies = [ "bitflags 2.9.0", "cc", diff --git a/Cargo.toml b/Cargo.toml index 1d7ab5a7..cd41ca11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.25.0-beta.1" +version = "0.25.0" edition = "2021" rust-version = "1.78" license = "LGPL-2.1-only OR BSD-2-Clause" diff --git a/libbpf-cargo/CHANGELOG.md b/libbpf-cargo/CHANGELOG.md index 8f10a8f5..1be8338f 100644 --- a/libbpf-cargo/CHANGELOG.md +++ b/libbpf-cargo/CHANGELOG.md @@ -1,5 +1,5 @@ -Unreleased ----------- +0.25.0 +------ - Removed `SkeletonBuilder::skip_clang_version_check` and `SkeletonBuilder::debug` - Removed `--skip-clang-version-checks` option of `libbpf build` diff --git a/libbpf-cargo/Cargo.toml b/libbpf-cargo/Cargo.toml index 1f7b5d80..7f0799eb 100644 --- a/libbpf-cargo/Cargo.toml +++ b/libbpf-cargo/Cargo.toml @@ -33,7 +33,7 @@ default = ["libbpf-rs/default"] anyhow = "1.0.40" cargo_metadata = "0.19.1" env_logger = { version = "0.11", default-features = false, features = ["auto-color", "humantime"] } -libbpf-rs = { version = "=0.25.0-beta.1", default-features = false, path = "../libbpf-rs" } +libbpf-rs = { version = "0.25", default-features = false, path = "../libbpf-rs" } log = "0.4.14" memmap2 = "0.5" serde = { version = "1.0", features = ["derive"] } diff --git a/libbpf-cargo/README.md b/libbpf-cargo/README.md index e5530733..6bf5d829 100644 --- a/libbpf-cargo/README.md +++ b/libbpf-cargo/README.md @@ -12,7 +12,7 @@ Helps you build and develop BPF programs with standard Rust tooling. To use in your project, add into your `Cargo.toml`: ```toml [build-dependencies] -libbpf-cargo = "=0.25.0-beta.1" +libbpf-cargo = "0.25" ``` See [full documentation here](https://docs.rs/libbpf-cargo). diff --git a/libbpf-rs/CHANGELOG.md b/libbpf-rs/CHANGELOG.md index c5aff45e..ee21a1f1 100644 --- a/libbpf-rs/CHANGELOG.md +++ b/libbpf-rs/CHANGELOG.md @@ -1,19 +1,20 @@ -Unreleased ----------- +0.25.0 +------ - Added kprobe multi support for attaching programs, with and without providing additional options -- Introduced `TracepointCategory` enum for specifying tracepoint - categories +- Added `Program::attach_perf_event_with_opts` for attaching to perf events + with additional options - Allow to provide additional options when attaching programs to raw tracepoints - Allow to provide additional options when attaching programs to kprobes +- Introduced `TracepointCategory` enum for specifying tracepoint + categories - Added `max_entries` getter to various map types - Added `OpenProgramMut::set_autoattach` - Added additional `ProgramAttachType` and `query::LinkTypeInfo` variants - Adjusted `UprobeOpts::func_name` to be an `Option` - Implemented `Sync` for `Link` - Updated `libbpf-sys` dependency to `1.5.0` -- Added `Program::attach_perf_event_with_opts` for attaching to perf events. 0.25.0-beta.1 diff --git a/libbpf-rs/README.md b/libbpf-rs/README.md index 78391047..7f9c3e0f 100644 --- a/libbpf-rs/README.md +++ b/libbpf-rs/README.md @@ -12,7 +12,7 @@ Idiomatic Rust wrapper around [libbpf](https://github.com/libbpf/libbpf). To use in your project, add into your `Cargo.toml`: ```toml [dependencies] -libbpf-rs = "=0.25.0-beta.1" +libbpf-rs = "0.25" ``` See [full documentation here](https://docs.rs/libbpf-rs). diff --git a/libbpf-rs/src/program.rs b/libbpf-rs/src/program.rs index eb713173..38c404ed 100644 --- a/libbpf-rs/src/program.rs +++ b/libbpf-rs/src/program.rs @@ -852,11 +852,7 @@ impl<'obj> ProgramMut<'obj> { pub fn attach_perf_event_with_opts(&self, pfd: i32, opts: PerfEventOpts) -> Result { let libbpf_opts = libbpf_sys::bpf_perf_event_opts::from(opts); let ptr = unsafe { - libbpf_sys::bpf_program__attach_perf_event_opts( - self.ptr.as_ptr(), - pfd, - &libbpf_opts as *const _, - ) + libbpf_sys::bpf_program__attach_perf_event_opts(self.ptr.as_ptr(), pfd, &libbpf_opts) }; let ptr = validate_bpf_ret(ptr).context("failed to attach perf event")?; // SAFETY: the pointer came from libbpf and has been checked for errors.