From c4d7f5d99365c414ca84c5df0e9c7760993add5a Mon Sep 17 00:00:00 2001
From: David Scott <dave@recoil.org>
Date: Thu, 28 Oct 2021 11:44:28 +0100
Subject: [PATCH] service: handle creating cgroupv2 cgroups

These are easier to create than cgroupv1 cgroups as they are only a
single mkdir.

Detect which mode we are in by looking for the presence of the
cgroupv2-only cgroup.controllers file.

Signed-off-by: David Scott <dave@recoil.org>
---
 pkg/init/cmd/service/prepare.go | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/pkg/init/cmd/service/prepare.go b/pkg/init/cmd/service/prepare.go
index 3d937b71d..24047db67 100644
--- a/pkg/init/cmd/service/prepare.go
+++ b/pkg/init/cmd/service/prepare.go
@@ -119,9 +119,21 @@ func parseMountOptions(options []string) (int, string) {
 	return flag, strings.Join(data, ",")
 }
 
-// newCgroup creates a cgroup (ie directory) under all directories in /sys/fs/cgroup
+// newCgroup creates a cgroup (ie directory)
 // we could use github.com/containerd/cgroups but it has a lot of deps and this is just a sugary mkdir
 func newCgroup(cgroup string) error {
+	v2, err := isCgroupV2()
+	if err != nil {
+		return err
+	}
+	if v2 {
+		// a cgroupv2 cgroup is a single directory
+		if err := os.MkdirAll(filepath.Join("/sys/fs/cgroup", cgroup), 0755); err != nil {
+			log.Printf("cgroup error: %v", err)
+		}
+		return nil
+	}
+	// a cgroupv1 cgroup is a directory under all directories in /sys/fs/cgroup
 	dirs, err := ioutil.ReadDir("/sys/fs/cgroup")
 	if err != nil {
 		return err
@@ -139,6 +151,17 @@ func newCgroup(cgroup string) error {
 	return nil
 }
 
+func isCgroupV2() (bool, error) {
+	_, err := os.Stat("/sys/fs/cgroup/cgroup.controllers")
+	if err == nil {
+		return true, nil
+	}
+	if os.IsNotExist(err) {
+		return false, nil
+	}
+	return false, err
+}
+
 // prepareFilesystem sets up the mounts and cgroups, before the container is created
 func prepareFilesystem(path string, runtime Runtime) error {
 	// execute the runtime config that should be done up front