Skip to content

Commit 98c3c42

Browse files
htejunhtejun
authored
Merge pull request #1614 from sched-ext/htejun/release
Synchronize cargo dependency versions and with kernel tools/sched_ext
2 parents 2605625 + dc44584 commit 98c3c42

File tree

17 files changed

+35
-28
lines changed

17 files changed

+35
-28
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rust/scx_loader/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ license = "GPL-2.0-only"
88

99
[dependencies]
1010
anyhow = "1.0.65"
11-
clap = { version = "4.1", features = ["derive", "env", "unicode", "wrap_help"] }
12-
colored = "2"
11+
clap = { version = "4.5.28", features = ["derive", "env", "unicode", "wrap_help"] }
12+
colored = "3.0.0"
1313
ctrlc = { version = "3.1", features = ["termination"] }
1414
log = "0.4.17"
1515
nix = { features = ["process", "signal"], default-features = false, version = "0.29" }
@@ -18,7 +18,7 @@ sysinfo = "0.33.1"
1818
tokio = { version = "1.42.0", features = ["macros", "sync", "rt-multi-thread", "process"] }
1919
tokio-util = "0.7.13"
2020
toml = "0.8.19"
21-
zbus = { version = "5", features = ["tokio"], default-features = false }
21+
zbus = { version = "5.3.1", features = ["tokio"], default-features = false }
2222
zvariant = "5.1"
2323

2424
[lib]

‎rust/scx_utils/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ tar = "0.4"
2828
walkdir = "2.4"
2929
version-compare = "0.1"
3030
libc = "0.2.137"
31-
zbus = { version = "5", optional = true }
31+
zbus = { version = "5.3.1", optional = true }
3232

3333
[build-dependencies]
3434
anyhow = "1.0.65"

‎scheds/c/scx_qmap.bpf.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -776,21 +776,21 @@ static int monitor_timerfn(void *map, int *key, struct bpf_timer *timer)
776776

777777
__COMPAT_scx_bpf_events(&events, sizeof(events));
778778

779-
bpf_printk("%35s: %llu", "SCX_EV_SELECT_CPU_FALLBACK",
779+
bpf_printk("%35s: %lld", "SCX_EV_SELECT_CPU_FALLBACK",
780780
scx_read_event(&events, SCX_EV_SELECT_CPU_FALLBACK));
781-
bpf_printk("%35s: %llu", "SCX_EV_DISPATCH_LOCAL_DSQ_OFFLINE",
781+
bpf_printk("%35s: %lld", "SCX_EV_DISPATCH_LOCAL_DSQ_OFFLINE",
782782
scx_read_event(&events, SCX_EV_DISPATCH_LOCAL_DSQ_OFFLINE));
783-
bpf_printk("%35s: %llu", "SCX_EV_DISPATCH_KEEP_LAST",
783+
bpf_printk("%35s: %lld", "SCX_EV_DISPATCH_KEEP_LAST",
784784
scx_read_event(&events, SCX_EV_DISPATCH_KEEP_LAST));
785-
bpf_printk("%35s: %llu", "SCX_EV_ENQ_SKIP_EXITING",
785+
bpf_printk("%35s: %lld", "SCX_EV_ENQ_SKIP_EXITING",
786786
scx_read_event(&events, SCX_EV_ENQ_SKIP_EXITING));
787-
bpf_printk("%35s: %llu", "SCX_EV_ENQ_SLICE_DFL",
787+
bpf_printk("%35s: %lld", "SCX_EV_ENQ_SLICE_DFL",
788788
scx_read_event(&events, SCX_EV_ENQ_SLICE_DFL));
789-
bpf_printk("%35s: %llu", "SCX_EV_BYPASS_DURATION",
789+
bpf_printk("%35s: %lld", "SCX_EV_BYPASS_DURATION",
790790
scx_read_event(&events, SCX_EV_BYPASS_DURATION));
791-
bpf_printk("%35s: %llu", "SCX_EV_BYPASS_DISPATCH",
791+
bpf_printk("%35s: %lld", "SCX_EV_BYPASS_DISPATCH",
792792
scx_read_event(&events, SCX_EV_BYPASS_DISPATCH));
793-
bpf_printk("%35s: %llu", "SCX_EV_BYPASS_ACTIVATE",
793+
bpf_printk("%35s: %lld", "SCX_EV_BYPASS_ACTIVATE",
794794
scx_read_event(&events, SCX_EV_BYPASS_ACTIVATE));
795795

796796
bpf_timer_start(timer, ONE_SEC_IN_NS, 0);

‎scheds/include/scx/common.bpf.h‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,16 @@ void bpf_obj_drop_impl(void *kptr, void *meta) __ksym;
288288
#define bpf_obj_new(type) ((type *)bpf_obj_new_impl(bpf_core_type_id_local(type), NULL))
289289
#define bpf_obj_drop(kptr) bpf_obj_drop_impl(kptr, NULL)
290290

291-
void bpf_list_push_front(struct bpf_list_head *head, struct bpf_list_node *node) __ksym;
292-
void bpf_list_push_back(struct bpf_list_head *head, struct bpf_list_node *node) __ksym;
291+
int bpf_list_push_front_impl(struct bpf_list_head *head,
292+
struct bpf_list_node *node,
293+
void *meta, __u64 off) __ksym;
294+
#define bpf_list_push_front(head, node) bpf_list_push_front_impl(head, node, NULL, 0)
295+
296+
int bpf_list_push_back_impl(struct bpf_list_head *head,
297+
struct bpf_list_node *node,
298+
void *meta, __u64 off) __ksym;
299+
#define bpf_list_push_back(head, node) bpf_list_push_back_impl(head, node, NULL, 0)
300+
293301
struct bpf_list_node *bpf_list_pop_front(struct bpf_list_head *head) __ksym;
294302
struct bpf_list_node *bpf_list_pop_back(struct bpf_list_head *head) __ksym;
295303
struct bpf_rb_node *bpf_rbtree_remove(struct bpf_rb_root *root,
@@ -586,7 +594,6 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
586594
* is not type-compatible with 'signed char', and we define a separate case.
587595
*
588596
* This is copied verbatim from kernel's include/linux/compiler_types.h, but
589-
*
590597
* with default expression (for pointers) changed from (x) to (typeof(x)0).
591598
*
592599
* This is because LLVM has a bug where for lvalue (x), it does not get rid of

‎scheds/rust/scx_bpfland/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "GPL-2.0-only"
99
[dependencies]
1010
anyhow = "1.0.65"
1111
ctrlc = { version = "3.1", features = ["termination"] }
12-
clap = { version = "4.1", features = ["derive", "env", "unicode", "wrap_help"] }
12+
clap = { version = "4.5.28", features = ["derive", "env", "unicode", "wrap_help"] }
1313
crossbeam = "0.8.4"
1414
libbpf-rs = "=0.25.0-beta.1"
1515
log = "0.4.17"

‎scheds/rust/scx_chaos/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ scx_utils = { path = "../../../rust/scx_utils", version = "1.0.12" }
88
scx_p2dq = { path = "../../../scheds/rust/scx_p2dq", version = "1.0.11" }
99

1010
anyhow = "1.0.65"
11-
clap = { version = "4.1", features = ["derive", "env", "unicode", "wrap_help"] }
11+
clap = { version = "4.5.28", features = ["derive", "env", "unicode", "wrap_help"] }
1212
ctrlc = { version = "3.1", features = ["termination"] }
1313
libbpf-rs = "=0.25.0-beta.1"
1414
log = "0.4.17"

‎scheds/rust/scx_flash/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "GPL-2.0-only"
99
[dependencies]
1010
anyhow = "1.0.65"
1111
ctrlc = { version = "3.1", features = ["termination"] }
12-
clap = { version = "4.1", features = ["derive", "env", "unicode", "wrap_help"] }
12+
clap = { version = "4.5.28", features = ["derive", "env", "unicode", "wrap_help"] }
1313
crossbeam = "0.8.4"
1414
libbpf-rs = "=0.25.0-beta.1"
1515
log = "0.4.17"

‎scheds/rust/scx_lavd/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "GPL-2.0-only"
99
[dependencies]
1010
anyhow = "1.0.65"
1111
bitvec = { version = "1.0", features = ["serde"] }
12-
clap = { version = "4.1", features = ["derive", "env", "unicode", "wrap_help"] }
12+
clap = { version = "4.5.28", features = ["derive", "env", "unicode", "wrap_help"] }
1313
crossbeam = "0.8.4"
1414
ctrlc = { version = "3.1", features = ["termination"] }
1515
fb_procfs = "0.7"

‎scheds/rust/scx_layered/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ license = "GPL-2.0-only"
1010
anyhow = "1.0.65"
1111
bitvec = "1.0"
1212
chrono = "0.4"
13-
clap = { version = "4.1", features = ["derive", "env", "unicode", "wrap_help"] }
13+
clap = { version = "4.5.28", features = ["derive", "env", "unicode", "wrap_help"] }
1414
crossbeam = "0.8.4"
1515
ctrlc = { version = "3.1", features = ["termination"] }
1616
fastrand = "2.1.1"

0 commit comments

Comments
 (0)