Skip to content

init.d/cgroups: move cgroup2 root processes into rc.init #1014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pva wants to merge 3 commits into
base: master
Choose a base branch
from
+74 −25
Open

init.d/cgroups: move cgroup2 root processes into rc.init #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
734dbf6
init.d/cgroups: tidy cgroup path and controller variables
pva May 29, 2026
3f36576
init.d/cgroups: move cgroup2 root processes into rc.init
pva May 29, 2026
b5c0e4a
init.d/cgroups: skip kernel threads when moving cgroup2 root pids
pva May 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 63 additions & 21 deletions init.d/cgroups.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ cgroup1_base()

cgroup1_controllers()
{
yesno "${rc_controller_cgroups:-YES}" && [ -e /proc/cgroups ] &&
yesno "${rc_controller_cgroups:-YES}" && [ -e /proc/cgroups ] &&
grep -qw cgroup /proc/filesystems || return 0
while read -r name _ _ enabled _; do
case "${enabled}" in
1) mountinfo -q "/sys/fs/cgroup/${name}" && continue
local x
for x in $rc_cgroup_controllers; do
[ "${name}" = "blkio" ] && [ "${x}" = "io" ] &&
continue 2
[ "${name}" = "${x}" ] &&
continue 2
local controller
for controller in ${rc_cgroup_controllers}; do
[ "${name}" = "blkio" ] && [ "${controller}" = "io" ] &&
continue 2
[ "${name}" = "${controller}" ] &&
continue 2
done
mkdir "/sys/fs/cgroup/${name}"
mount -n -t cgroup -o "${cgroup_opts},${name}" \
Expand All @@ -69,34 +69,74 @@ cgroup1_controllers()
cgroup2_base()
{
grep -qw cgroup2 /proc/filesystems || return 0
local base
base="$(cgroup2_find_path)"
mkdir -p "${base}"
if ! mountinfo -q -f '^cgroup2$' "${base}"; then
mount -t cgroup2 cgroup2 -o "${cgroup_opts},nsdelegate" "${base}" 2> /dev/null ||
mount -t cgroup2 cgroup2 -o "${cgroup_opts}" "${base}"
local cgroup_path
cgroup_path="$(cgroup2_find_path)"
mkdir -p "${cgroup_path}"
if ! mountinfo -q -f '^cgroup2$' "${cgroup_path}"; then
mount -t cgroup2 cgroup2 -o "${cgroup_opts},nsdelegate" "${cgroup_path}" 2> /dev/null ||
mount -t cgroup2 cgroup2 -o "${cgroup_opts}" "${cgroup_path}"
fi
mountinfo -q -f '^cgroup2$' "${cgroup_path}" &&
mkdir -p "${cgroup_path}/rc.init"
return 0
}

cgroup2_process_is_kthread()
{
local flags line pid
pid="$1"

[ -r "/proc/${pid}/stat" ] || return 1
read -r line < "/proc/${pid}/stat" || return 1
line="${line##*) }"
set -- ${line}
# After removing pid and comm, /proc/pid/stat field 9 (flags) is $7
flags="$7"
[ -n "${flags}" ] || return 1

# PF_KTHREAD is 0x00200000 = 2097152 in decimal
[ $(( flags & 2097152 )) -ne 0 ]
}

cgroup2_move_init_procs()
{
grep -qw cgroup2 /proc/filesystems || return 0
local cgroup_path init_cgroup pid pids
cgroup_path="$(cgroup2_find_path)"
[ -z "${cgroup_path}" ] && return 0
[ ! -e "${cgroup_path}/cgroup.procs" ] && return 0
init_cgroup="${cgroup_path}/rc.init"
[ ! -e "${init_cgroup}/cgroup.procs" ] && return 0
pids=
while read -r pid; do
[ -n "${pid}" ] && pids="${pids} ${pid}"
done < "${cgroup_path}/cgroup.procs"
for pid in ${pids}; do
[ -d "/proc/${pid}" ] || continue
cgroup2_process_is_kthread "${pid}" && continue
printf "%s" "${pid}" > "${init_cgroup}/cgroup.procs"
done
Comment on lines +111 to +118

@navi-desu navi-desu Jul 19, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this need to be two separate loops? over

Suggested change
while read -r pid; do
[ -n "${pid}" ] && pids="${pids} ${pid}"
done < "${cgroup_path}/cgroup.procs"
for pid in ${pids}; do
[ -d "/proc/${pid}" ] || continue
cgroup2_process_is_kthread "${pid}" && continue
printf "%s" "${pid}" > "${init_cgroup}/cgroup.procs"
done
while read -r pid; do
[ -n "${pid}" ] && [ -d "/proc/${pid}" ] || continue
cgroup2_process_is_kthread "${pid}" && continue
printf "%s" "${pid}" > "${init_cgroup}/cgroup.procs"
done < "${cgroup_path}/cgroup.procs"

return 0
}

cgroup2_controllers()
{
grep -qw cgroup2 /proc/filesystems || return 0
local active cgroup_path x y
local cgroup_path controller controllers rc_controller
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
[ ! -e "${cgroup_path}/cgroup.subtree_control" ] && return 0
read -r controllers < "${cgroup_path}/cgroup.controllers"
for controller in ${controllers}; do
case "${rc_cgroup_mode:-unified}" in
unified)
echo "+${x}" > "${cgroup_path}/cgroup.subtree_control"
echo "+${controller}" > "${cgroup_path}/cgroup.subtree_control"
;;
hybrid)
for y in ${rc_cgroup_controllers}; do
if [ "$x" = "$y" ]; then
echo "+${x}" > "${cgroup_path}/cgroup.subtree_control"
for rc_controller in ${rc_cgroup_controllers}; do
if [ "${controller}" = "${rc_controller}" ]; then
echo "+${controller}" > "${cgroup_path}/cgroup.subtree_control"
fi
done
;;
Expand All @@ -109,6 +149,7 @@ cgroups_hybrid()
{
cgroup1_base
cgroup2_base
cgroup2_move_init_procs
cgroup2_controllers
cgroup1_controllers
return 0
Expand All @@ -124,6 +165,7 @@ cgroups_legacy()
cgroups_unified()
{
cgroup2_base
cgroup2_move_init_procs
cgroup2_controllers
return 0
}
Expand Down
15 changes: 11 additions & 4 deletions sh/rc-cgroup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,22 @@ cgroup2_find_path()

cgroup2_remove()
{
local cgroup_path rc_cgroup_path
local cgroup_path rc_cgroup_path return_cgroup_procs
cgroup_path="$(cgroup2_find_path)"
[ -z "${cgroup_path}" ] && return 0
rc_cgroup_path="${cgroup_path}/openrc.${RC_SVCNAME}"
[ ! -d "${rc_cgroup_path}" ] ||
[ ! -e "${rc_cgroup_path}"/cgroup.events ] &&
return 0
grep -qx "$$" "${rc_cgroup_path}/cgroup.procs" &&
printf "%d" 0 > "${cgroup_path}/cgroup.procs"
return_cgroup_procs="${cgroup_path}/cgroup.procs"
# rc.init is absent after a live upgrade from versions which did not
# create it, so retain the old hierarchy-root fallback in that case.
[ -e "${cgroup_path}/rc.init/cgroup.procs" ] &&
return_cgroup_procs="${cgroup_path}/rc.init/cgroup.procs"
[ ! -e "${return_cgroup_procs}" ] && return 0
if grep -qx "$$" "${rc_cgroup_path}/cgroup.procs"; then
printf "%d" 0 > "${return_cgroup_procs}" || return 0
fi
local key populated value
while read -r key value; do
case "${key}" in
Expand All @@ -191,7 +198,7 @@ cgroup2_set_limits()
local cgroup_path rc_cgroup_path key value
cgroup_path="$(cgroup2_find_path)"
[ -z "${cgroup_path}" ] && return 0
mountinfo -q "${cgroup_path}"|| return 0
mountinfo -q -f '^cgroup2$' "${cgroup_path}" || return 0
rc_cgroup_path="${cgroup_path}/openrc.${RC_SVCNAME}"
[ ! -d "${rc_cgroup_path}" ] && mkdir "${rc_cgroup_path}"
[ -f "${rc_cgroup_path}"/cgroup.procs ] &&
Expand Down
Loading