Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c50f4d54 authored Mar 23, 2023 by Bart Van Assche Committed by Automerger Merge Worker Mar 23, 2023

[DO NOT MERGE] Migrate the blkio controller to the v2 cgroup hierarchy am: eef0f563

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2378990

Change-Id: I781865e89ddd58075908f3803d15d4cf0d803111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents dc4bd8ba eef0f563

libprocessgroup/profiles/cgroups.json

+6 −7

Original line number	Diff line number	Diff line
		{
		"Cgroups": [
		{
		"Controller": "blkio",
		"Path": "/dev/blkio",
		"Mode": "0775",
		"UID": "system",
		"GID": "system"
		},
		{
		"Controller": "cpu",
		"Path": "/dev/cpuctl",
		@@ -39,6 +32,12 @@
		{
		"Controller": "freezer",
		"Path": "."
		},
		{
		"Controller": "io",
		"Path": ".",
		"NeedsActivation": true,
		"Optional": true
		}
		]
		}

libprocessgroup/profiles/task_profiles.json

+0 −32

Original line number	Diff line number	Diff line
		@@ -456,14 +456,6 @@
		{
		"Name": "LowIoPriority",
		"Actions": [
		{
		"Name": "JoinCgroup",
		"Params":
		{
		"Controller": "blkio",
		"Path": "background"
		}
		},
		{
		"Name": "SetAttribute",
		"Params":
		@@ -496,14 +488,6 @@
		{
		"Name": "NormalIoPriority",
		"Actions": [
		{
		"Name": "JoinCgroup",
		"Params":
		{
		"Controller": "blkio",
		"Path": ""
		}
		},
		{
		"Name": "SetAttribute",
		"Params":
		@@ -536,14 +520,6 @@
		{
		"Name": "HighIoPriority",
		"Actions": [
		{
		"Name": "JoinCgroup",
		"Params":
		{
		"Controller": "blkio",
		"Path": ""
		}
		},
		{
		"Name": "SetAttribute",
		"Params":
		@@ -576,14 +552,6 @@
		{
		"Name": "MaxIoPriority",
		"Actions": [
		{
		"Name": "JoinCgroup",
		"Params":
		{
		"Controller": "blkio",
		"Path": ""
		}
		},
		{
		"Name": "SetAttribute",
		"Params":

rootdir/init.rc

+0 −20

Original line number	Diff line number	Diff line
		@@ -221,26 +221,6 @@ on init
		write /dev/stune/nnapi-hal/schedtune.boost 1
		write /dev/stune/nnapi-hal/schedtune.prefer_idle 1

		# Create blkio group and apply initial settings.
		# This feature needs kernel to support it, and the
		# device's init.rc must actually set the correct values.
		mkdir /dev/blkio/background
		chown system system /dev/blkio
		chown system system /dev/blkio/background
		chown system system /dev/blkio/tasks
		chown system system /dev/blkio/background/tasks
		chown system system /dev/blkio/cgroup.procs
		chown system system /dev/blkio/background/cgroup.procs
		chmod 0664 /dev/blkio/tasks
		chmod 0664 /dev/blkio/background/tasks
		chmod 0664 /dev/blkio/cgroup.procs
		chmod 0664 /dev/blkio/background/cgroup.procs
		write /dev/blkio/blkio.weight 1000
		write /dev/blkio/background/blkio.weight 200
		write /dev/blkio/background/blkio.bfq.weight 10
		write /dev/blkio/blkio.group_idle 0
		write /dev/blkio/background/blkio.group_idle 0

		restorecon_recursive /mnt

		mount configfs none /config nodev noexec nosuid