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

[wasm] crypto deadlock fix #73537

Merged
merged 10 commits into from
Aug 11, 2022
Merged

[wasm] crypto deadlock fix #73537

merged 10 commits into from
Aug 11, 2022

Conversation

pavelsavara
Copy link
Member

@pavelsavara pavelsavara commented Aug 7, 2022 •
edited
Loading

  • more locking before manipulation with the channel state.
  • more asserts about expected states
  • removed extra console.debug logging
  • renamed wait method to make it clearer what we are waiting for

Fixes crypto deadlock: Log on main

@pavelsavara pavelsavara added this to the 7.0.0 milestone Aug 7, 2022
@pavelsavara pavelsavara self-assigned this Aug 7, 2022
@ghost
Copy link

ghost commented Aug 7, 2022

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details
  • more locking before manipulation with the channel state.
  • more asserts about expected states
  • removed extra console.debug logging
  • renamed wait method to make it clearer what we are waiting for
Author: pavelsavara
Assignees: pavelsavara
Labels:

arch-wasm, area-System.Runtime.InteropServices.JavaScript
Milestone: 7.0.0

@pavelsavara
Copy link
Member Author

CI test with multiple workitems on Helix is #73629

@pavelsavara pavelsavara mentioned this pull request Aug 9, 2022
Closed
10 tasks
eerhardt
eerhardt approved these changes Aug 9, 2022
View reviewed changes
Copy link
Member

@eerhardt eerhardt left a comment

Choose a reason for hiding this comment

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

Overall this looks good to me. Thanks for fixing this!

I just had a few nit-ish comments.

src/mono/wasm/runtime/workers/dotnet-crypto-worker.ts Outdated Show resolved Hide resolved
src/mono/wasm/runtime/crypto-worker.ts Outdated Show resolved Hide resolved
src/mono/wasm/runtime/crypto-worker.ts Show resolved Hide resolved
src/mono/wasm/runtime/crypto-worker.ts Outdated Show resolved Hide resolved
src/mono/wasm/runtime/crypto-worker.ts Outdated Show resolved Hide resolved
@radical
Copy link
Member

radical commented Aug 10, 2022

re:having-spin-or-nonblocking-in-fn-name, I added those to make it obvious to spot cases where they might get used in incorrect contexts. For example, using a spin wait for a state inside a lock, which could cause a deadlock because the other side is waiting for that lock, so it can change the state.

@radical radical mentioned this pull request Aug 10, 2022
Merged
@pavelsavara
Merge branch 'main' into wasm_crypto_deadlock_fix
3e5ee25
@pavelsavara
applied feedback
c88bbaf 
renamed the subtle-crypto.ts file, because that's not a worker
@pavelsavara
Copy link
Member Author

/azp run runtime-wasm

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@pavelsavara pavelsavara mentioned this pull request Aug 10, 2022
Closed
@pavelsavara pavelsavara merged commit bb97114 into dotnet:main Aug 11, 2022
@pavelsavara pavelsavara mentioned this pull request Aug 11, 2022
Closed
@jeffhandley jeffhandley mentioned this pull request Aug 13, 2022
Closed
8 tasks
@ghost ghost locked as resolved and limited conversation to collaborators Sep 10, 2022
@pavelsavara pavelsavara deleted the wasm_crypto_deadlock_fix branch November 29, 2022 16:22
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@eerhardt eerhardt eerhardt approved these changes

@maraf maraf maraf approved these changes

@lewing lewing Awaiting requested review from lewing lewing is a code owner

@radical radical Awaiting requested review from radical

Assignees

@pavelsavara pavelsavara

Labels
arch-wasm WebAssembly architecture area-System.Runtime.InteropServices.JavaScript
Projects
None yet
Milestone
7.0.0
Development

Successfully merging this pull request may close these issues.
4 participants
@pavelsavara @radical @eerhardt @maraf