From 50fd822149d305b8fb53f2d9f650bb246acaf0ae Mon Sep 17 00:00:00 2001 From: "T.J. Mercier" Date: Fri, 4 Oct 2024 14:53:27 +0000 Subject: [PATCH] init: Remove schedtune support Schedtune was an out of tree cgroup controller present in Android kernels up to 4.19. It was replaced with uclamp and the cpu controller. Now that 4.19 is EOL and unsupported, and schedtune is not present in any supported Android kernels, remove the userspace support for schedtune. Bug: 362504801 Change-Id: Iab7b7295d1fb443209d5868ac5c65dca0aabfbab --- init/service_parser.cpp | 3 --- rootdir/init.rc | 49 ----------------------------------------- 2 files changed, 52 deletions(-) diff --git a/init/service_parser.cpp b/init/service_parser.cpp index e6f3af617..ec3b176d4 100644 --- a/init/service_parser.cpp +++ b/init/service_parser.cpp @@ -538,12 +538,9 @@ Result ServiceParser::ParseUser(std::vector&& args) { // when we migrate to cgroups v2 while these hardcoded paths stay the same. static std::optional ConvertTaskFileToProfile(const std::string& file) { static const std::map map = { - {"/dev/stune/top-app/tasks", "MaxPerformance"}, - {"/dev/stune/foreground/tasks", "HighPerformance"}, {"/dev/cpuset/camera-daemon/tasks", "CameraServiceCapacity"}, {"/dev/cpuset/foreground/tasks", "ProcessCapacityHigh"}, {"/dev/cpuset/system-background/tasks", "ServiceCapacityLow"}, - {"/dev/stune/nnapi-hal/tasks", "NNApiHALPerformance"}, {"/dev/blkio/background/tasks", "LowIoPriority"}, }; auto iter = map.find(file); diff --git a/rootdir/init.rc b/rootdir/init.rc index 1acd63774..c8b725d1e 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -112,37 +112,6 @@ on init # Create socket dir for ot-daemon mkdir /dev/socket/ot-daemon 0770 thread_network thread_network - # Create energy-aware scheduler tuning nodes - mkdir /dev/stune/foreground - mkdir /dev/stune/background - mkdir /dev/stune/top-app - mkdir /dev/stune/rt - chown system system /dev/stune - chown system system /dev/stune/foreground - chown system system /dev/stune/background - chown system system /dev/stune/top-app - chown system system /dev/stune/rt - chown system system /dev/stune/tasks - chown system system /dev/stune/foreground/tasks - chown system system /dev/stune/background/tasks - chown system system /dev/stune/top-app/tasks - chown system system /dev/stune/rt/tasks - chown system system /dev/stune/cgroup.procs - chown system system /dev/stune/foreground/cgroup.procs - chown system system /dev/stune/background/cgroup.procs - chown system system /dev/stune/top-app/cgroup.procs - chown system system /dev/stune/rt/cgroup.procs - chmod 0664 /dev/stune/tasks - chmod 0664 /dev/stune/foreground/tasks - chmod 0664 /dev/stune/background/tasks - chmod 0664 /dev/stune/top-app/tasks - chmod 0664 /dev/stune/rt/tasks - chmod 0664 /dev/stune/cgroup.procs - chmod 0664 /dev/stune/foreground/cgroup.procs - chmod 0664 /dev/stune/background/cgroup.procs - chmod 0664 /dev/stune/top-app/cgroup.procs - chmod 0664 /dev/stune/rt/cgroup.procs - # cpuctl hierarchy for devices using utilclamp mkdir /dev/cpuctl/foreground mkdir /dev/cpuctl/foreground_window @@ -216,24 +185,6 @@ on init chmod 0664 /dev/cpuctl/camera-daemon/tasks chmod 0664 /dev/cpuctl/camera-daemon/cgroup.procs - # Create an stune group for camera-specific processes - mkdir /dev/stune/camera-daemon - chown system system /dev/stune/camera-daemon - chown system system /dev/stune/camera-daemon/tasks - chown system system /dev/stune/camera-daemon/cgroup.procs - chmod 0664 /dev/stune/camera-daemon/tasks - chmod 0664 /dev/stune/camera-daemon/cgroup.procs - - # Create an stune group for NNAPI HAL processes - mkdir /dev/stune/nnapi-hal - chown system system /dev/stune/nnapi-hal - chown system system /dev/stune/nnapi-hal/tasks - chown system system /dev/stune/nnapi-hal/cgroup.procs - chmod 0664 /dev/stune/nnapi-hal/tasks - chmod 0664 /dev/stune/nnapi-hal/cgroup.procs - 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.