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

Commit eef0f563 authored by Bart Van Assche's avatar Bart Van Assche
Browse files

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



There are multiple use cases in Android for which background writes need
to be controlled via the cgroup mechanism. The cgroup mechanism can only
control background writes if both the blkio and memcg controllers are
mounted in the v2 cgroup hierarchy. Hence this patch that migrates the
blkio controller from the v1 to the v2 cgroup hierarchy.

The blkio controller has been marked as optional since not all Android
kernels enable this controller (CONFIG_BLK_CGROUP).

This patch increases the TOTAL_BOOT_TIME for devices with a 4.19 kernel
(redfin) from 18.9 s to 20 s. This patch does not affect the boot time
for devices with a 5.10 or 5.15 kernel.

This patch increases the time spent in CgroupMap::ActivateControllers()
by 25 microseconds in Cuttlefish on an x86-64 CPU.
CgroupMap::ActivateControllers() is called by Service::Start().

Bug: 213617178
Test: Cuttlefish and various phones
Change-Id: I3c07c1be84c3feb277b7d7003652d5d3b57c6541
Signed-off-by: default avatarBart Van Assche <bvanassche@google.com>
parent ecdbbbda

libprocessgroup/profiles/cgroups.json

+6 −7
Original line number Original line Diff line number Diff line 
{

{

  "Cgroups": [

  "Cgroups": [

    {

      "Controller": "blkio",

      "Path": "/dev/blkio",

      "Mode": "0775",

      "UID": "system",

      "GID": "system"

    },

    {

    {

      "Controller": "cpu",

      "Controller": "cpu",

      "Path": "/dev/cpuctl",

      "Path": "/dev/cpuctl",
@@ -39,6 +32,12 @@ 
      {

      {

        "Controller": "freezer",

        "Controller": "freezer",

        "Path": "."

        "Path": "."

      },

      {

        "Controller": "io",

        "Path": ".",

        "NeedsActivation": true,

        "Optional": true

      }

      }

    ]

    ]

  }

  }

libprocessgroup/profiles/task_profiles.json

+0 −32
Original line number Original line Diff line number Diff line
@@ -456,14 +456,6 @@ 
    {

    {

      "Name": "LowIoPriority",

      "Name": "LowIoPriority",

      "Actions": [

      "Actions": [

        {

          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": "background"

          }

        },

        {

        {

          "Name": "SetAttribute",

          "Name": "SetAttribute",

          "Params":

          "Params":
@@ -496,14 +488,6 @@ 
    {

    {

      "Name": "NormalIoPriority",

      "Name": "NormalIoPriority",

      "Actions": [

      "Actions": [

        {

          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": ""

          }

        },

        {

        {

          "Name": "SetAttribute",

          "Name": "SetAttribute",

          "Params":

          "Params":
@@ -536,14 +520,6 @@ 
    {

    {

      "Name": "HighIoPriority",

      "Name": "HighIoPriority",

      "Actions": [

      "Actions": [

        {

          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": ""

          }

        },

        {

        {

          "Name": "SetAttribute",

          "Name": "SetAttribute",

          "Params":

          "Params":
@@ -576,14 +552,6 @@ 
    {

    {

      "Name": "MaxIoPriority",

      "Name": "MaxIoPriority",

      "Actions": [

      "Actions": [

        {

          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": ""

          }

        },

        {

        {

          "Name": "SetAttribute",

          "Name": "SetAttribute",

          "Params":

          "Params":

rootdir/init.rc

+0 −20
Original line number Original line 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.boost 1

    write /dev/stune/nnapi-hal/schedtune.prefer_idle 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

    restorecon_recursive /mnt





    mount configfs none /config nodev noexec nosuid

    mount configfs none /config nodev noexec nosuid