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

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

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

This reverts commit c7a6fe68.
Repply the blkio controller migration because it was not responsible
for the test failures that led to the revert. See also the following bugs:
* https://b.corp.google.com/issues/260143932
  (v2/android-virtual-infra/test_mapping/presubmit-avd test failure)
* https://b.corp.google.com/issues/264620181


  (CtsInitTestCases.RebootTest#StopServicesSIGKILL failure)

The only change compared with the previous version is that the io
controller has been declared optional. This is necessary because some
devices have a kernel that does not support the io controller.

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

libprocessgroup/profiles/cgroups.json

+6 −7
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",
@@ -39,6 +32,12 @@ 
      {

        "Controller": "freezer",

        "Path": "."

      },

      {

        "Controller": "io",

        "Path": ".",

        "NeedsActivation": true,

        "Optional": true

      }

    ]

  }

libprocessgroup/profiles/task_profiles.json

+4 −8
Original line number Diff line number Diff line
@@ -442,8 +442,7 @@ 
          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": "background"

            "Controller": "io"

          }

        }

      ]
@@ -455,8 +454,7 @@ 
          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": ""

            "Controller": "io"

          }

        }

      ]
@@ -468,8 +466,7 @@ 
          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": ""

            "Controller": "io"

          }

        }

      ]
@@ -481,8 +478,7 @@ 
          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": ""

            "Controller": "io"

          }

        }

      ]

rootdir/init.rc

+0 −20
Original line number Diff line number Diff line
@@ -219,26 +219,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