FFI: fix deadlock in hyper_executor::poll_next #3370
Merged
Conversation
This file contains 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
|
The fix looks great, thanks! Seems CI is grumpy about a missing comma, of course. |
poll_next locks the driver, and also calls drain_queue while holding that lock. Since drain_queue locks the driver too, that results in a deadlock. To fix, unlock the driver before calling drain_queue.
hawkw
approved these changes
Oct 23, 2023
0xE282B0
pushed a commit
to 0xE282B0/hyper
that referenced
this pull request
Jan 12, 2024
poll_next locks the driver, and also calls drain_queue while holding that lock. Since drain_queue locks the driver too, that results in a deadlock. To fix, unlock the driver before calling drain_queue. Closes hyperium#3369
0xE282B0
pushed a commit
to 0xE282B0/hyper
that referenced
this pull request
Jan 16, 2024
poll_next locks the driver, and also calls drain_queue while holding that lock. Since drain_queue locks the driver too, that results in a deadlock. To fix, unlock the driver before calling drain_queue. Closes hyperium#3369 Signed-off-by: Sven Pfennig <[email protected]>
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.
poll_next locks the driver, and also calls drain_queue while holding that lock. Since drain_queue locks the driver too, that results in a deadlock.
To fix, unlock the driver before calling drain_queue.
Fixes #3369.