Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile.uk: Condition behavior on Kconfig #54

Closed
wants to merge 3 commits into from

Conversation

andreittr
Copy link
Contributor

@andreittr andreittr commented Jun 7, 2023

Previously musl's Makefile would unconditionally:

  • reserve a TCB size
  • (on AARCH64) unreserve said TCB size
  • add musl headers to build include path

, regardless of whether musl was selected for build in Kconfig.
This change set makes these things happen only when musl is selected.

edit: updated w/ new commits

@razvand razvand self-assigned this Jun 28, 2023
@razvand razvand added the enhancement New feature or request label Jun 28, 2023
@razvand razvand added this to the v0.14.0 (Prometheus) milestone Jun 28, 2023
Copy link
Member

@StefanJum StefanJum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good, thanks.

Reviewed-by: Stefan Jumarea stefanjumarea02@gmail.com

Copy link
Member

@eduardvintila eduardvintila left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, @andreittr. Good addition!

While we're at it, I think the aarch64_no_reserved_tcb_overlap rule should also include a similar check, so please add one there, as well. Thanks!

@andreittr andreittr changed the title Makefile.uk: Condition TCB reserve on Kconfig Makefile.uk: Condition behavior on Kconfig Jul 19, 2023
@andreittr
Copy link
Contributor Author

Update: rebased & added new commits

Copy link
Contributor

@razvand razvand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me. Tested and it works. @StefanJum, @eduardvintila, please add your review / approval, and then I'll add the final approval step.

Copy link
Member

@StefanJum StefanJum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good.
Reviewed-by: Stefan Jumarea stefanjumarea02@gmail.com

Copy link
Member

@eduardvintila eduardvintila left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

Reviewed-by: Eduard Vintilă eduard.vintila47@gmail.com

Copy link
Contributor

@razvand razvand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved-by: Razvan Deaconescu razvand@unikraft.io

Previously musl's Makefile would unconditionally reserve a TCB size,
regardless of whether musl was selected for build in Kconfig.
This change makes this reservation happen only when musl is selected.

Signed-off-by: Andrei Tatar <andrei@unikraft.io>
Previously musl would unconditionally call
`aarch64_no_reserved_tcb_overlap` when building under aarch64.
This change makes this call happen only when musl is selected.

Signed-off-by: Andrei Tatar <andrei@unikraft.io>
Previously musl would add its headers to the include path
unconditionally when its Makefile would be included.
This change conditions this inclusion on whether musl is enabled via
Kconfig.

Signed-off-by: Andrei Tatar <andrei@unikraft.io>
@andreittr
Copy link
Contributor Author

Rebased on staging.

unikraft-bot pushed a commit that referenced this pull request Aug 10, 2023
Previously musl would unconditionally call
`aarch64_no_reserved_tcb_overlap` when building under aarch64.
This change makes this call happen only when musl is selected.

Signed-off-by: Andrei Tatar <andrei@unikraft.io>
Reviewed-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Reviewed-by: Eduard Vintilă <eduard.vintila47@gmail.com>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #54
unikraft-bot pushed a commit that referenced this pull request Aug 10, 2023
Previously musl would add its headers to the include path
unconditionally when its Makefile would be included.
This change conditions this inclusion on whether musl is enabled via
Kconfig.

Signed-off-by: Andrei Tatar <andrei@unikraft.io>
Reviewed-by: Stefan Jumarea <stefanjumarea02@gmail.com>
Reviewed-by: Eduard Vintilă <eduard.vintila47@gmail.com>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #54
@andreittr andreittr deleted the ttr/tcbresv branch August 10, 2023 18:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci/merged enhancement New feature or request
Projects
Status: Done!
Development

Successfully merging this pull request may close these issues.

None yet

5 participants