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

Commit 9506593c authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Revert "Migrate the blkio controller to the v2 cgroup hierarchy"" am:... 

Merge "Revert "Migrate the blkio controller to the v2 cgroup hierarchy"" am: ddfa08b9 am: 2929e71d

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



Change-Id: I564d3c7a6f260aa5f84ab0fa155df15dd5963fd3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0f4064e 2929e71d

libprocessgroup/profiles/cgroups.json

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

        "Controller": "freezer",

        "Path": "."

      },

      {

        "Controller": "io",

        "Path": ".",

        "NeedsActivation": true

      }

    ]

  }

libprocessgroup/profiles/task_profiles.json

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

          "Params":

          {

            "Controller": "io"

            "Controller": "blkio",

            "Path": "background"

          }

        },

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

          "Params":

          {

            "Controller": "io"

            "Controller": "blkio",

            "Path": ""

          }

        },

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

          "Params":

          {

            "Controller": "io"

            "Controller": "blkio",

            "Path": ""

          }

        },

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

          "Params":

          {

            "Controller": "io"

            "Controller": "blkio",

            "Path": ""

          }

        },

        {

rootdir/init.rc

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