-
Notifications
You must be signed in to change notification settings - Fork 86
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
Fix thread pointer calculation, rework TaskTLS #311
Merged
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
mkroening
force-pushed
the
thread-local-align
branch
2 times, most recently
from
December 2, 2021 22:41
8966d80
to
709eea3
Compare
This was referenced Dec 3, 2021
mkroening
force-pushed
the
thread-local-align
branch
2 times, most recently
from
December 3, 2021 16:50
58d1bda
to
8ed6cbb
Compare
bors bot
added a commit
to hermit-os/uhyve
that referenced
this pull request
Dec 3, 2021
241: BootInfo: Add tls_align r=mkroening a=mkroening See * hermit-os/kernel#311 Co-authored-by: Martin Kröning <[email protected]>
mkroening
force-pushed
the
thread-local-align
branch
2 times, most recently
from
December 3, 2021 17:46
e5504bc
to
7a9119b
Compare
bors bot
added a commit
to hermit-os/loader
that referenced
this pull request
Dec 3, 2021
46: BootInfo: Add tls_align r=mkroening a=mkroening See * hermit-os/kernel#311 Co-authored-by: Martin Kröning <[email protected]>
mkroening
force-pushed
the
thread-local-align
branch
2 times, most recently
from
December 4, 2021 11:48
11a9160
to
8a5c534
Compare
mkroening
changed the title
Rework TLS creation
Fix thread pointer calculation, rework TaskTLS
Dec 4, 2021
mkroening
force-pushed
the
thread-local-align
branch
from
December 4, 2021 12:37
8a5c534
to
754fe8e
Compare
bors bot
added a commit
to hermit-os/uhyve
that referenced
this pull request
Dec 4, 2021
241: BootInfo: Add tls_align r=stlankes a=mkroening See * hermit-os/kernel#311 Co-authored-by: Martin Kröning <[email protected]>
bors bot
added a commit
to hermit-os/uhyve
that referenced
this pull request
Dec 4, 2021
241: BootInfo: Add tls_align r=stlankes a=mkroening See * hermit-os/kernel#311 Co-authored-by: Martin Kröning <[email protected]>
bors bot
added a commit
to hermit-os/uhyve
that referenced
this pull request
Dec 4, 2021
241: BootInfo: Add tls_align r=stlankes a=mkroening See * hermit-os/kernel#311 Co-authored-by: Martin Kröning <[email protected]>
bors bot
added a commit
to hermit-os/uhyve
that referenced
this pull request
Dec 4, 2021
241: BootInfo: Add tls_align r=stlankes a=mkroening See * hermit-os/kernel#311 Co-authored-by: Martin Kröning <[email protected]>
bors r+ |
bors bot
added a commit
that referenced
this pull request
Dec 4, 2021
311: Fix thread pointer calculation, rework TaskTLS r=mkroening a=mkroening Closes hermit-os/hermit-rs#170. 🎉 Replaces #305. Depends on: * hermit-os/loader#46 * hermit-os/uhyve#241 The cause of the issue is the calculation of the thread pointer: ```python # Current calculation (wrong) thread_ptr = tls_block_ptr + round(tls_len, 32) # Correct calculation thread_ptr = tls_block_ptr + round(tls_len, tls_align) # round(tls_len, tls_align) is called tls_offset ``` This is fixed in the first two commits of this PR. The later commits completely rework the `TaskTLS` struct. I did this to better understand the problem. The old comments were partly outdated and wrong. Also the code was not very rusty. I replaced manual memory allocations with `Box`es and restructured and recommented the code. Co-authored-by: Martin Kröning <[email protected]>
Build failed: |
Separately allocate the TLS block and the thread pointer in Boxes for easier dropping. Completely rewrite and comment TLS creation.
mkroening
force-pushed
the
thread-local-align
branch
from
December 4, 2021 16:19
754fe8e
to
b3e72ef
Compare
bors retry |
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.
Closes hermit-os/hermit-rs#170. 🎉
Replaces #305.
Depends on:
The cause of the issue is the calculation of the thread pointer:
This is fixed in the first two commits of this PR.
The later commits completely rework the
TaskTLS
struct. I did this to better understand the problem. The old comments were partly outdated and wrong. Also the code was not very rusty. I replaced manual memory allocations withBox
es and restructured and recommented the code.