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

Commit e5f17e6c authored by Bart Van Assche's avatar Bart Van Assche Committed by Automerger Merge Worker
Browse files

Merge "Migrate the blkio controller to the v2 cgroup hierarchy" am: 515c9243 

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



Change-Id: Ib197e061431509a6792a6fb429ce5d7a936821dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9b6eb3e 515c9243

libprocessgroup/profiles/cgroups.json

+5 −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,11 @@ 
      {

        "Controller": "freezer",

        "Path": "."

      },

      {

        "Controller": "io",

        "Path": ".",

        "NeedsActivation": true

      }

    ]

  }

libprocessgroup/profiles/task_profiles.json

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

          "Params":

          {

            "Controller": "blkio",

            "Path": "background"

            "Controller": "io"

          }

        },

        {
@@ -500,8 +499,7 @@ 
          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": ""

            "Controller": "io"

          }

        },

        {
@@ -540,8 +538,7 @@ 
          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": ""

            "Controller": "io"

          }

        },

        {
@@ -580,8 +577,7 @@ 
          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": ""

            "Controller": "io"

          }

        },

        {

rootdir/init.rc

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