mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 06:03:57 +08:00
tree-wide: use /proc/thread-self for thread-local state
With the idmap work, we will have a tainted Go thread in our thread-group that has a different mount namespace to the other threads. It seems that (due to some bad luck) the Go scheduler tends to make this thread the thread-group leader in our tests, which results in very baffling failures where /proc/self/mountinfo produces gibberish results. In order to avoid this, switch to using /proc/thread-self for everything that is thread-local. This primarily includes switching all file descriptor paths (CLONE_FS), all of the places that check the current cgroup (technically we never will run a single runc thread in a separate cgroup, but better to be safe than sorry), and the aforementioned mountinfo code. We don't need to do anything for the following because the results we need aren't thread-local: * Checks that certain namespaces are supported by stat(2)ing /proc/self/ns/... * /proc/self/exe and /proc/self/cmdline are not thread-local. * While threads can be in different cgroups, we do not do this for the runc binary (or libcontainer) and thus we do not need to switch to the thread-local version of /proc/self/cgroups. * All of the CLONE_NEWUSER files are not thread-local because you cannot set the usernamespace of a single thread (setns(CLONE_NEWUSER) is blocked for multi-threaded programs). Note that we have to use runtime.LockOSThread when we have an open handle to a tid-specific procfs file that we are operating on multiple times. Go can reschedule us such that we are running on a different thread and then kill the original thread (causing -ENOENT or similarly confusing errors). This is not strictly necessary for most usages of /proc/thread-self (such as using /proc/thread-self/fd/$n directly) since only operating on the actual inodes associated with the tid requires this locking, but because of the pre-3.17 fallback for CentOS, we have to do this in most cases. In addition, CentOS's kernel is too old for /proc/thread-self, which requires us to emulate it -- however in rootfs_linux.go, we are in the container pid namespace but /proc is the host's procfs. This leads to the incredibly frustrating situation where there is no way (on pre-4.1 Linux) to figure out which /proc/self/task/... entry refers to the current tid. We can just use /proc/self in this case. Yes this is all pretty ugly. I also wish it wasn't necessary. Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
This commit is contained in:
@@ -12,6 +12,7 @@ import (
|
||||
|
||||
"github.com/opencontainers/runc/libcontainer/configs"
|
||||
"github.com/opencontainers/runc/libcontainer/userns"
|
||||
"github.com/opencontainers/runc/libcontainer/utils"
|
||||
)
|
||||
|
||||
// mountSourceType indicates what type of file descriptor is being returned. It
|
||||
@@ -23,7 +24,7 @@ const (
|
||||
// An open_tree(2)-style file descriptor that needs to be installed using
|
||||
// move_mount(2) to install.
|
||||
mountSourceOpenTree mountSourceType = "open_tree"
|
||||
// A plain file descriptor that can be mounted through /proc/self/fd.
|
||||
// A plain file descriptor that can be mounted through /proc/thread-self/fd.
|
||||
mountSourcePlain mountSourceType = "plain-open"
|
||||
)
|
||||
|
||||
@@ -90,7 +91,7 @@ func mount(source, target, fstype string, flags uintptr, data string) error {
|
||||
// will mount it according to the mountSourceType of the file descriptor.
|
||||
//
|
||||
// The dstFd argument, if non-empty, is expected to be in the form of a path to
|
||||
// an opened file descriptor on procfs (i.e. "/proc/self/fd/NN").
|
||||
// an opened file descriptor on procfs (i.e. "/proc/thread-self/fd/NN").
|
||||
//
|
||||
// If a file descriptor is used instead of a source or a target path, the
|
||||
// corresponding path is only used to add context to an error in case the mount
|
||||
@@ -101,19 +102,30 @@ func mountViaFds(source string, srcFile *mountSource, target, dstFd, fstype stri
|
||||
logrus.Debugf("mount source passed along with MS_REMOUNT -- ignoring srcFile")
|
||||
srcFile = nil
|
||||
}
|
||||
|
||||
dst := target
|
||||
if dstFd != "" {
|
||||
dst = dstFd
|
||||
}
|
||||
src := source
|
||||
isMoveMount := srcFile != nil && srcFile.Type == mountSourceOpenTree
|
||||
if srcFile != nil {
|
||||
src = "/proc/self/fd/" + strconv.Itoa(int(srcFile.file.Fd()))
|
||||
// If we're going to use the /proc/thread-self/... path for classic
|
||||
// mount(2), we need to get a safe handle to /proc/thread-self. This
|
||||
// isn't needed for move_mount(2) because in that case the path is just
|
||||
// a dummy string used for error info.
|
||||
fdStr := strconv.Itoa(int(srcFile.file.Fd()))
|
||||
if isMoveMount {
|
||||
src = "/proc/self/fd/" + fdStr
|
||||
} else {
|
||||
var closer utils.ProcThreadSelfCloser
|
||||
src, closer = utils.ProcThreadSelf("fd/" + fdStr)
|
||||
defer closer()
|
||||
}
|
||||
}
|
||||
|
||||
var op string
|
||||
var err error
|
||||
if srcFile != nil && srcFile.Type == mountSourceOpenTree {
|
||||
if isMoveMount {
|
||||
op = "move_mount"
|
||||
err = unix.MoveMount(int(srcFile.file.Fd()), "",
|
||||
unix.AT_FDCWD, dstFd,
|
||||
|
||||
Reference in New Issue
Block a user