diff options
| author | ap4y <mail@ap4y.me> | 2020-09-30 21:54:59 +1300 |
|---|---|---|
| committer | Andrew J. Hesford <48421688+ahesford@users.noreply.github.com> | 2021-03-13 19:27:18 -0500 |
| commit | 42ca737148ea530dad5945af1a4eb7e471e8b637 (patch) | |
| tree | 32125d283a4d85ba8661943959ee3a2a12b8eb12 | |
| parent | 288f526f23eb6270f6c902883e9a3092dc4972fa (diff) | |
| download | runit-void-42ca737148ea530dad5945af1a4eb7e471e8b637.tar.gz runit-void-42ca737148ea530dad5945af1a4eb7e471e8b637.tar.xz runit-void-42ca737148ea530dad5945af1a4eb7e471e8b637.zip | |
Support pure v2 cgroup mounts 20210314
Some of the tooling that rely on cgroups (notably podman, runc and crun) enable cgroup2 mode only if /sys/fs/cgroup has a v2 magic number. This commit introduces configuration option that controls the way cgroup is mounted, 3 modes are supported: - hybrid: current mode with v1 and v2 mounted - unified: v2 only mode - legacy: v1 only mode This is modeled after OpenRC: https://github.com/OpenRC/openrc/blob/72df51e17ba0e1a0f94451b4bbfb338288c4625c/init.d/cgroups.in#L121-L129
| -rw-r--r-- | core-services/00-pseudofs.sh | 34 | ||||
| -rw-r--r-- | rc.conf | 7 |
2 files changed, 37 insertions, 4 deletions
diff --git a/core-services/00-pseudofs.sh b/core-services/00-pseudofs.sh index 8fe1257..88d4255 100644 --- a/core-services/00-pseudofs.sh +++ b/core-services/00-pseudofs.sh @@ -11,10 +11,36 @@ mountpoint -q /dev/shm || mount -o mode=1777,nosuid,nodev -n -t tmpfs shm /dev/s mountpoint -q /sys/kernel/security || mount -n -t securityfs securityfs /sys/kernel/security if [ -z "$VIRTUALIZATION" ]; then + _cgroupv1="" + _cgroupv2="" + + case "${CGROUP_MODE:-hybrid}" in + legacy) + _cgroupv1="/sys/fs/cgroup" + ;; + hybrid) + _cgroupv1="/sys/fs/cgroup" + _cgroupv2="${_cgroupv1}/unified" + ;; + unified) + _cgroupv2="/sys/fs/cgroup" + ;; + esac + # cgroup v1 - mountpoint -q /sys/fs/cgroup || mount -o mode=0755 -t tmpfs cgroup /sys/fs/cgroup - awk '$4 == 1 { system("mountpoint -q /sys/fs/cgroup/" $1 " || { mkdir -p /sys/fs/cgroup/" $1 " && mount -t cgroup -o " $1 " cgroup /sys/fs/cgroup/" $1 " ;}" ) }' /proc/cgroups + if [ -n "$_cgroupv1" ]; then + mountpoint -q "$_cgroupv1" || mount -o mode=0755 -t tmpfs cgroup "$_cgroupv1" + while read -r _subsys_name _hierarchy _num_cgroups _enabled; do + [ "$_enabled" = "1" ] || continue + _controller="${_cgroupv1}/${_subsys_name}" + mkdir -p "$_controller" + mountpoint -q "$_controller" || mount -t cgroup -o "$_subsys_name" cgroup "$_controller" + done < /proc/cgroups + fi + # cgroup v2 - mkdir -p /sys/fs/cgroup/unified - mountpoint -q /sys/fs/cgroup/unified || mount -t cgroup2 -o nsdelegate cgroup2 /sys/fs/cgroup/unified + if [ -n "$_cgroupv2" ]; then + mkdir -p "$_cgroupv2" + mountpoint -q "$_cgroupv2" || mount -t cgroup2 -o nsdelegate cgroup2 "$_cgroupv2" + fi fi diff --git a/rc.conf b/rc.conf index db59f84..2c4cf64 100644 --- a/rc.conf +++ b/rc.conf @@ -33,3 +33,10 @@ # Amount of ttys which should be setup. #TTYS= + +# Set the mode for cgroup mounts. +# hybrid: mount cgroup v1 under /sys/fs/cgroup and +# cgroup v2 under /sys/fs/cgroup/unified +# legacy: mount cgroup v1 /sys/fs/cgroup +# unified: mount cgroup v2 under /sys/fs/cgroup +#CGROUP_MODE=hybrid |