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

Merge changes from topic "b314861914" into main

Browse source 
* changes:
  Revert "Migrate the blkio controller to the v2 cgroup hierarchy"
  Revert "task_profiles.json: Set io.prio.class"
This commit is contained in:
Treehugger Robot 2024-01-26 15:38:44 +00:00 committed by Gerrit Code Review
commit 761db93167
3 changed files with 39 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

156
libprocessgroup/profiles/task_profiles.json
View file

@ -76,26 +76,6 @@
"Name": "FreezerState",
"Controller": "freezer",
"File": "cgroup.freeze"
},
{
"Name": "BfqWeight",
"Controller": "io",
"File": "io.bfq.weight"
},
{
"Name": "CfqGroupIdle",
"Controller": "io",
"File": "io.group_idle"
},
{
"Name": "CfqWeight",
"Controller": "io",
"File": "io.weight"
},
{
"Name": "IoPrioClass",
"Controller": "io",
"File": "io.prio.class"
}
],
@ -459,39 +439,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"
}
},
{
"Name": "SetAttribute",
"Params":
{
"Name": "IoPrioClass",
"Value": "restrict-to-be",
"Optional": "true"
"Controller": "blkio",
"Path": "background"
}
}
]
@ -500,39 +452,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"
}
},
{
"Name": "SetAttribute",
"Params":
{
"Name": "IoPrioClass",
"Value": "restrict-to-be",
"Optional": "true"
"Controller": "blkio",
"Path": ""
}
}
]
@ -541,39 +465,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"
}
},
{
"Name": "SetAttribute",
"Params":
{
"Name": "IoPrioClass",
"Value": "promote-to-rt",
"Optional": "true"
"Controller": "blkio",
"Path": ""
}
}
]
@ -582,39 +478,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"
}
},
{
"Name": "SetAttribute",
"Params":
{
"Name": "IoPrioClass",
"Value": "promote-to-rt",
"Optional": "true"
"Controller": "blkio",
"Path": ""
}
}
]

20
rootdir/init.rc
View file

@ -228,6 +228,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