mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-11-24 22:28:43 +00:00
runc rc95 contains a fix for CVE-2021-30465. runc rc94 provides fixes and improvements. One notable change is cgroup manager's Set now accept Resources rather than Cgroup (see https://github.com/opencontainers/runc/pull/2906). Modify the code accordingly. Also update runc dependencies (as hinted by hack/lint-depdendencies.sh): github.com/cilium/ebpf v0.5.0 github.com/containerd/console v1.0.2 github.com/coreos/go-systemd/v22 v22.3.1 github.com/godbus/dbus/v5 v5.0.4 github.com/moby/sys/mountinfo v0.4.1 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 github.com/google/go-cmp v0.5.4 github.com/kr/pretty v0.2.1 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
58 lines
1.3 KiB
Go
58 lines
1.3 KiB
Go
// +build linux
|
|
|
|
package fs2
|
|
|
|
import (
|
|
"strconv"
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
"github.com/opencontainers/runc/libcontainer/cgroups"
|
|
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
|
|
"github.com/opencontainers/runc/libcontainer/configs"
|
|
)
|
|
|
|
func isHugeTlbSet(r *configs.Resources) bool {
|
|
return len(r.HugetlbLimit) > 0
|
|
}
|
|
|
|
func setHugeTlb(dirPath string, r *configs.Resources) error {
|
|
if !isHugeTlbSet(r) {
|
|
return nil
|
|
}
|
|
for _, hugetlb := range r.HugetlbLimit {
|
|
if err := fscommon.WriteFile(dirPath, "hugetlb."+hugetlb.Pagesize+".max", strconv.FormatUint(hugetlb.Limit, 10)); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func statHugeTlb(dirPath string, stats *cgroups.Stats) error {
|
|
hugePageSizes, err := cgroups.GetHugePageSize()
|
|
if err != nil {
|
|
return errors.Wrap(err, "failed to fetch hugetlb info")
|
|
}
|
|
hugetlbStats := cgroups.HugetlbStats{}
|
|
|
|
for _, pagesize := range hugePageSizes {
|
|
value, err := fscommon.GetCgroupParamUint(dirPath, "hugetlb."+pagesize+".current")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
hugetlbStats.Usage = value
|
|
|
|
fileName := "hugetlb." + pagesize + ".events"
|
|
value, err = fscommon.GetValueByKey(dirPath, fileName, "max")
|
|
if err != nil {
|
|
return errors.Wrap(err, "failed to read stats")
|
|
}
|
|
hugetlbStats.Failcnt = value
|
|
|
|
stats.HugetlbStats[pagesize] = hugetlbStats
|
|
}
|
|
|
|
return nil
|
|
}
|