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

Commit 2929e71d 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: ddfa08b9 

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



Change-Id: I6921de70695044f30a18f2bd035545b8eb15ef13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9239dab5 ddfa08b9

libprocessgroup/profiles/cgroups.json

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

      {

        "Controller": "freezer",

        "Controller": "freezer",

        "Path": "."

        "Path": "."

      },

      {

        "Controller": "io",

        "Path": ".",

        "NeedsActivation": true

      }

      }

    ]

    ]

  }

  }

libprocessgroup/profiles/task_profiles.json

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

          "Name": "JoinCgroup",

          "Params":

          "Params":

          {

          {

            "Controller": "io"

            "Controller": "blkio",

            "Path": "background"

          }

          }

        },

        },

        {

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

          "Name": "JoinCgroup",

          "Params":

          "Params":

          {

          {

            "Controller": "io"

            "Controller": "blkio",

            "Path": ""

          }

          }

        },

        },

        {

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

          "Name": "JoinCgroup",

          "Params":

          "Params":

          {

          {

            "Controller": "io"

            "Controller": "blkio",

            "Path": ""

          }

          }

        },

        },

        {

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

          "Name": "JoinCgroup",

          "Params":

          "Params":

          {

          {

            "Controller": "io"

            "Controller": "blkio",

            "Path": ""

          }

          }

        },

        },

        {

        {

rootdir/init.rc

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