Skip to content
This repository has been archived by the owner on Jun 18, 2024. It is now read-only.

scx: Trivial updates from patch splitting #160

Merged
merged 1 commit into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kernel/sched/ext.c
Original file line number Diff line number Diff line change
Expand Up @@ -4453,8 +4453,8 @@ void __init init_sched_ext_class(void)
* definitions so that BPF scheduler implementations can use them
* through the generated vmlinux.h.
*/
WRITE_ONCE(v, SCX_ENQ_WAKEUP | SCX_DEQ_SLEEP | SCX_TG_ONLINE |
SCX_KICK_PREEMPT);
WRITE_ONCE(v, SCX_ENQ_WAKEUP | SCX_DEQ_SLEEP | SCX_KICK_PREEMPT |
SCX_TG_ONLINE);

BUG_ON(rhashtable_init(&dsq_hash, &dsq_hash_params));
init_dsq(&scx_dsq_global, SCX_DSQ_GLOBAL);
Expand Down
4 changes: 2 additions & 2 deletions tools/sched_ext/include/scx/compat.bpf.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ static inline void __COMPAT_scx_bpf_switch_all(void)
scx_bpf_switch_all();
}

#endif

/*
* sched_ext_ops.exit_dump_len is a recent addition. Use the following
* definition to support older kernels. See scx_qmap for usage example.
Expand Down Expand Up @@ -86,3 +84,5 @@ struct sched_ext_ops___no_exit_dump_len {
struct sched_ext_ops___no_exit_dump_len __name##___no_exit_dump_len = { \
__VA_ARGS__ \
}; \

#endif /* __SCX_COMPAT_BPF_H */
2 changes: 1 addition & 1 deletion tools/sched_ext/scx_qmap.bpf.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
char _license[] SEC("license") = "GPL";

const volatile u64 slice_ns = SCX_SLICE_DFL;
const volatile bool switch_partial;
const volatile u32 stall_user_nth;
const volatile u32 stall_kernel_nth;
const volatile u32 dsp_inf_loop_after;
const volatile s32 disallow_tgid;
const volatile bool switch_partial;

u32 test_error_cnt;

Expand Down
2 changes: 1 addition & 1 deletion tools/sched_ext/scx_simple.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ int main(int argc, char **argv)
skel = scx_simple__open();
SCX_BUG_ON(!skel, "Failed to open skel");

while ((opt = getopt(argc, argv, "fph")) != -1) {
while ((opt = getopt(argc, argv, "fh")) != -1) {
switch (opt) {
case 'f':
skel->rodata->fifo_sched = true;
Expand Down