Strip compat support #363
Merged
Strip compat support #363
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tion scx_ops_open!() and scx_ops_attach!() could return the calling function after an error, which can be surprising. Forutnately, as all the current callers are either unwrapping or returning on error, the surprising behavior is currently not very noticeable. Fix it by breaking out of the macro block on errors.
In preparation of upstreaming, let's set the min version requirement at the released v6.9 kernels. Drop __COMPAT_scx_bpf_switch_call(). The open helper macros now check the existence of SCX_OPS_SWITCH_PARTIAL and abort if not.
There's no guarantee that errno is set or contains relevant information when SCX_BUG() is invoked. This sometimes leads to "task failed successfully" messages: # ./scx_simple ../scheds/c/scx_simple.c:72 [scx panic]: Success SCX_OPS_SWITCH_PARTIAL missing, kernel too old? While not critical, it's not great. Let's update it so that errno is printed in parentheses when non-zero and match the tag to the macro name so that what's printed is the following: # ./scx_simple [SCX_BUG] ../scheds/c/scx_simple.c:72 SCX_OPS_SWITCH_PARTIAL missing, kernel too old?
In preparation of upstreaming, let's set the min version requirement at the released v6.9 kernels. Drop __COMPAT_SCX_KICK_IDLE. The open helper macros now check the existence of SCX_KICK_IDLE and abort if not.
In preparation of upstreaming, let's set the min version requirement at the released v6.9 kernels. Drop __COMPAT_scx_bpf_exit(). The open helper macros now check the existence of scx_bpf_exit_bstr() and abort if not.
In preparation of upstreaming, let's set the min version requirement at the released v6.9 kernels. Drop __COMPAT_scx_bpf_dump(). The open helper macros now check the existence of scx_bpf_dump_bstr() and abort if not. While at it, reorder the min requirement checks so that newly added ones are up top to make testing easier.
In preparation of upstreaming, let's set the min version requirement at the released v6.9 kernels. Drop __COMPAT_HAS_CPUMASKS(). The open helper macros now check the existence of scx_bpf_nr_cpu_ids() and abort if not.
In preparation of upstreaming, let's set the min version requirement at the released v6.9 kernels. Drop __COMPAT_scx_bpf_cpuperf_*(). The open helper macros now check the existence of scx_bpf_cpuperf_cap() and abort if not.
In preparation of upstreaming, let's set the min version requirement at the released v6.9 kernels. Drop support for missing sched_ext_ops.hotplug_seq. The open helper macros now check the existence of the field and abort if missing.
In preparation of upstreaming, let's set the min version requirement at the released v6.9 kernels. Drop support for missing sched_ext_ops.exit_dump_len. The open helper macros now check the existence of the field and abort if missing.
In preparation of upstreaming, let's set the min version requirement at the released v6.9 kernels. Drop support for missing sched_ext_ops.tick(). The open helper macros now check the existence of the field and abort if missing.
In preparation of upstreaming, let's set the min version requirement at the released v6.9 kernels. Drop support for missing sched_ext_ops.dump*(). The open helper macros now check the existence of the fields and abort if missing.
Let's check only the latest one.
arighi
approved these changes
Jun 16, 2024
| @@ -246,7 +246,6 @@ impl<'cb> BpfScheduler<'cb> { | |||
|
|
|||
| skel.bss_mut().usersched_pid = std::process::id(); | |||
| skel.rodata_mut().slice_ns = slice_us * 1000; | |||
| skel.rodata_mut().switch_partial = partial; | |||
There was a problem hiding this comment.
We should also drop partial from BpfScheduler, update scx_rustland and scx_rlfifo, and drop the option --partial from scx_rustland), but it can be done later in a separate commit (this is just as a reminder).
There was a problem hiding this comment.
--partial still sets SCX_OPS_SWITCH_PARTIAL in sched_ext_ops.flags, so it should keep working the same.
| @@ -314,7 +314,6 @@ impl<'a> Scheduler<'a> { | |||
| skel.rodata_mut().load_half_life = (opts.load_half_life * 1000000000.0) as u32; | |||
| skel.rodata_mut().kthreads_local = opts.kthreads_local; | |||
| skel.rodata_mut().fifo_sched = opts.fifo_sched; | |||
| skel.rodata_mut().switch_partial = opts.partial; | |||
There was a problem hiding this comment.
Ditto for scx_rusty about --partial.
There was a problem hiding this comment.
Ah, I was missing this part, that's right. So everything looks good, thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In preparation of upstreaming, set the currently released v6.9 kernels as the minimum requirement and strip the compat features. The only remaining one is for dsq iters. This needs updates from BPF side and will be handled later.