mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

libct: refactor setnsProcess.start

Browse Source 
Factor startWithCgroupFD out of start to reduce the start complexity.
This also implements a more future-proof way of calling p.comm.closeChild.

Co-authored-by: lifubang <lifubang@acmcoder.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 871052b791)
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
This commit is contained in:
Kir Kolyshkin
2025-10-14 11:30:28 -07:00
committed by Aleksa Sarai
parent e8e22ae15c
commit 42b405d598
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/process_linux.go
+18 -12
View File
@@ -353,22 +353,21 @@ func (p *setnsProcess) prepareCgroupFD() (*os.File, error) {
return fd, nil
}
func (p *setnsProcess) start() (retErr error) {
defer p.comm.closeParent()
// startWithCgroupFD starts a process via clone3 with CLONE_INTO_CGROUP,
// with a fallback if it fails (e.g. not available).
func (p *setnsProcess) startWithCgroupFD() error {
// Close the child side of the pipes.
defer p.comm.closeChild()
fd, err := p.prepareCgroupFD()
if err != nil {
p.comm.closeChild()
return err
}
// Get the "before" value of oom kill count.
oom, _ := p.manager.OOMKillCount()
if fd != nil {
defer fd.Close()
}
err = p.startWithCPUAffinity()
if fd != nil {
fd.Close()
}
if err != nil && p.cmd.SysProcAttr.UseCgroupFD {
logrus.Debugf("exec with CLONE_INTO_CGROUP failed: %v; retrying without", err)
// SysProcAttr.CgroupFD is never used when UseCgroupFD is unset.
@@ -376,9 +375,16 @@ func (p *setnsProcess) start() (retErr error) {
err = p.startWithCPUAffinity()
}
// Close the child-side of the pipes (controlled by child).
p.comm.closeChild()
if err != nil {
return err
}
func (p *setnsProcess) start() (retErr error) {
defer p.comm.closeParent()
// Get the "before" value of oom kill count.
oom, _ := p.manager.OOMKillCount()
if err := p.startWithCgroupFD(); err != nil {
return fmt.Errorf("error starting setns process: %w", err)
}