Fixups to scheduler/priority settings #4459
Merged
+61
−55
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
kolyshkin
force-pushed
the
prio-nits
branch
3 times, most recently
from
6b830aa to
0a65a4d
Compare
kolyshkin
force-pushed
the
prio-nits
branch
2 times, most recently
from
d5be617 to
fcb9301
Compare
kolyshkin
commented
Dec 19, 2024
There was a problem hiding this comment.
@opencontainers/runc-maintainers @AkihiroSuda @cyphar @thaJeztah @rata @lifubang can we please review/merge this? This will unblock my further work (adding CPU affinity).
kolyshkin
requested review from
mrunalp,
rata,
lifubang,
thaJeztah,
cyphar and
AkihiroSuda
lifubang
approved these changes
Dec 20, 2024
AkihiroSuda
approved these changes
Dec 20, 2024
Move the nil check inside, simplifying the callers. Fixes: bfbd030 ("Add I/O priority") Fixes: 770728e ("Support `process.scheduler`") Signed-off-by: Kir Kolyshkin <[email protected]>
This code is not in libcontainer, meaning it is only used by a short lived binary (runc start/run/exec). Unlike code in libcontainer (see CreateLibcontainerConfig), here we don't have to care about copying the structures supplied as input, meaning we can just reuse the pointers directly. Fixes: bfbd030 ("Add I/O priority") Fixes: 770728e ("Support `process.scheduler`") Signed-off-by: Kir Kolyshkin <[email protected]>
For some reason, io priority is set in different places between runc start/run and runc exec: - for runc start/run, it is done in the middle of (*linuxStandardInit).Init, close to the place where we exec runc init. - for runc exec, it is done much earlier, in (*setnsProcess) start(). Let's move setIOPriority call for runc exec to (*linuxSetnsInit).Init, so it is in the same logical place as for runc start/run. Also, move the function itself to init_linux.go as it's part of init. Should not have any visible effect, except part of runc init is run with a different I/O priority. While at it, rename setIOPriority to setupIOPriority, and make it accept the whole *configs.Config, for uniformity with other similar functions. Fixes: bfbd030 ("Add I/O priority") Signed-off-by: Kir Kolyshkin <[email protected]>
This is an internal implementation detail and should not be either public or visible. Amend setIOPriority to do own class conversion. Fixes: bfbd030 ("Add I/O priority") Signed-off-by: Kir Kolyshkin <[email protected]>
Signed-off-by: Kir Kolyshkin <[email protected]>
lifubang
approved these changes
Dec 25, 2024
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.
These commits amend commit bfbd030 (#3783) and 770728e (#4025). Should not result in any visible change, except:
IOPriority.Classvalue will result in an error much earlier;runc execchanges IO priority later, just before exec;configs.IOPrioClassMappingmap is removed from the public API.Should be relatively easy to review.