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

Commit 0c6cb94f authored by Bart Van Assche's avatar Bart Van Assche Committed by Automerger Merge Worker
Browse files

[DO NOT MERGE] Migrate the blkio controller to the v2 cgroup hierarchy am:... 

[DO NOT MERGE] Migrate the blkio controller to the v2 cgroup hierarchy am: eef0f563 am: c50f4d54

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



Change-Id: Id72cb80549c91a0b7d2b7ca9bebb04675522b9d6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 590d67c5 c50f4d54

libprocessgroup/profiles/cgroups.json

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

      {

        "Controller": "freezer",

        "Controller": "freezer",

        "Path": "."

        "Path": "."

      },

      {

        "Controller": "io",

        "Path": ".",

        "NeedsActivation": true,

        "Optional": true

      }

      }

    ]

    ]

  }

  }

libprocessgroup/profiles/task_profiles.json

+0 −32
Original line number Original line Diff line number Diff line
@@ -456,14 +456,6 @@ 
    {

    {

      "Name": "LowIoPriority",

      "Name": "LowIoPriority",

      "Actions": [

      "Actions": [

        {

          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": "background"

          }

        },

        {

        {

          "Name": "SetAttribute",

          "Name": "SetAttribute",

          "Params":

          "Params":
@@ -496,14 +488,6 @@ 
    {

    {

      "Name": "NormalIoPriority",

      "Name": "NormalIoPriority",

      "Actions": [

      "Actions": [

        {

          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": ""

          }

        },

        {

        {

          "Name": "SetAttribute",

          "Name": "SetAttribute",

          "Params":

          "Params":
@@ -536,14 +520,6 @@ 
    {

    {

      "Name": "HighIoPriority",

      "Name": "HighIoPriority",

      "Actions": [

      "Actions": [

        {

          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": ""

          }

        },

        {

        {

          "Name": "SetAttribute",

          "Name": "SetAttribute",

          "Params":

          "Params":
@@ -576,14 +552,6 @@ 
    {

    {

      "Name": "MaxIoPriority",

      "Name": "MaxIoPriority",

      "Actions": [

      "Actions": [

        {

          "Name": "JoinCgroup",

          "Params":

          {

            "Controller": "blkio",

            "Path": ""

          }

        },

        {

        {

          "Name": "SetAttribute",

          "Name": "SetAttribute",

          "Params":

          "Params":

rootdir/init.rc

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