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.

Sign up for GitHub

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

Jump to bottom

Avoid using tsan_add #19009

Closed
wants to merge 1 commit into from
Closed

Avoid using tsan_add #19009

wants to merge 1 commit into from

Conversation

paulidale
Copy link
Contributor

tasn_add was added after 3.0 was released and isn't available.
This prevents builds from working, so urgent.

The change to tsan_store still achieves the goal of this original fix.

@paulidale paulidale added approval: review pending This pull request needs review by a committer approval: otc review pending This pull request needs review by an OTC member triaged: bug The issue/pr is/fixes a bug severity: urgent Fixes an urgent issue (exempt from 24h grace period) branch: 3.0 Merge to openssl-3.0 branch labels Aug 16, 2022
@paulidale paulidale self-assigned this Aug 16, 2022
@paulidale
Copy link
Contributor Author

CI failure in FIPS checksums is expected, it's building the broken version and failing.

@t8m t8m removed the approval: otc review pending This pull request needs review by an OTC member label Aug 17, 2022
@t8m
Copy link
Member

t8m commented Aug 17, 2022

I agree with urgent.

@t8m t8m mentioned this pull request Aug 17, 2022
Closed
@mattcaswell
Copy link
Member

Agree urgent.

@mattcaswell mattcaswell added approval: done This pull request has the required number of approvals approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: review pending This pull request needs review by a committer approval: done This pull request has the required number of approvals labels Aug 17, 2022
@mattcaswell
Copy link
Member

Pushed to 3.0. Thanks.

openssl-machine pushed a commit that referenced this pull request Aug 17, 2022
@paulidale @mattcaswell
Avoid using tsan_add
93e5c63 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #19009)
@levitte levitte mentioned this pull request Aug 17, 2022
Closed
@levitte
Copy link
Member

levitte commented Aug 17, 2022

Is there a reason this isn't cherry-picked to master?

@t8m
Copy link
Member

t8m commented Aug 17, 2022

Is there a reason this isn't cherry-picked to master?

There is tsan_add on master. So not needed there.

@levitte
Copy link
Member

levitte commented Aug 17, 2022

Ok

@paulidale
Copy link
Contributor Author

Not using tsan_add seemed like a safer solution than putting tsan_add into 3.0.
tsan_add seems better than tsan_store as it avoid possible duplication but there isn't a lot in it.

@paulidale paulidale deleted the tasn-fix-30 branch September 5, 2022 00:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t8m t8m t8m approved these changes

@mattcaswell mattcaswell mattcaswell approved these changes

Assignees

@paulidale paulidale

Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: 3.0 Merge to openssl-3.0 branch severity: urgent Fixes an urgent issue (exempt from 24h grace period) triaged: bug The issue/pr is/fixes a bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@paulidale @t8m @mattcaswell @levitte