mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 06:03:57 +08:00
libct/system: ClearRlimitNofileCache for go 1.23
Go 1.23 tightens access to internal symbols, and even puts runc into
"hall of shame" for using an internal symbol (recently added by commit
da68c8e3). So, while not impossible, it becomes harder to access those
internal symbols, and it is a bad idea in general.
Since Go 1.23 includes https://go.dev/cl/588076, we can clean the
internal rlimit cache by setting the RLIMIT_NOFILE for ourselves,
essentially disabling the rlimit cache.
Once Go 1.22 is no longer supported, we will remove the go:linkname hack.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
@@ -12,6 +12,7 @@ import (
|
|||||||
"runtime/debug"
|
"runtime/debug"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"syscall"
|
||||||
|
|
||||||
"github.com/containerd/console"
|
"github.com/containerd/console"
|
||||||
"github.com/moby/sys/user"
|
"github.com/moby/sys/user"
|
||||||
@@ -225,9 +226,7 @@ func containerInit(t initType, config *initConfig, pipe *syncSocket, consoleSock
|
|||||||
|
|
||||||
// Clean the RLIMIT_NOFILE cache in go runtime.
|
// Clean the RLIMIT_NOFILE cache in go runtime.
|
||||||
// Issue: https://github.com/opencontainers/runc/issues/4195
|
// Issue: https://github.com/opencontainers/runc/issues/4195
|
||||||
if containsRlimit(config.Rlimits, unix.RLIMIT_NOFILE) {
|
maybeClearRlimitNofileCache(config.Rlimits)
|
||||||
system.ClearRlimitNofileCache()
|
|
||||||
}
|
|
||||||
|
|
||||||
switch t {
|
switch t {
|
||||||
case initSetns:
|
case initSetns:
|
||||||
@@ -655,13 +654,16 @@ func setupRoute(config *configs.Config) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func containsRlimit(limits []configs.Rlimit, resource int) bool {
|
func maybeClearRlimitNofileCache(limits []configs.Rlimit) {
|
||||||
for _, rlimit := range limits {
|
for _, rlimit := range limits {
|
||||||
if rlimit.Type == resource {
|
if rlimit.Type == syscall.RLIMIT_NOFILE {
|
||||||
return true
|
system.ClearRlimitNofileCache(&syscall.Rlimit{
|
||||||
|
Cur: rlimit.Soft,
|
||||||
|
Max: rlimit.Hard,
|
||||||
|
})
|
||||||
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func setupRlimits(limits []configs.Rlimit, pid int) error {
|
func setupRlimits(limits []configs.Rlimit, pid int) error {
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
"sync/atomic"
|
|
||||||
"syscall"
|
"syscall"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
|
|
||||||
@@ -16,21 +15,6 @@ import (
|
|||||||
"golang.org/x/sys/unix"
|
"golang.org/x/sys/unix"
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:linkname syscallOrigRlimitNofile syscall.origRlimitNofile
|
|
||||||
var syscallOrigRlimitNofile atomic.Pointer[syscall.Rlimit]
|
|
||||||
|
|
||||||
// ClearRlimitNofileCache is to clear go runtime's nofile rlimit cache.
|
|
||||||
func ClearRlimitNofileCache() {
|
|
||||||
// As reported in issue #4195, the new version of go runtime(since 1.19)
|
|
||||||
// will cache rlimit-nofile. Before executing execve, the rlimit-nofile
|
|
||||||
// of the process will be restored with the cache. In runc, this will
|
|
||||||
// cause the rlimit-nofile setting by the parent process for the container
|
|
||||||
// to become invalid. It can be solved by clearing this cache. But
|
|
||||||
// unfortunately, go stdlib doesn't provide such function, so we need to
|
|
||||||
// link to the private var `origRlimitNofile` in package syscall to hack.
|
|
||||||
syscallOrigRlimitNofile.Store(nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
type ParentDeathSignal int
|
type ParentDeathSignal int
|
||||||
|
|
||||||
func (p ParentDeathSignal) Restore() error {
|
func (p ParentDeathSignal) Restore() error {
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
//go:build go1.23
|
||||||
|
|
||||||
|
package system
|
||||||
|
|
||||||
|
import (
|
||||||
|
"syscall"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ClearRlimitNofileCache clears go runtime's nofile rlimit cache. The argument
|
||||||
|
// is process RLIMIT_NOFILE values. Relies on go.dev/cl/588076.
|
||||||
|
func ClearRlimitNofileCache(lim *syscall.Rlimit) {
|
||||||
|
// Ignore the return values since we only need to clean the cache,
|
||||||
|
// the limit is going to be set via unix.Prlimit elsewhere.
|
||||||
|
_ = syscall.Setrlimit(syscall.RLIMIT_NOFILE, lim)
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
//go:build !go1.23
|
||||||
|
|
||||||
|
// TODO: remove this file once go 1.22 is no longer supported.
|
||||||
|
|
||||||
|
package system
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync/atomic"
|
||||||
|
"syscall"
|
||||||
|
_ "unsafe" // Needed for go:linkname to work.
|
||||||
|
)
|
||||||
|
|
||||||
|
//go:linkname syscallOrigRlimitNofile syscall.origRlimitNofile
|
||||||
|
var syscallOrigRlimitNofile atomic.Pointer[syscall.Rlimit]
|
||||||
|
|
||||||
|
// ClearRlimitNofileCache clears go runtime's nofile rlimit cache.
|
||||||
|
// The argument is process RLIMIT_NOFILE values.
|
||||||
|
func ClearRlimitNofileCache(_ *syscall.Rlimit) {
|
||||||
|
// As reported in issue #4195, the new version of go runtime(since 1.19)
|
||||||
|
// will cache rlimit-nofile. Before executing execve, the rlimit-nofile
|
||||||
|
// of the process will be restored with the cache. In runc, this will
|
||||||
|
// cause the rlimit-nofile setting by the parent process for the container
|
||||||
|
// to become invalid. It can be solved by clearing this cache. But
|
||||||
|
// unfortunately, go stdlib doesn't provide such function, so we need to
|
||||||
|
// link to the private var `origRlimitNofile` in package syscall to hack.
|
||||||
|
syscallOrigRlimitNofile.Store(nil)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user