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

Commit 9b0625c9 authored by Randall Huang's avatar Randall Huang Committed by Android Build Coastguard Worker
Browse files

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

This reverts commit f99ca8ae.

Reason for revert: b/2768906
(cherry picked from https://android-review.googlesource.com/q/commit:d0ce4ca33cd5b1a48a3ef7f8b6da39e5498421c5)
Merged-In: I9ce259a2c96e9f8dd8c7598204c35922b56f7a0a
Change-Id: I9ce259a2c96e9f8dd8c7598204c35922b56f7a0a
parent 167eeb98

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

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

      "Controller": "freezer",

      "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"

    }

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

      "Actions": [

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "BfqWeight",

            "Value": "10",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "CfqGroupIdle",

            "Value": "0",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Name": "JoinCgroup",

          "Params":

          {

            "Name": "CfqWeight",

            "Value": "200",

            "Optional": "true"

            "Controller": "blkio",

            "Path": "background"

          }

        }

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

      "Actions": [

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "BfqWeight",

            "Value": "100",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "CfqGroupIdle",

            "Value": "0",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Name": "JoinCgroup",

          "Params":

          {

            "Name": "CfqWeight",

            "Value": "1000",

            "Optional": "true"

            "Controller": "blkio",

            "Path": ""

          }

        }

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

      "Actions": [

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "BfqWeight",

            "Value": "100",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "CfqGroupIdle",

            "Value": "0",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Name": "JoinCgroup",

          "Params":

          {

            "Name": "CfqWeight",

            "Value": "1000",

            "Optional": "true"

            "Controller": "blkio",

            "Path": ""

          }

        }

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

      "Actions": [

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "BfqWeight",

            "Value": "100",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Params":

          {

            "Name": "CfqGroupIdle",

            "Value": "0",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Name": "JoinCgroup",

          "Params":

          {

            "Name": "CfqWeight",

            "Value": "1000",

            "Optional": "true"

            "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