go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge 0bfffbcb (automated)

This commit is contained in:
gVisor bot 2019-09-06 02:29:31 +00:00
parent fc961d4a53 0bfffbcb01
commit 9f3cc11c3b
5 changed files with 129 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go
View File

@ -1,12 +1,12 @@
package kernel
import (
"reflect"
"strings"
"unsafe"
"fmt"
"gvisor.dev/gvisor/third_party/gvsync"
"reflect"
"strings"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race

7
pkg/sentry/platform/ring0/defs_impl.go
View File

@ -1,14 +1,13 @@
package ring0
import (
"fmt"
"gvisor.dev/gvisor/pkg/cpuid"
"gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
"gvisor.dev/gvisor/pkg/sentry/usermem"
"io"
"reflect"
"syscall"
"fmt"
"gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
"gvisor.dev/gvisor/pkg/sentry/usermem"
)
var (

4
pkg/sentry/time/seqatomic_parameters_unsafe.go
View File

@ -1,12 +1,12 @@
package time
import (
"reflect"
"strings"
"unsafe"
"fmt"
"gvisor.dev/gvisor/third_party/gvsync"
"reflect"
"strings"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race

104
runsc/container/container.go
View File

@ -513,9 +513,16 @@ func (c *Container) Start(conf *boot.Config) error {
return err
}
// Adjust the oom_score_adj for sandbox and gofers. This must be done after
// Adjust the oom_score_adj for sandbox. This must be done after
// save().
return c.adjustOOMScoreAdj(conf)
err = adjustSandboxOOMScoreAdj(c.Sandbox, c.RootContainerDir, false)
if err != nil {
return err
}
// Set container's oom_score_adj to the gofer since it is dedicated to
// the container, in case the gofer uses up too much memory.
return c.adjustGoferOOMScoreAdj()
}
// Restore takes a container and replaces its kernel and file system
@ -782,6 +789,9 @@ func (c *Container) Destroy() error {
}
defer unlock()
// Stored for later use as stop() sets c.Sandbox to nil.
sb := c.Sandbox
if err := c.stop(); err != nil {
err = fmt.Errorf("stopping container: %v", err)
log.Warningf("%v", err)
@ -796,6 +806,16 @@ func (c *Container) Destroy() error {
c.changeStatus(Stopped)
// Adjust oom_score_adj for the sandbox. This must be done after the
// container is stopped and the directory at c.Root is removed.
// We must test if the sandbox is nil because Destroy should be
// idempotent.
if sb != nil {
if err := adjustSandboxOOMScoreAdj(sb, c.RootContainerDir, true); err != nil {
errs = append(errs, err.Error())
}
}
// "If any poststop hook fails, the runtime MUST log a warning, but the
// remaining hooks and lifecycle continue as if the hook had succeeded" -OCI spec.
// Based on the OCI, "The post-stop hooks MUST be called after the container is
@ -1139,33 +1159,80 @@ func runInCgroup(cg *cgroup.Cgroup, fn func() error) error {
return fn()
}
// adjustOOMScoreAdj sets the oom_score_adj for the sandbox and all gofers.
// adjustGoferOOMScoreAdj sets the oom_store_adj for the container's gofer.
func (c *Container) adjustGoferOOMScoreAdj() error {
if c.GoferPid != 0 && c.Spec.Process.OOMScoreAdj != nil {
if err := setOOMScoreAdj(c.GoferPid, *c.Spec.Process.OOMScoreAdj); err != nil {
return fmt.Errorf("setting gofer oom_score_adj for container %q: %v", c.ID, err)
}
}
return nil
}
// adjustSandboxOOMScoreAdj sets the oom_score_adj for the sandbox.
// oom_score_adj is set to the lowest oom_score_adj among the containers
// running in the sandbox.
//
// TODO(gvisor.dev/issue/512): This call could race with other containers being
// created at the same time and end up setting the wrong oom_score_adj to the
// sandbox.
func (c *Container) adjustOOMScoreAdj(conf *boot.Config) error {
// If this container's OOMScoreAdj is nil then we can exit early as no
// change should be made to oom_score_adj for the sandbox.
if c.Spec.Process.OOMScoreAdj == nil {
return nil
}
containers, err := loadSandbox(conf.RootDir, c.Sandbox.ID)
func adjustSandboxOOMScoreAdj(s *sandbox.Sandbox, rootDir string, destroy bool) error {
containers, err := loadSandbox(rootDir, s.ID)
if err != nil {
return fmt.Errorf("loading sandbox containers: %v", err)
}
// Do nothing if the sandbox has been terminated.
if len(containers) == 0 {
return nil
}
// Get the lowest score for all containers.
var lowScore int
scoreFound := false
for _, container := range containers {
if container.Spec.Process.OOMScoreAdj != nil && (!scoreFound || *container.Spec.Process.OOMScoreAdj < lowScore) {
if len(containers) == 1 && len(containers[0].Spec.Annotations[specutils.ContainerdContainerTypeAnnotation]) == 0 {
// This is a single-container sandbox. Set the oom_score_adj to
// the value specified in the OCI bundle.
if containers[0].Spec.Process.OOMScoreAdj != nil {
scoreFound = true
lowScore = *container.Spec.Process.OOMScoreAdj
lowScore = *containers[0].Spec.Process.OOMScoreAdj
}
} else {
for _, container := range containers {
// Special multi-container support for CRI. Ignore the root
// container when calculating oom_score_adj for the sandbox because
// it is the infrastructure (pause) container and always has a very
// low oom_score_adj.
//
// We will use OOMScoreAdj in the single-container case where the
// containerd container-type annotation is not present.
if container.Spec.Annotations[specutils.ContainerdContainerTypeAnnotation] == specutils.ContainerdContainerTypeSandbox {
continue
}
if container.Spec.Process.OOMScoreAdj != nil && (!scoreFound || *container.Spec.Process.OOMScoreAdj < lowScore) {
scoreFound = true
lowScore = *container.Spec.Process.OOMScoreAdj
}
}
}
// If the container is destroyed and remaining containers have no
// oomScoreAdj specified then we must revert to the oom_score_adj of the
// parent process.
if !scoreFound && destroy {
ppid, err := specutils.GetParentPid(s.Pid)
if err != nil {
return fmt.Errorf("getting parent pid of sandbox pid %d: %v", s.Pid, err)
}
pScore, err := specutils.GetOOMScoreAdj(ppid)
if err != nil {
return fmt.Errorf("getting oom_score_adj of parent %d: %v", ppid, err)
}
scoreFound = true
lowScore = pScore
}
// Only set oom_score_adj if one of the containers has oom_score_adj set
@ -1177,15 +1244,10 @@ func (c *Container) adjustOOMScoreAdj(conf *boot.Config) error {
}
// Set the lowest of all containers oom_score_adj to the sandbox.
if err := setOOMScoreAdj(c.Sandbox.Pid, lowScore); err != nil {
return fmt.Errorf("setting oom_score_adj for sandbox %q: %v", c.Sandbox.ID, err)
if err := setOOMScoreAdj(s.Pid, lowScore); err != nil {
return fmt.Errorf("setting oom_score_adj for sandbox %q: %v", s.ID, err)
}
// Set container's oom_score_adj to the gofer since it is dedicated to the
// container, in case the gofer uses up too much memory.
if err := setOOMScoreAdj(c.GoferPid, *c.Spec.Process.OOMScoreAdj); err != nil {
return fmt.Errorf("setting gofer oom_score_adj for container %q: %v", c.ID, err)
}
return nil
}

39
runsc/specutils/specutils.go
View File

@ -23,6 +23,7 @@ import (
"os"
"path"
"path/filepath"
"strconv"
"strings"
"syscall"
"time"
@ -503,3 +504,41 @@ func RetryEintr(f func() (uintptr, uintptr, error)) (uintptr, uintptr, error) {
}
}
}
// GetOOMScoreAdj reads the given process' oom_score_adj
func GetOOMScoreAdj(pid int) (int, error) {
data, err := ioutil.ReadFile(fmt.Sprintf("/proc/%d/oom_score_adj", pid))
if err != nil {
return 0, err
}
return strconv.Atoi(strings.TrimSpace(string(data)))
}
// GetParentPid gets the parent process ID of the specified PID.
func GetParentPid(pid int) (int, error) {
data, err := ioutil.ReadFile(fmt.Sprintf("/proc/%d/stat", pid))
if err != nil {
return 0, err
}
var cpid string
var name string
var state string
var ppid int
// Parse after the binary name.
_, err = fmt.Sscanf(string(data),
"%v %v %v %d",
// cpid is ignored.
&cpid,
// name is ignored.
&name,
// state is ignored.
&state,
&ppid)
if err != nil {
return 0, err
}
return ppid, nil
}