Merge pull request #2235 from Zyqsempai/add-hugetlb-controller-to-cgr…

…oupv2

Added HugeTlb controller for cgroupv2

libcontainer/cgroups/fs2/fs2.go

@@ -124,6 +124,12 @@ func (m *manager) GetStats() (*cgroups.Stats, error) {
 			errs = append(errs, err)
 		}
 	}
+	// hugetlb (since kernel 5.6)
+	if _, ok := m.controllers["hugetlb"]; ok {
+		if err := statHugeTlb(m.dirPath, &st); err != nil {
+			errs = append(errs, err)
+		}
+	}
 	if len(errs) > 0 && !m.rootless {
 		return &st, errors.Errorf("error while statting cgroup v2: %+v", errs)
 	}
@@ -198,6 +204,12 @@ func (m *manager) Set(container *configs.Config) error {
 			errs = append(errs, err)
 		}
 	}
+	// hugetlb (since kernel 5.6)
+	if _, ok := m.controllers["hugetlb"]; ok {
+		if err := setHugeTlb(m.dirPath, container.Cgroups); err != nil {
+			errs = append(errs, err)
+		}
+	}
 	// freezer (since kernel 5.2, pseudo-controller)
 	if err := setFreezer(m.dirPath, container.Cgroups.Freezer); err != nil {
 		errs = append(errs, err)

libcontainer/cgroups/fs2/hugetlb.go

@@ -0,0 +1,59 @@
+// +build linux
+
+package fs2
+
+import (
+	"io/ioutil"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/pkg/errors"
+
+	"github.com/opencontainers/runc/libcontainer/cgroups"
+	"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
+	"github.com/opencontainers/runc/libcontainer/configs"
+)
+
+func setHugeTlb(dirPath string, cgroup *configs.Cgroup) error {
+	for _, hugetlb := range cgroup.Resources.HugetlbLimit {
+		if err := fscommon.WriteFile(dirPath, strings.Join([]string{"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 {
+		usage := strings.Join([]string{"hugetlb", pagesize, "current"}, ".")
+		value, err := fscommon.GetCgroupParamUint(dirPath, usage)
+		if err != nil {
+			return errors.Wrapf(err, "failed to parse hugetlb.%s.current file", pagesize)
+		}
+		hugetlbStats.Usage = value
+
+		fileName := strings.Join([]string{"hugetlb", pagesize, "events"}, ".")
+		filePath := filepath.Join(dirPath, fileName)
+		contents, err := ioutil.ReadFile(filePath)
+		if err != nil {
+			return errors.Wrapf(err, "failed to parse hugetlb.%s.events file", pagesize)
+		}
+		_, value, err = fscommon.GetCgroupParamKeyValue(string(contents))
+		if err != nil {
+			return errors.Wrapf(err, "failed to parse hugetlb.%s.events file", pagesize)
+		}
+		hugetlbStats.Failcnt = value
+
+		stats.HugetlbStats[pagesize] = hugetlbStats
+	}
+
+	return nil
+}