Merge "Revert "Migrate the blkio controller to the v2 cgroup hierarchy"" (921d266c) · Commits · e / os / android_system_core

libprocessgroup/profiles/cgroups.json

+7 −5

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",
		@@ -32,11 +39,6 @@
		{
		"Controller": "freezer",
		"Path": "."
		},
		{
		"Controller": "io",
		"Path": ".",
		"NeedsActivation": true
		}
		]
		}

libprocessgroup/profiles/task_profiles.json

+12 −106

Original line number	Diff line number	Diff line
		@@ -76,24 +76,6 @@
		"Name": "FreezerState",
		"Controller": "freezer",
		"File": "cgroup.freeze"
		},
		{
		"Name": "BfqWeight",
		"Controller": "io",
		"File": "blkio.bfq.weight",
		"FileV2": "io.bfq.weight"
		},
		{
		"Name": "CfqGroupIdle",
		"Controller": "io",
		"File": "blkio.group_idle",
		"FileV2": "io.group_idle"
		},
		{
		"Name": "CfqWeight",
		"Controller": "io",
		"File": "blkio.weight",
		"FileV2": "io.weight"
		}
		],

		@@ -458,30 +440,11 @@
		"Name": "LowIoPriority",
		"Actions": [
		{
		"Name": "SetAttribute",
		"Params":
		{
		"Name": "BfqWeight",
		"Value": "10",
		"Optional": "true"
		}
		},
		{
		"Name": "SetAttribute",
		"Params":
		{
		"Name": "CfqGroupIdle",
		"Value": "0",
		"Optional": "true"
		}
		},
		{
		"Name": "SetAttribute",
		"Name": "JoinCgroup",
		"Params":
		{
		"Name": "CfqWeight",
		"Value": "200",
		"Optional": "true"
		"Controller": "blkio",
		"Path": "background"
		}
		}
		]
		@@ -490,30 +453,11 @@
		"Name": "NormalIoPriority",
		"Actions": [
		{
		"Name": "SetAttribute",
		"Params":
		{
		"Name": "BfqWeight",
		"Value": "100",
		"Optional": "true"
		}
		},
		{
		"Name": "SetAttribute",
		"Params":
		{
		"Name": "CfqGroupIdle",
		"Value": "0",
		"Optional": "true"
		}
		},
		{
		"Name": "SetAttribute",
		"Name": "JoinCgroup",
		"Params":
		{
		"Name": "CfqWeight",
		"Value": "1000",
		"Optional": "true"
		"Controller": "blkio",
		"Path": ""
		}
		}
		]
		@@ -522,30 +466,11 @@
		"Name": "HighIoPriority",
		"Actions": [
		{
		"Name": "SetAttribute",
		"Params":
		{
		"Name": "BfqWeight",
		"Value": "100",
		"Optional": "true"
		}
		},
		{
		"Name": "SetAttribute",
		"Params":
		{
		"Name": "CfqGroupIdle",
		"Value": "0",
		"Optional": "true"
		}
		},
		{
		"Name": "SetAttribute",
		"Name": "JoinCgroup",
		"Params":
		{
		"Name": "CfqWeight",
		"Value": "1000",
		"Optional": "true"
		"Controller": "blkio",
		"Path": ""
		}
		}
		]
		@@ -554,30 +479,11 @@
		"Name": "MaxIoPriority",
		"Actions": [
		{
		"Name": "SetAttribute",
		"Params":
		{
		"Name": "BfqWeight",
		"Value": "100",
		"Optional": "true"
		}
		},
		{
		"Name": "SetAttribute",
		"Params":
		{
		"Name": "CfqGroupIdle",
		"Value": "0",
		"Optional": "true"
		}
		},
		{
		"Name": "SetAttribute",
		"Name": "JoinCgroup",
		"Params":
		{
		"Name": "CfqWeight",
		"Value": "1000",
		"Optional": "true"
		"Controller": "blkio",
		"Path": ""
		}
		}
		]

rootdir/init.rc

+20 −0

Original line number	Diff line number	Diff line
		@@ -243,6 +243,26 @@ 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