From 684b64e6630fc1c950067234042f62e0d5f6aba2 Mon Sep 17 00:00:00 2001
From: Emil Tsalapatis <etsal@meta.com>
Date: Tue, 10 Dec 2024 07:43:14 -0800
Subject: [PATCH] bump libbpf-rs version to 0.24.8, specify libbpf-sys version
 1.4.6+1.4.7

---
 Cargo.lock                          | 13 +++++++------
 rust/scx_rustland_core/Cargo.toml   |  2 +-
 rust/scx_utils/Cargo.toml           |  7 ++++---
 scheds/rust/scx_bpfland/Cargo.toml  |  2 +-
 scheds/rust/scx_flash/Cargo.toml    |  2 +-
 scheds/rust/scx_lavd/Cargo.toml     |  2 +-
 scheds/rust/scx_layered/Cargo.toml  |  2 +-
 scheds/rust/scx_mitosis/Cargo.toml  |  2 +-
 scheds/rust/scx_rlfifo/Cargo.toml   |  2 +-
 scheds/rust/scx_rustland/Cargo.toml |  2 +-
 scheds/rust/scx_rusty/Cargo.toml    |  2 +-
 11 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e44063b8f..1777ecca3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -986,9 +986,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libbpf-cargo"
-version = "0.24.4"
+version = "0.24.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42b7b9b2836b25dd7a0e5ff3c2ec0e029a99b3025bfbef0202b55875654b45b"
+checksum = "704727a07f185a76c58faa7b8ed08fba3194661c212183aea1174fe2970ee185"
 dependencies = [
  "anyhow",
  "cargo_metadata 0.15.4",
@@ -1004,9 +1004,9 @@ dependencies = [
 
 [[package]]
 name = "libbpf-rs"
-version = "0.24.4"
+version = "0.24.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51b943363864472bf306570a7076cbfa84571a403b98f59d18af4c4135271ca"
+checksum = "93edd9cd673087fa7518fd63ad6c87be2cd9b4e35034b1873f3e3258c018275b"
 dependencies = [
  "bitflags 2.6.0",
  "libbpf-sys",
@@ -1016,9 +1016,9 @@ dependencies = [
 
 [[package]]
 name = "libbpf-sys"
-version = "1.4.5+v1.4.5"
+version = "1.4.6+v1.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cabee52b6f7e73308d6fd4f8e6bbbdcb97670f49f6e581c5897e4d2410b6019"
+checksum = "f30caf02dfece12c94e2835cab8daf7b52e5c62c1675f334f1dac24be5bd5f82"
 dependencies = [
  "cc",
  "nix 0.29.0",
@@ -1731,6 +1731,7 @@ dependencies = [
  "lazy_static",
  "libbpf-cargo",
  "libbpf-rs",
+ "libbpf-sys",
  "libc",
  "log",
  "nvml-wrapper",
diff --git a/rust/scx_rustland_core/Cargo.toml b/rust/scx_rustland_core/Cargo.toml
index f6dd4bf11..6a4e2e9bc 100644
--- a/rust/scx_rustland_core/Cargo.toml
+++ b/rust/scx_rustland_core/Cargo.toml
@@ -10,7 +10,7 @@ description = "Framework to implement sched_ext schedulers running in user space
 [dependencies]
 anyhow = "1.0.65"
 plain = "0.2.3"
-libbpf-rs = "0.24.1"
+libbpf-rs = "=0.24.8"
 libc = "0.2.137"
 scx_utils = { path = "../scx_utils", version = "1.0.8" }
 
diff --git a/rust/scx_utils/Cargo.toml b/rust/scx_utils/Cargo.toml
index 884693458..2c2bdfe7e 100644
--- a/rust/scx_utils/Cargo.toml
+++ b/rust/scx_utils/Cargo.toml
@@ -14,8 +14,9 @@ bindgen = ">=0.69"
 glob = "0.3"
 hex = "0.4.3"
 lazy_static = "1.4"
-libbpf-cargo = "0.24.1"
-libbpf-rs = "0.24.1"
+libbpf-sys = "=1.4.6"
+libbpf-cargo = "=0.24.8"
+libbpf-rs = "=0.24.8"
 log = "0.4.17"
 nvml-wrapper = { version = "0.10.0", optional = true }
 paste = "1.0"
@@ -34,7 +35,7 @@ anyhow = "1.0.65"
 bindgen = ">=0.69"
 glob = "0.3"
 lazy_static = "1.4"
-libbpf-cargo = "0.24.1"
+libbpf-cargo = "=0.24.8"
 sscanf = "0.4"
 tar = "0.4"
 vergen = { version = "8.0.0", features = ["cargo", "git", "gitcl"] }
diff --git a/scheds/rust/scx_bpfland/Cargo.toml b/scheds/rust/scx_bpfland/Cargo.toml
index 7b15cccb4..7b4989d61 100644
--- a/scheds/rust/scx_bpfland/Cargo.toml
+++ b/scheds/rust/scx_bpfland/Cargo.toml
@@ -11,7 +11,7 @@ anyhow = "1.0.65"
 ctrlc = { version = "3.1", features = ["termination"] }
 clap = { version = "4.1", features = ["derive", "env", "unicode", "wrap_help"] }
 crossbeam = "0.8.4"
-libbpf-rs = "0.24.1"
+libbpf-rs = "=0.24.8"
 log = "0.4.17"
 scx_stats = { path = "../../../rust/scx_stats", version = "1.0.7" }
 scx_stats_derive = { path = "../../../rust/scx_stats/scx_stats_derive", version = "1.0.7" }
diff --git a/scheds/rust/scx_flash/Cargo.toml b/scheds/rust/scx_flash/Cargo.toml
index 6623c36a4..552c76949 100644
--- a/scheds/rust/scx_flash/Cargo.toml
+++ b/scheds/rust/scx_flash/Cargo.toml
@@ -11,7 +11,7 @@ anyhow = "1.0.65"
 ctrlc = { version = "3.1", features = ["termination"] }
 clap = { version = "4.1", features = ["derive", "env", "unicode", "wrap_help"] }
 crossbeam = "0.8.4"
-libbpf-rs = "0.24.1"
+libbpf-rs = "=0.24.8"
 log = "0.4.17"
 scx_stats = { path = "../../../rust/scx_stats", version = "1.0.7" }
 scx_stats_derive = { path = "../../../rust/scx_stats/scx_stats_derive", version = "1.0.7" }
diff --git a/scheds/rust/scx_lavd/Cargo.toml b/scheds/rust/scx_lavd/Cargo.toml
index 21e73200e..8183cca4d 100644
--- a/scheds/rust/scx_lavd/Cargo.toml
+++ b/scheds/rust/scx_lavd/Cargo.toml
@@ -15,7 +15,7 @@ ctrlc = { version = "3.1", features = ["termination"] }
 fb_procfs = "0.7"
 hex = "0.4.3"
 itertools = "0.13.0"
-libbpf-rs = "0.24.1"
+libbpf-rs = "=0.24.8"
 libc = "0.2.137"
 log = "0.4.17"
 ordered-float = "3.4.0"
diff --git a/scheds/rust/scx_layered/Cargo.toml b/scheds/rust/scx_layered/Cargo.toml
index 7b255b1d4..b8c65189f 100644
--- a/scheds/rust/scx_layered/Cargo.toml
+++ b/scheds/rust/scx_layered/Cargo.toml
@@ -16,7 +16,7 @@ ctrlc = { version = "3.1", features = ["termination"] }
 fastrand = "2.1.1"
 fb_procfs = "0.7"
 lazy_static = "1.4"
-libbpf-rs = "0.24.1"
+libbpf-rs = "=0.24.8"
 libc = "0.2.137"
 log = "0.4.17"
 scx_stats = { path = "../../../rust/scx_stats", version = "1.0.7" }
diff --git a/scheds/rust/scx_mitosis/Cargo.toml b/scheds/rust/scx_mitosis/Cargo.toml
index 6d37f7941..3cf409cc5 100644
--- a/scheds/rust/scx_mitosis/Cargo.toml
+++ b/scheds/rust/scx_mitosis/Cargo.toml
@@ -15,7 +15,7 @@ ctrlc = { version = "3.1", features = ["termination"] }
 fb_procfs = "0.7"
 itertools = "0.13.0"
 lazy_static = "1.4"
-libbpf-rs = "0.24.1"
+libbpf-rs = "=0.24.8"
 libc = "0.2.137"
 log = "0.4.17"
 maplit = "1.0.2"
diff --git a/scheds/rust/scx_rlfifo/Cargo.toml b/scheds/rust/scx_rlfifo/Cargo.toml
index d4d9e1dd3..312749365 100644
--- a/scheds/rust/scx_rlfifo/Cargo.toml
+++ b/scheds/rust/scx_rlfifo/Cargo.toml
@@ -10,7 +10,7 @@ license = "GPL-2.0-only"
 anyhow = "1.0.65"
 plain = "0.2.3"
 ctrlc = { version = "3.1", features = ["termination"] }
-libbpf-rs = "0.24.1"
+libbpf-rs = "=0.24.8"
 libc = "0.2.137"
 scx_utils = { path = "../../../rust/scx_utils", version = "1.0.8" }
 scx_rustland_core = { path = "../../../rust/scx_rustland_core", version = "2.2.4" }
diff --git a/scheds/rust/scx_rustland/Cargo.toml b/scheds/rust/scx_rustland/Cargo.toml
index 708d32bf0..c25e322b9 100644
--- a/scheds/rust/scx_rustland/Cargo.toml
+++ b/scheds/rust/scx_rustland/Cargo.toml
@@ -12,7 +12,7 @@ plain = "0.2.3"
 clap = { version = "4.1", features = ["derive", "env", "unicode", "wrap_help"] }
 ctrlc = { version = "3.1", features = ["termination"] }
 fb_procfs = "0.7"
-libbpf-rs = "0.24.1"
+libbpf-rs = "=0.24.8"
 libc = "0.2.137"
 log = "0.4.17"
 ordered-float = "3.4.0"
diff --git a/scheds/rust/scx_rusty/Cargo.toml b/scheds/rust/scx_rusty/Cargo.toml
index 061f2d24a..24ba8929b 100644
--- a/scheds/rust/scx_rusty/Cargo.toml
+++ b/scheds/rust/scx_rusty/Cargo.toml
@@ -13,7 +13,7 @@ clap = { version = "4.1", features = ["derive", "env", "unicode", "wrap_help"] }
 crossbeam = "0.8.4"
 ctrlc = { version = "3.1", features = ["termination"] }
 fb_procfs = "0.7"
-libbpf-rs = "0.24.1"
+libbpf-rs = "=0.24.8"
 libc = "0.2.137"
 log = "0.4.17"
 ordered-float = "3.4.0"