ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Migrate the blkio controller to the v2 cgroup hierarchy"

Browse source 
Revert "Migrate the blkio controller to the cgroup v2 hierarchy"

Revert "Migrate the blkio controller to the cgroup v2 hierarchy"

Revert "Migrate the blkio controller to the cgroup v2 hierarchy"

Revert submission 1962326-blkio-cgroup-v2

Reason for revert: This set of changes is suspected to have caused a redfin boot time regression for the git_tm-dev branch.

Reverted Changes:
Id18d876b6:Migrate the blkio controller to the cgroup v2 hier...
I7dfa52136:Migrate the blkio controller to the v2 cgroup hier...
I5336167be:Migrate the blkio controller to the cgroup v2 hier...
I3f0131d8f:Migrate the blkio controller to the cgroup v2 hier...
Ibb62b2d4d:Migrate the blkio controller to the cgroup v2 hier...

Bug: 227382327
Bug: 227389363
Change-Id: I6c8183ed1c3044c8947c4fca07799deff98101b3
This commit is contained in:
Bart Van Assche 2022-03-30 14:46:57 +00:00
parent 07f6c82a4c
commit 159563561a
3 changed files with 39 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libprocessgroup/profiles/cgroups.json
View file

@ -1,5 +1,12 @@
{
"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
}
]
}

118
libprocessgroup/profiles/task_profiles.json
View file

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

20
rootdir/init.rc
View file

@ -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