Fixed a deadlock caused by locking the device's snatchable lock after locking the queue's pending writes #7582
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.
Connections
May be connected to some of the open deadlock issues, but I haven't investigated them thoroughly.
Description
There is a deadlock in
Queue::write_buffer
andQueue::write_staging_buffer
that is caused by taking the device's snatchable lock after locking the queue's pending writes. This violates the lock ranking, which states that the device's snatchable lock must be taken first. This is fixed by simply reversing the order in which the locking occurs.Testing
I initially caught this deadlock by updating wgpu from v0.20 to to v25.0, and having my application deadlock afterwards.
After implementing the change, the application no longer deadlocks.
Squash or Rebase?
This is a single commit.
Checklist
cargo fmt
.cargo test
.cargo xtask test
to run tests.CHANGELOG.md
entry.