tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Migrate the blkio controller to the v2 cgroup hierarchy" am: 0090e72568

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

Change-Id: I73c2f25855ad9d75916ed765391ff1bc3ba99591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bart Van Assche 2022-03-29 18:53:23 +00:00 committed by Automerger Merge Worker
commit c1e8abd0e6
3 changed files with 111 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libprocessgroup/profiles/cgroups.json
View file

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

118
libprocessgroup/profiles/task_profiles.json
View file

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

20
rootdir/init.rc
View file

@ -243,26 +243,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