Re-correct TSAN integration #42447
Closed
Re-correct TSAN integration #42447
Conversation
This file contains hidden or 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 15772ba.
Looks like #36929 got reverted without comment. Not sure what happened there. Re-apply it to fix TSAN.
|
Will fix it in the morning. |
|
In certain modes, we copy this state and expect to have certain properties. Need to look closer to see if if this is okay with all the various option combinations. |
vtjnash
reviewed
Oct 3, 2021
| memcpy(&t->copy_stack_ctx, &ptls->copy_stack_ctx, sizeof(t->copy_stack_ctx) - sizeof(t->copy_stack_ctx.tsan_state)); | ||
| else | ||
| memcpy(&t->ctx, &ptls->base_ctx, sizeof(t->ctx)); | ||
| memcpy(&t->ctx, &ptls->base_ctx, sizeof(t->ctx) - sizeof(t->ctx.tsan_state)); |
There was a problem hiding this comment.
Suggested change
| memcpy(&t->ctx, &ptls->base_ctx, sizeof(t->ctx) - sizeof(t->ctx.tsan_state)); | |
| memcpy(&t->ctx.uc_mcontext, &ptls->base_ctx.uc_mcontext, sizeof(t->ctx.uc_mcontext)); |
vtjnash
reviewed
Oct 3, 2021
| t->bufsz = 0; | ||
| if (always_copy_stacks) | ||
| memcpy(&t->copy_stack_ctx, &ptls->copy_stack_ctx, sizeof(t->copy_stack_ctx)); | ||
| memcpy(&t->copy_stack_ctx, &ptls->copy_stack_ctx, sizeof(t->copy_stack_ctx) - sizeof(t->copy_stack_ctx.tsan_state)); |
There was a problem hiding this comment.
Suggested change
| memcpy(&t->copy_stack_ctx, &ptls->copy_stack_ctx, sizeof(t->copy_stack_ctx) - sizeof(t->copy_stack_ctx.tsan_state)); | |
| memcpy(&t->copy_stack_ctx.uc_mcontext, &ptls->copy_stack_ctx.uc_mcontext, sizeof(t->copy_stack_ctx.uc_mcontext)); |
But I'm not sure if uc_mcontext is something C can deal with, or if it needed to be wrapped in a struct to be something that C could create access.
There was a problem hiding this comment.
But note that this is in the COPY_STACKS code path, so currently we disable this code path entirely if TSAN is enabled
|
I will fix and update this, with other fixes |
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.
Looks like #36929 got reverted. Not sure what happened there. Re-apply it to fix TSAN.