From c638569c2ebdc36f93a05190cd52dc08f4321d1b Mon Sep 17 00:00:00 2001 From: Robert Benea Date: Wed, 31 May 2017 16:07:53 -0700 Subject: [PATCH] cgroups used by init must be mounted before any services start init uses /acct and optionally /dev/memcg for tracking services and therefore these must be started before any services start. Test: check that cgroups are mounted appropriately. Change-Id: Ice095287963181fe687dbe6b7d291076e674d1cc --- rootdir/init.rc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 8aecca1a6..94f64e0b6 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -27,6 +27,16 @@ on early-init # Set the security context of /postinstall if present. restorecon /postinstall + # Mount cgroup mount point for cpu accounting + mount cgroup none /acct cpuacct + mkdir /acct/uid + + # root memory control cgroup, used by lmkd + mkdir /dev/memcg 0700 root system + mount cgroup none /dev/memcg memory + # app mem cgroups, used by activity manager, lmkd and zygote + mkdir /dev/memcg/apps/ 0755 system system + start ueventd on init @@ -43,10 +53,6 @@ on init # Link /vendor to /system/vendor for devices without a vendor partition. symlink /system/vendor /vendor - # Mount cgroup mount point for cpu accounting - mount cgroup none /acct cpuacct - mkdir /acct/uid - # Create energy-aware scheduler tuning nodes mkdir /dev/stune mount cgroup none /dev/stune schedtune @@ -99,12 +105,6 @@ on init symlink /storage/self/primary /mnt/sdcard symlink /mnt/user/0/primary /mnt/runtime/default/self/primary - # root memory control cgroup, used by lmkd - mkdir /dev/memcg 0700 root system - mount cgroup none /dev/memcg memory - # app mem cgroups, used by activity manager, lmkd and zygote - mkdir /dev/memcg/apps/ 0755 system system - write /proc/sys/kernel/panic_on_oops 1 write /proc/sys/kernel/hung_task_timeout_secs 0 write /proc/cpu/alignment 4