[core] Queue::drop is acquiring the snatch guard as well
#8691
+14
−2
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
Member
ErichDonGubler
left a comment
ErichDonGubler
left a comment
There was a problem hiding this comment.
LGTM, minus some questions I'd like to fully understand before narrowing lock regions.
|
|
||
| // Don't hold the locks while calling release_gpu_resources. | ||
| drop(fence); | ||
| drop(snatch_guard); |
Member
There was a problem hiding this comment.
question: I think it's fine—but I'm not positive—to no longer be locking the snatch lock when we take the device lost closure. Tagging in @cwfitzgerald to double-check my conclusion here. Does that sound right, Connor?
Member
There was a problem hiding this comment.
I don't see any reason why this would be problematic. The snatch lock doesn't guard the device lost closure in any way.
cwfitzgerald
requested changes
Dec 12, 2025
|
|
||
| // Don't hold the locks while calling release_gpu_resources. | ||
| drop(fence); | ||
| drop(snatch_guard); |
Member
There was a problem hiding this comment.
I don't see any reason why this would be problematic. The snatch lock doesn't guard the device lost closure in any way.
uael
force-pushed
the
uael/snatchguard-dead-lock
branch
from
0b4a9af to
67781e8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description
Fix a deadlock in
Device::maintainTesting
Manually
Checklist
cargo fmt.Runtaplo format.cargo clippy --tests. If applicable, add:--target wasm32-unknown-unknownRuncargo xtask testto run tests.If this contains user-facing changes, add aCHANGELOG.mdentry.