Skip to content

rootlessnetns: do not pool the unshared thread #1110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Luap99 merged 1 commit into from
Aug 26, 2026
+9 −0
Merged

rootlessnetns: do not pool the unshared thread #1110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions common/libnetwork/internal/rootlessnetns/netns_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"net"
"os"
"path/filepath"
"runtime"
"strconv"
"strings"

Expand Down Expand Up @@ -376,6 +377,14 @@ func (n *Netns) setupMounts() error {
// 3. XDG_RUNTIME_DIR/rootless-netns/resolv.conf -> /etc/resolv.conf or XDG_RUNTIME_DIR/rootless-netns/run/symlink/target
// 4. XDG_RUNTIME_DIR/rootless-netns/run -> /run

// Keep this thread locked for good. ns.Do() saves and restores only the
// network namespace, so once we unshare below the mount namespace is never
// put back. Do() unlocks the thread on its way out, which would return it
// to the go scheduler still inside this namespace and later goroutines
// would run there. Taking a second lock here means Do()'s unlock leaves it
// locked, so the runtime scraps the thread when the goroutine ends.
runtime.LockOSThread()

// Create a new mount namespace,
// this must happen inside the netns thread.
err := unix.Unshare(unix.CLONE_NEWNS)
Expand Down