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

Commit 47c0fd9a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reapply "Migrate the blkio controller to the v2 cgroup hierarchy"" into main am: 848b36c2 

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



Change-Id: Icc72412960574af0223b13c71a261bedb31ca4a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64798dae 848b36c2

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