cgroups: refactor cgroups

move into a new layout with a supervision root cgroup as /rc, services
will then go in /rc/$RC_SVCNAME, and compatibility with the old
/openrc.$RC_SVCNAME is kept though restarting a service will use the new
layout

this also fixes a bug where cgroup_cleanup would not ever trigger due to
a bug in cgroup_running

Author: navi-desu

init.d/cgroups.in

@@ -68,38 +68,42 @@ cgroup1_controllers()
 cgroup2_base()
 {
 	grep -qw cgroup2 /proc/filesystems || return 0
-	local base
-	base="$(cgroup2_find_path)"
-	mkdir -p "${base}"
-	mount -t cgroup2 none -o "${cgroup_opts},nsdelegate" "${base}" 2> /dev/null ||
-		mount -t cgroup2 none -o "${cgroup_opts}" "${base}"
-	return 0
+
+	mkdir -p "${cgroup_root}"
+	mount -t cgroup2 none -o "${cgroup_opts},nsdelegate" "${cgroup_root}" 2> /dev/null ||
+		mount -t cgroup2 none -o "${cgroup_opts}" "${cgroup_root}"
+	mkdir -p "${cgroup_root}/rc"
 }
 
-cgroup2_controllers()
+setup_controller()
 {
-	grep -qw cgroup2 /proc/filesystems || return 0
-	local active cgroup_path x y
-	cgroup_path="$(cgroup2_find_path)"
-	[ -z "${cgroup_path}" ] && return 0
-	[ ! -e "${cgroup_path}/cgroup.controllers" ] && return 0
-	[ ! -e "${cgroup_path}/cgroup.subtree_control" ]&& return 0
-	read -r active < "${cgroup_path}/cgroup.controllers"
-	for x in ${active}; do
-	case "${rc_cgroup_mode:-unified}" in
-		unified)
-			echo "+${x}"  > "${cgroup_path}/cgroup.subtree_control"
-			;;
+	local root="$1" controller allowed
+	shift
+
+	[ ! -e "${root}/cgroup.controllers" ] && return 0
+	[ ! -e "${root}/cgroup.subtree_control" ] && return 0
+
+	for controller; do
+		case "${rc_cgroup_mode:-unified}" in
+		unified) echo "+${controller}" > "${root}/cgroup.subtree_control" ;;
 		hybrid)
-			for y in ${rc_cgroup_controllers}; do
-				if [ "$x" = "$y" ]; then
-					echo "+${x}"  > "${cgroup_path}/cgroup.subtree_control"
+			for allowed in ${rc_cgroup_controllers}; do
+				if [ "$controller" = "$allowed" ]; then
+					echo "+${controller}" > "${root}/cgroup.subtree_control"
 				fi
 			done
 			;;
 		esac
 	done
-	return 0
+}
+
+cgroup2_controllers()
+{
+	grep -qw cgroup2 /proc/filesystems || return 0
+	local active
+	read -r active < "${cgroup_root}/cgroup.controllers"
+	setup_controller "${cgroup_root}" $active
+	setup_controller "${cgroup_root}/rc" $active
 }
 
 cgroups_hybrid()

sh/openrc-run.sh.in

@@ -278,29 +278,18 @@ if yesno "${rc_verbose:-$RC_VERBOSE}"; then
 fi
 
 for _cmd; do
-	if [ "$_cmd" != status -a "$_cmd" != describe ]; then
-		# Apply any ulimit(s) defined
-		[ -n "${rc_ulimit:-$RC_ULIMIT}" ] && \
-			apply_ulimits ${rc_ulimit:-$RC_ULIMIT}
-		# Apply cgroups settings if defined
-		if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]
-		then
-			if grep -qs /sys/fs/cgroup /proc/1/mountinfo
-			then
-				if [ -d /sys/fs/cgroup -a ! -w /sys/fs/cgroup ]; then
-					eerror "No permission to apply cgroup settings"
-					break
-				fi
-			fi
-			cgroup_add_service
-		fi
-		[ "$(command -v cgroup_set_limits)" = "cgroup_set_limits" ] &&
-			cgroup_set_limits
-		[ "$(command -v cgroup2_set_limits)" = "cgroup2_set_limits" ] &&
-			[ "$_cmd" = start ] &&
-			cgroup2_set_limits
-		break
-	fi
+	[ "$_cmd" = status ] || [ "$_cmd" = describe ] && continu
+
+	# Apply any ulimit(s) defined
+	[ -n "${rc_ulimit:-$RC_ULIMIT}" ] && apply_ulimits ${rc_ulimit:-$RC_ULIMIT}
+
+	# Apply cgroups settings if defined
+	[ -n "$cgroup_path" ] || continue
+
+	cgroup_add_service
+	cgroup_set_limits
+
+	break
 done
 
 eval "printf '%s\n' $required_dirs" | while read _d; do
@@ -392,14 +381,12 @@ while [ -n "$1" ]; do
 				then
 					"$1"_post || exit $?
 				fi
-				[ "$(command -v cgroup_cleanup)" = "cgroup_cleanup" ] &&
-					[ "$1" = "stop" ] &&
-					yesno "${rc_cgroup_cleanup}" && \
-					cgroup_cleanup
-				if [ "$(command -v cgroup2_remove)" = "cgroup2_remove" ]; then
-					[ "$1" = stop ] || [ -z "${command}" ] &&
-					cgroup2_remove
+
+				if [ "$1" = "stop" ] && [ -d "$cgroup_path" ]; then
+					yesno "${rc_cgroup_cleanup}" && cgroup_cleanup
+					[ -z "${command}" ] && cgroup2_remove
 				fi
+
 				shift
 				continue 2
 			else