fix(ublk-zc): close wake eventfd if ZC thread spawn fails#84
Merged
Conversation
The cross-thread wake eventfd is created before the ZC queue thread is spawned, but only becomes owned by `ZcThreadGuard` after a successful spawn. If `Builder::spawn` failed (e.g. resource exhaustion during a multi-device recovery storm — exactly when fds are scarce), the `?` returned early and leaked one eventfd per queue, since the guard that would `close` it was never constructed. Wrap `wake_fd` in an `OwnedFd` immediately after creation so any early return closes it via Drop, then release ownership to the guard once the spawn succeeds. The ZC thread only borrows the raw value (RawFd is Copy), so ownership semantics are unchanged on the happy path. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.
Problem
Hunting for an fd leak on the ublk happy path turned up one real leak — on an error path adjacent to it.
In
start_zc_queue(glidefs/src/block/ublk/device.rs), the cross-thread wakeeventfdis created before the ZC queue thread is spawned, but it only becomes owned byZcThreadGuardafter a successful spawn:If
Builder::spawnfails — e.g. resource exhaustion during a multi-device recovery storm, which is exactly when fds are scarce — the?returns early and leaks oneeventfdper queue, because the guard that wouldclose()it is never constructed.The happy path itself is clean (
RawFdisCopy, the thread borrows a copy, the guard closes the canonical fd inDrop). This only bites on spawn failure.Fix
Wrap
wake_fdin anOwnedFdimmediately after creation so any early return closes it viaDrop, then release ownership to the guard (into_raw_fd) once the spawn succeeds. Ownership semantics on the happy path are unchanged.🤖 Generated with Claude Code