tcpreuse: avoid deadlock between listen and close - #3535
Open
felix314159 wants to merge 1 commit into
Open
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
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.
Description
ConnMgr.DemultiplexedListenheld the connection-manager mutex while acquiring a multiplexed-listener mutex. Listener closure acquired those mutexes in the opposite order while removing itself from the manager.Concurrent listener registration and closure could therefore deadlock, preventing listener reconfiguration or host shutdown from completing.
Cancel the multiplexed listener under its own mutex, then close and remove it without holding that mutex. Reject new demultiplexed listeners after closure begins and make closure idempotent.
Reproduction
A deterministic regression test pauses underlying listener closure while registering another demultiplexed listener. Before the fix, both operations wait indefinitely on the inverted locks.
Testing
go test ./p2p/transport/tcpreuse -run TestConcurrentListenAndCloseDoesNotDeadlock -count=100go test -race ./p2p/transport/tcpreusego vet ./p2p/transport/tcpreusego test ./...