Revert "align TLS to 32 byte boundary" #305
Closed
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 reverts commit 1f63d3f.
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Dec 1, 2021
304: Tests: Add test_thread_local r=mkroening a=mkroening See * hermit-os/hermit-rs#170 305: Revert "align TLS to 32 byte boundary" r=mkroening a=mkroening This reverts commit 1f63d3f. I found `PT_TLS.p_memsz` to automatically be correctly aligned to the usual `0x8`. I don't think, explicitly aligning again to `0x8` or `PT_TLS.p_align` is necessary. This fixes hermit-os/hermit-rs#170. 🎉 Co-authored-by: Martin Kröning <[email protected]>
|
Build failed (retrying...): |
bors bot
added a commit
that referenced
this pull request
Dec 1, 2021
305: Revert "align TLS to 32 byte boundary" r=mkroening a=mkroening This reverts commit 1f63d3f. I found `PT_TLS.p_memsz` to automatically be correctly aligned to the usual `0x8`. I don't think, explicitly aligning again to `0x8` or `PT_TLS.p_align` is necessary. This fixes hermit-os/hermit-rs#170. 🎉 Co-authored-by: Martin Kröning <[email protected]>
|
Build failed: |
|
bors retry |
bors bot
added a commit
that referenced
this pull request
Dec 1, 2021
305: Revert "align TLS to 32 byte boundary" r=mkroening a=mkroening This reverts commit 1f63d3f. I found `PT_TLS.p_memsz` to automatically be correctly aligned to the usual `0x8`. I don't think, explicitly aligning again to `0x8` or `PT_TLS.p_align` is necessary. This fixes hermit-os/hermit-rs#170. 🎉 Co-authored-by: Martin Kröning <[email protected]>
|
Build failed: |
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Dec 2, 2021
305: Revert "align TLS to 32 byte boundary" r=stlankes a=mkroening This reverts commit 1f63d3f. I found `PT_TLS.p_memsz` to automatically be correctly aligned to the usual `0x8`. I don't think, explicitly aligning again to `0x8` or `PT_TLS.p_align` is necessary. This fixes hermit-os/hermit-rs#170. 🎉 Co-authored-by: Martin Kröning <[email protected]>
|
Build failed: |
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Dec 2, 2021
305: Revert "align TLS to 32 byte boundary" r=stlankes a=mkroening This reverts commit 1f63d3f. I found `PT_TLS.p_memsz` to automatically be correctly aligned to the usual `0x8`. I don't think, explicitly aligning again to `0x8` or `PT_TLS.p_align` is necessary. This fixes hermit-os/hermit-rs#170. 🎉 Co-authored-by: Martin Kröning <[email protected]>
|
bors r- |
|
Canceled. |
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Dec 2, 2021
305: Revert "align TLS to 32 byte boundary" r=stlankes a=mkroening This reverts commit 1f63d3f. I found `PT_TLS.p_memsz` to automatically be correctly aligned to the usual `0x8`. I don't think, explicitly aligning again to `0x8` or `PT_TLS.p_align` is necessary. This fixes hermit-os/hermit-rs#170. 🎉 Co-authored-by: Martin Kröning <[email protected]>
|
This is the right knob but not the correct solution for all cases, I'm working on a fix. bors cancel |
|
Canceled. |
|
Closing in favor of a more sophisticated solution. Turns out, we'll have to pipe the alignment through... |
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]>
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]>
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.
This reverts commit 1f63d3f.
I found
PT_TLS.p_memszto automatically be correctly aligned to the usual0x8. I don't think, explicitly aligning again to0x8orPT_TLS.p_alignis necessary.This fixes hermit-os/hermit-rs#170. 🎉