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

Commit c7a6fe68 authored by Jooyung Han's avatar Jooyung Han
Browse files

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

Revert submission 2218645-blkio-cgroup-v2

Reason for revert: 260143932, 264620181

Reverted changes: /q/submissionid:2218645-blkio-cgroup-v2

Change-Id: I8bf1592cd5f7234f28094fe80341c37d42fa609b
parent 5400ae24

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