lib/ukboot: Fix configuration of no "no scheduler" #1413
Merged
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
This commit introduces the hidden configuration option `CONFIG_LIBUKBOOT_INITSCHED` that indicates that scheduler initialization is configured with `lib/ukboot`. The previous check for `!CONFIG_LIBUKBOOT_NOSCHED` was not sufficient, as the option is not available if `CONFIG_LIBUKBOOT_NOALLOC` is set. The reason is the dependency expressed for the corresponding `choice` in the libraries' `Config.uk`. This would incorrectly mean that a scheduler is being initialized. Signed-off-by: Simon Kuenzer <simon@unikraft.io>
This commit introduces the hidden configuration option `CONFIG_LIBUKBOOT_INITALLOC` that indicates that allocator initialization is configured with `lib/ukboot`. We do this in order to be inline with the scheduler configuration (`Config.uk`) and to have the possibility to add dependencies to the corresponding `choice` of the allocator initialization configuration in the future. Signed-off-by: Simon Kuenzer <simon@unikraft.io>
github-actions
bot
added
area/lib
michpappas
approved these changes
May 16, 2024
There was a problem hiding this comment.
Looks good. In the future we need to be a bit careful not to use LIBUKBOOT_NOALLOC /LIBUKBOOT_NOSCHED, also during reviews. I will wait for one more RB before approving for merge.
Reviewed-by: Michalis Pappas michalis@unikraft.io
StefanJum
approved these changes
May 17, 2024
There was a problem hiding this comment.
Works fine, thank you.
Reviewed-by: Stefan Jumarea stefanjumarea02@gmail.com
razvand
approved these changes
May 17, 2024
razvand
pushed a commit
that referenced
this pull request
May 17, 2024
This commit introduces the hidden configuration option `CONFIG_LIBUKBOOT_INITSCHED` that indicates that scheduler initialization is configured with `lib/ukboot`. The previous check for `!CONFIG_LIBUKBOOT_NOSCHED` was not sufficient, as the option is not available if `CONFIG_LIBUKBOOT_NOALLOC` is set. The reason is the dependency expressed for the corresponding `choice` in the libraries' `Config.uk`. This would incorrectly mean that a scheduler is being initialized. Signed-off-by: Simon Kuenzer <simon@unikraft.io> Reviewed-by: Michalis Pappas <michalis@unikraft.io> Reviewed-by: Stefan Jumarea <stefanjumarea02@gmail.com> Approved-by: Razvan Deaconescu <razvand@unikraft.io> GitHub-Closes: #1413
razvand
pushed a commit
that referenced
this pull request
May 17, 2024
This commit introduces the hidden configuration option `CONFIG_LIBUKBOOT_INITALLOC` that indicates that allocator initialization is configured with `lib/ukboot`. We do this in order to be inline with the scheduler configuration (`Config.uk`) and to have the possibility to add dependencies to the corresponding `choice` of the allocator initialization configuration in the future. Signed-off-by: Simon Kuenzer <simon@unikraft.io> Reviewed-by: Michalis Pappas <michalis@unikraft.io> Reviewed-by: Stefan Jumarea <stefanjumarea02@gmail.com> Approved-by: Razvan Deaconescu <razvand@unikraft.io> GitHub-Closes: #1413
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.
Description of changes
This PR fixes the KConfig configuration of "no scheduler" with
lib/ukboot. Previously, scheduler initialization code was still compiled in even if no scheduling was selected. This happened if at the same time no allocator was configured as well.Please note that this PR fixes only the configuration handling in
lib/ukboot. I noticed a crash within one of the registered inittab functions if no scheduler was initialized. There is also an assertion failure iflib/ukbootis configured without allocator initialization (system does not boot without an allocator assigned to the platform libraries). Both need fixing with corresponding subsystem PRs and taking re-arch into account.