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

Commit 8ebc8257 authored by Shin-Yu Wang's avatar Shin-Yu Wang Committed by Gerrit Code Review
Browse files

Merge "Revert "Reapply "Migrate the blkio controller to the v2 cgroup hierarchy""" into main

parents cb8ee758 3b16967f

libprocessgroup/profiles/cgroups.json

+7 −6
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,12 +39,6 @@ 
      {

        "Controller": "freezer",

        "Path": "."

      },

      {

        "Controller": "io",

        "Path": ".",

        "NeedsActivation": true,

        "Optional": true

      }

    ]

  }

libprocessgroup/profiles/task_profiles.json

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

          "Params":

          {

            "Controller": "io"

            "Controller": "blkio",

            "Path": "background"

          }

        }

      ]
@@ -454,7 +455,8 @@ 
          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "io"

            "Controller": "blkio",

            "Path": ""

          }

        }

      ]
@@ -466,7 +468,8 @@ 
          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "io"

            "Controller": "blkio",

            "Path": ""

          }

        }

      ]
@@ -478,7 +481,8 @@ 
          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "io"

            "Controller": "blkio",

            "Path": ""

          }

        }

      ]

rootdir/init.rc

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