From ba8a47531c5ebc5e1322088354d2114f6892f3fd Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Mon, 26 Oct 2015 16:22:11 -0700 Subject: [PATCH] Actively mangage EAS schedtune nodes Move foreground tasks to /sys/fs/cgroup/stune/boost/tasks (boosted weight in EAS scheduler). Move background tasks to /sys/fs/cgroup/stune/tasks (default weight). For services started with init, set "foreground" services to boosted. Change-Id: I0e489fad9510727c13e6754dabaf311c2391f395 --- libcutils/Android.mk | 6 ++++++ libcutils/sched_policy.c | 18 +++++++++++++++++- rootdir/init.rc | 14 ++++++++++++++ rootdir/init.zygote32.rc | 2 +- rootdir/init.zygote32_64.rc | 4 ++-- rootdir/init.zygote64.rc | 2 +- rootdir/init.zygote64_32.rc | 4 ++-- 7 files changed, 43 insertions(+), 7 deletions(-) diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 3ca544f04..0f79145b6 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -115,6 +115,9 @@ LOCAL_STATIC_LIBRARIES := liblog ifneq ($(ENABLE_CPUSETS),) LOCAL_CFLAGS += -DUSE_CPUSETS endif +ifneq ($(ENABLE_SCHEDBOOST),) +LOCAL_CFLAGS += -DUSE_SCHEDBOOST +endif LOCAL_CFLAGS += -Werror -Wall -Wextra -std=gnu90 LOCAL_CLANG := true LOCAL_SANITIZE := integer @@ -129,6 +132,9 @@ LOCAL_SHARED_LIBRARIES := liblog ifneq ($(ENABLE_CPUSETS),) LOCAL_CFLAGS += -DUSE_CPUSETS endif +ifneq ($(ENABLE_SCHEDBOOST),) +LOCAL_CFLAGS += -DUSE_SCHEDBOOST +endif LOCAL_CFLAGS += -Werror -Wall -Wextra LOCAL_C_INCLUDES := $(libcutils_c_includes) LOCAL_CLANG := true diff --git a/libcutils/sched_policy.c b/libcutils/sched_policy.c index 298e3dac7..6bba3a7b1 100644 --- a/libcutils/sched_policy.c +++ b/libcutils/sched_policy.c @@ -64,6 +64,8 @@ static int fg_cgroup_fd = -1; // File descriptors open to /dev/cpuset/../tasks, setup by initialize, or -1 on error static int bg_cpuset_fd = -1; static int fg_cpuset_fd = -1; +static int bg_schedboost_fd = -1; +static int fg_schedboost_fd = -1; #endif /* Add tid to the scheduling group defined by the policy */ @@ -128,6 +130,12 @@ static void __initialize(void) { fg_cpuset_fd = open(filename, O_WRONLY | O_CLOEXEC); filename = "/dev/cpuset/background/tasks"; bg_cpuset_fd = open(filename, O_WRONLY | O_CLOEXEC); +#ifdef USE_SCHEDBOOST + filename = "/sys/fs/cgroup/stune/foreground/tasks"; + fg_schedboost_fd = open(filename, O_WRONLY | O_CLOEXEC); + filename = "/sys/fs/cgroup/stune/tasks"; + bg_schedboost_fd = open(filename, O_WRONLY | O_CLOEXEC); +#endif } #endif @@ -253,17 +261,20 @@ int set_cpuset_policy(int tid, SchedPolicy policy) pthread_once(&the_once, __initialize); int fd; + int boost_fd; switch (policy) { case SP_BACKGROUND: fd = bg_cpuset_fd; + boost_fd = bg_schedboost_fd; break; case SP_FOREGROUND: case SP_AUDIO_APP: case SP_AUDIO_SYS: fd = fg_cpuset_fd; + boost_fd = fg_schedboost_fd; break; default: - fd = -1; + boost_fd = fd = -1; break; } @@ -272,6 +283,11 @@ int set_cpuset_policy(int tid, SchedPolicy policy) return -errno; } + if (boost_fd > 0 && add_tid_to_cgroup(tid, boost_fd) != 0) { + if (errno != ESRCH && errno != ENOENT) + return -errno; + } + return 0; #endif } diff --git a/rootdir/init.rc b/rootdir/init.rc index ddfe1684c..322cf4114 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -52,6 +52,17 @@ on init chown root system /sys/fs/cgroup/memory/sw/tasks chmod 0660 /sys/fs/cgroup/memory/sw/tasks + # Create energy-aware scheduler tuning nodes + mkdir /sys/fs/cgroup/stune + mount cgroup none /sys/fs/cgroup/stune schedtune + mkdir /sys/fs/cgroup/stune/foreground + chown system system /sys/fs/cgroup/stune + chown system system /sys/fs/cgroup/stune/foreground + chown system system /sys/fs/cgroup/stune/tasks + chown system system /sys/fs/cgroup/stune/foreground/tasks + chmod 0664 /sys/fs/cgroup/stune/tasks + chmod 0664 /sys/fs/cgroup/stune/foreground/tasks + # Mount staging areas for devices managed by vold # See storage config details at http://source.android.com/tech/storage/ mount tmpfs tmpfs /mnt mode=0755,uid=0,gid=1000 @@ -163,13 +174,16 @@ on init chown system system /dev/cpuset/foreground chown system system /dev/cpuset/foreground/boost chown system system /dev/cpuset/background + chown system system /dev/cpuset/system-background chown system system /dev/cpuset/tasks chown system system /dev/cpuset/foreground/tasks chown system system /dev/cpuset/foreground/boost/tasks chown system system /dev/cpuset/background/tasks + chown system system /dev/cpuset/system-background/tasks chmod 0664 /dev/cpuset/foreground/tasks chmod 0664 /dev/cpuset/foreground/boost/tasks chmod 0664 /dev/cpuset/background/tasks + chmod 0664 /dev/cpuset/system-background/tasks chmod 0664 /dev/cpuset/tasks diff --git a/rootdir/init.zygote32.rc b/rootdir/init.zygote32.rc index ff25ac227..0ca38b9cd 100644 --- a/rootdir/init.zygote32.rc +++ b/rootdir/init.zygote32.rc @@ -5,4 +5,4 @@ service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-sys onrestart write /sys/power/state on onrestart restart media onrestart restart netd - writepid /dev/cpuset/foreground/tasks + writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks diff --git a/rootdir/init.zygote32_64.rc b/rootdir/init.zygote32_64.rc index 29bb1cf2e..1646c0f7e 100644 --- a/rootdir/init.zygote32_64.rc +++ b/rootdir/init.zygote32_64.rc @@ -5,10 +5,10 @@ service zygote /system/bin/app_process32 -Xzygote /system/bin --zygote --start-s onrestart write /sys/power/state on onrestart restart media onrestart restart netd - writepid /dev/cpuset/foreground/tasks + writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks service zygote_secondary /system/bin/app_process64 -Xzygote /system/bin --zygote --socket-name=zygote_secondary class main socket zygote_secondary stream 660 root system onrestart restart zygote - writepid /dev/cpuset/foreground/tasks \ No newline at end of file + writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks diff --git a/rootdir/init.zygote64.rc b/rootdir/init.zygote64.rc index 5497524e4..b477c8ef2 100644 --- a/rootdir/init.zygote64.rc +++ b/rootdir/init.zygote64.rc @@ -5,4 +5,4 @@ service zygote /system/bin/app_process64 -Xzygote /system/bin --zygote --start-s onrestart write /sys/power/state on onrestart restart media onrestart restart netd - writepid /dev/cpuset/foreground/tasks + writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks diff --git a/rootdir/init.zygote64_32.rc b/rootdir/init.zygote64_32.rc index 8ed5e9ee8..633a98108 100644 --- a/rootdir/init.zygote64_32.rc +++ b/rootdir/init.zygote64_32.rc @@ -5,10 +5,10 @@ service zygote /system/bin/app_process64 -Xzygote /system/bin --zygote --start-s onrestart write /sys/power/state on onrestart restart media onrestart restart netd - writepid /dev/cpuset/foreground/tasks + writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks service zygote_secondary /system/bin/app_process32 -Xzygote /system/bin --zygote --socket-name=zygote_secondary class main socket zygote_secondary stream 660 root system onrestart restart zygote - writepid /dev/cpuset/foreground/tasks \ No newline at end of file + writepid /dev/cpuset/foreground/tasks /sys/fs/cgroup/stune/foreground/tasks