Use Control Group v2 (#1329)

* Disable real-time scheduling It seems that Linux' cgroup v2 currenlty does not support RT scheduling. * Remove Supervisor RT support flag With CGroups v2 we can no longer support CPU resource allocation for realtime scheduling. * Bump OS Agent to 1.3.0 for CGroups v2 support
home-assistant · Aug 9, 2022 · 4d9b604 · 4d9b604
1 parent 7409be7
commit 4d9b604
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 6 deletions.
diff --git a/buildroot b/buildroot
diff --git a/buildroot-external/board/asus/tinker/kernel.config b/buildroot-external/board/asus/tinker/kernel.config
@@ -120,7 +120,6 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y

diff --git a/buildroot-external/kernel/docker.config b/buildroot-external/kernel/docker.config
@@ -2,7 +2,6 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
 CONFIG_NET_SCHED=y
 
 CONFIG_CGROUPS=y

diff --git a/buildroot-external/package/os-agent/os-agent.mk b/buildroot-external/package/os-agent/os-agent.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OS_AGENT_VERSION = 1.2.1
+OS_AGENT_VERSION = 1.3.0
 OS_AGENT_SITE = $(call github,home-assistant,os-agent,$(OS_AGENT_VERSION))
 OS_AGENT_LICENSE = Apache License 2.0
 OS_AGENT_LICENSE_FILES = LICENSE

diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf
@@ -3,4 +3,4 @@ RequiresMountsFor=/etc/docker /mnt/data /var/lib/docker
 
 [Service]
 ExecStart=
-ExecStart=/usr/bin/dockerd -H fd:// --cpu-rt-runtime=950000 --storage-driver=overlay2 --log-driver=journald --log-opt tag="{{.ImageName}}/{{.Name}}" --data-root /mnt/data/docker
+ExecStart=/usr/bin/dockerd -H fd:// --storage-driver=overlay2 --log-driver=journald --log-opt tag="{{.ImageName}}/{{.Name}}" --data-root /mnt/data/docker
diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
@@ -89,7 +89,6 @@ if [ -z "${SUPERVISOR_CONTAINER_ID}" ]; then
         -v ${SUPERVISOR_DATA}:/data:rw \
         -e SUPERVISOR_SHARE=${SUPERVISOR_DATA} \
         -e SUPERVISOR_NAME=hassio_supervisor \
-        -e SUPERVISOR_CPU_RT=1 \
         -e SUPERVISOR_MACHINE=${SUPERVISOR_MACHINE} \
         "${SUPERVISOR_IMAGE}:latest"
+268 −0		package/runc/0001-Separate-Device-handling-for-default-AllowDevices.patch
+95 −0		package/runc/0002-Implement-common-function-to-create-DeviceCgroup-rul.patch
+92 −0		package/runc/0003-Implement-Device-Resources-updates.patch
+29 −0		package/runc/0004-Adress-linter-error.patch
+29 −0		package/runc/0005-Don-t-store-is_default-in-json.patch
+83 −0		package/runc/0006-Add-integration-tests-for-device-updates.patch
+73 −0		package/runc/0007-Remove-duplicated-code.patch
+31 −0		package/runc/0008-Revert-Don-t-store-is_default-in-json.patch
+41 −0		package/runc/0009-Check-if-dev-null-is-accessible.patch
+28 −0		package/runc/0010-Address-shfmt.patch
+31 −0		package/runc/0011-Incremental-update-device-permission.patch
+1 −1		package/runc/runc.mk
+1 −1		package/systemd/systemd.mk