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

Commit 21b4c162 authored by Bart Van Assche's avatar Bart Van Assche Committed by Automerger Merge Worker
Browse files

Merge "Migrate the blkio controller to the v2 cgroup hierarchy" into main am:... 

Merge "Migrate the blkio controller to the v2 cgroup hierarchy" into main am: 6ebc14d9 am: cd6c434d am: 3e864adb

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



Change-Id: I0eaf1a353a54f58417e113c2ac5794c4fbfb0f2e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc826e0e 3e864adb

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

+103 −12
Original line number Original line Diff line number Diff line
@@ -76,6 +76,21 @@ 
      "Name": "FreezerState",

      "Name": "FreezerState",

      "Controller": "freezer",

      "Controller": "freezer",

      "File": "cgroup.freeze"

      "File": "cgroup.freeze"

    },

    {

      "Name": "BfqWeight",

      "Controller": "io",

      "File": "io.bfq.weight"

    },

    {

      "Name": "CfqGroupIdle",

      "Controller": "io",

      "File": "io.group_idle"

    },

    {

      "Name": "CfqWeight",

      "Controller": "io",

      "File": "io.weight"

    }

    }

  ],

  ],
@@ -439,11 +454,30 @@ 
      "Name": "LowIoPriority",

      "Name": "LowIoPriority",

      "Actions": [

      "Actions": [

        {

        {

          "Name": "JoinCgroup",

          "Name": "SetAttribute",

          "Params":

          "Params":

          {

          {

            "Controller": "blkio",

            "Name": "BfqWeight",

            "Path": "background"

            "Value": "10",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "CfqGroupIdle",

            "Value": "0",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "CfqWeight",

            "Value": "200",

            "Optional": "true"

          }

          }

        }

        }

      ]

      ]
@@ -452,11 +486,30 @@ 
      "Name": "NormalIoPriority",

      "Name": "NormalIoPriority",

      "Actions": [

      "Actions": [

        {

        {

          "Name": "JoinCgroup",

          "Name": "SetAttribute",

          "Params":

          "Params":

          {

          {

            "Controller": "blkio",

            "Name": "BfqWeight",

            "Path": ""

            "Value": "100",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "CfqGroupIdle",

            "Value": "0",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "CfqWeight",

            "Value": "1000",

            "Optional": "true"

          }

          }

        }

        }

      ]

      ]
@@ -465,11 +518,30 @@ 
      "Name": "HighIoPriority",

      "Name": "HighIoPriority",

      "Actions": [

      "Actions": [

        {

        {

          "Name": "JoinCgroup",

          "Name": "SetAttribute",

          "Params":

          "Params":

          {

          {

            "Controller": "blkio",

            "Name": "BfqWeight",

            "Path": ""

            "Value": "100",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "CfqGroupIdle",

            "Value": "0",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "CfqWeight",

            "Value": "1000",

            "Optional": "true"

          }

          }

        }

        }

      ]

      ]
@@ -478,11 +550,30 @@ 
      "Name": "MaxIoPriority",

      "Name": "MaxIoPriority",

      "Actions": [

      "Actions": [

        {

        {

          "Name": "JoinCgroup",

          "Name": "SetAttribute",

          "Params":

          "Params":

          {

          {

            "Controller": "blkio",

            "Name": "BfqWeight",

            "Path": ""

            "Value": "100",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "CfqGroupIdle",

            "Value": "0",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "CfqWeight",

            "Value": "1000",

            "Optional": "true"

          }

          }

        }

        }

      ]

      ]

rootdir/init.rc

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