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

libprocessgroup/profiles/cgroups.json

@@ -1,12 +1,5 @@
 {
   "Cgroups": [
-    {
-      "Controller": "blkio",
-      "Path": "/dev/blkio",
-      "Mode": "0775",
-      "UID": "system",
-      "GID": "system"
-    },
     {
       "Controller": "cpu",
       "Path": "/dev/cpuctl",
@@ -39,6 +32,12 @@
       {
         "Controller": "freezer",
         "Path": "."
+      },
+      {
+        "Controller": "io",
+        "Path": ".",
+        "NeedsActivation": true,
+        "Optional": true
       }
     ]
   }

libprocessgroup/profiles/task_profiles.json

@@ -442,8 +442,7 @@
           "Name": "JoinCgroup",
           "Params":
           {
-            "Controller": "blkio",
-            "Path": "background"
+            "Controller": "io"
           }
         }
       ]
@@ -455,8 +454,7 @@
           "Name": "JoinCgroup",
           "Params":
           {
-            "Controller": "blkio",
-            "Path": ""
+            "Controller": "io"
           }
         }
       ]
@@ -468,8 +466,7 @@
           "Name": "JoinCgroup",
           "Params":
           {
-            "Controller": "blkio",
-            "Path": ""
+            "Controller": "io"
           }
         }
       ]
@@ -481,8 +478,7 @@
           "Name": "JoinCgroup",
           "Params":
           {
-            "Controller": "blkio",
-            "Path": ""
+            "Controller": "io"
           }
         }
       ]

rootdir/init.rc

@@ -219,26 +219,6 @@ 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