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

Commit 761db931 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "b314861914" into main 

* changes:
  Revert "Migrate the blkio controller to the v2 cgroup hierarchy"
  Revert "task_profiles.json: Set io.prio.class"
parents 6392be61 d0ce4ca3

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 −144
Original line number Diff line number Diff line
@@ -76,26 +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"

    },

    {

      "Name": "IoPrioClass",

      "Controller": "io",

      "File": "io.prio.class"

    }

  ],
@@ -459,39 +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",

          "Params":

          {

            "Name": "CfqWeight",

            "Value": "200",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Name": "JoinCgroup",

          "Params":

          {

            "Name": "IoPrioClass",

            "Value": "restrict-to-be",

            "Optional": "true"

            "Controller": "blkio",

            "Path": "background"

          }

        }

      ]
@@ -500,39 +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",

          "Params":

          {

            "Name": "CfqWeight",

            "Value": "1000",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Name": "JoinCgroup",

          "Params":

          {

            "Name": "IoPrioClass",

            "Value": "restrict-to-be",

            "Optional": "true"

            "Controller": "blkio",

            "Path": ""

          }

        }

      ]
@@ -541,39 +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",

          "Params":

          {

            "Name": "CfqWeight",

            "Value": "1000",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Name": "JoinCgroup",

          "Params":

          {

            "Name": "IoPrioClass",

            "Value": "promote-to-rt",

            "Optional": "true"

            "Controller": "blkio",

            "Path": ""

          }

        }

      ]
@@ -582,39 +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",

          "Params":

          {

            "Name": "CfqWeight",

            "Value": "1000",

            "Optional": "true"

          }

        },

        {

          "Name": "SetAttribute",

          "Name": "JoinCgroup",

          "Params":

          {

            "Name": "IoPrioClass",

            "Value": "promote-to-rt",

            "Optional": "true"

            "Controller": "blkio",

            "Path": ""

          }

        }

      ]

rootdir/init.rc

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