From 350046ef888898374a23a9c3a6a72df1cb0d8d0b Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Thu, 3 May 2012 14:16:54 -0700 Subject: [PATCH 1/3] change /fstab.* perms back to 0644, to unbreak incremental OTAs Change-Id: I21a991148fd1de604ecf87abad0b49970d2abe84 --- include/private/android_filesystem_config.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 68928ebe0..5b556d6ed 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -138,7 +138,7 @@ static const struct android_id_info android_ids[] = { #define android_id_count \ (sizeof(android_ids) / sizeof(android_ids[0])) - + struct fs_path_config { unsigned mode; unsigned uid; @@ -225,7 +225,7 @@ static struct fs_path_config android_files[] = { { 00750, AID_ROOT, AID_SHELL, "init*" }, { 00750, AID_ROOT, AID_SHELL, "charger*" }, { 00750, AID_ROOT, AID_SHELL, "sbin/fs_mgr" }, - { 00640, AID_ROOT, AID_SHELL, "fstab.*" }, + { 00644, AID_ROOT, AID_SHELL, "fstab.*" }, { 00644, AID_ROOT, AID_ROOT, 0 }, }; @@ -234,7 +234,7 @@ static inline void fs_config(const char *path, int dir, { struct fs_path_config *pc; int plen; - + pc = dir ? android_dirs : android_files; plen = strlen(path); for(; pc->prefix; pc++){ @@ -254,9 +254,9 @@ static inline void fs_config(const char *path, int dir, *uid = pc->uid; *gid = pc->gid; *mode = (*mode & (~07777)) | pc->mode; - + #if 0 - fprintf(stderr,"< '%s' '%s' %d %d %o >\n", + fprintf(stderr,"< '%s' '%s' %d %d %o >\n", path, pc->prefix ? pc->prefix : "", *uid, *gid, *mode); #endif } From 5189c300bd3fceee8c753b2b1e6c69ae5ed8b8d0 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 10 May 2012 13:55:25 -0700 Subject: [PATCH 2/3] Increase rt_runtime_us to 1000 for foreground and bg_non_interactive rt_runtime_us=0 can cause deadlocks if a SCHED_FIFO/SCHED_RR thread is moved into the wrong cgroup. Change-Id: I4633392fb529039dff6ba5d3a6b672e0de9fc2d9 --- rootdir/init.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 698415bdd..a97b923b3 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -97,7 +97,7 @@ loglevel 3 chown system system /dev/cpuctl/foreground/tasks chmod 0666 /dev/cpuctl/foreground/tasks write /dev/cpuctl/foreground/cpu.shares 1024 - write /dev/cpuctl/foreground/cpu.rt_runtime_us 0 + write /dev/cpuctl/foreground/cpu.rt_runtime_us 1000 write /dev/cpuctl/foreground/cpu.rt_period_us 1000000 mkdir /dev/cpuctl/bg_non_interactive @@ -105,7 +105,7 @@ loglevel 3 chmod 0666 /dev/cpuctl/bg_non_interactive/tasks # 5.0 % write /dev/cpuctl/bg_non_interactive/cpu.shares 52 - write /dev/cpuctl/bg_non_interactive/cpu.rt_runtime_us 0 + write /dev/cpuctl/bg_non_interactive/cpu.rt_runtime_us 1000 write /dev/cpuctl/bg_non_interactive/cpu.rt_period_us 1000000 mkdir /dev/cpuctl/audio_app From 90dbf7a87ebe70590fe6ffa37610cede23402fa4 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 16 May 2012 13:49:30 -0700 Subject: [PATCH 3/3] Increase cpu.rt_runtime_us to 10% for fg and bg groups GPS on yakju puts SCHED_RR threads in the fg and bg groups, and is unhappy with 0.1% limits. Increase the limits to 10%. Change-Id: I971c9b0a815890d41694b965fdd2b023937a4411 --- rootdir/init.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 05b762129..aa1bb92ad 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -97,7 +97,7 @@ loglevel 3 chown system system /dev/cpuctl/foreground/tasks chmod 0666 /dev/cpuctl/foreground/tasks write /dev/cpuctl/foreground/cpu.shares 1024 - write /dev/cpuctl/foreground/cpu.rt_runtime_us 1000 + write /dev/cpuctl/foreground/cpu.rt_runtime_us 100000 write /dev/cpuctl/foreground/cpu.rt_period_us 1000000 mkdir /dev/cpuctl/bg_non_interactive @@ -105,7 +105,7 @@ loglevel 3 chmod 0666 /dev/cpuctl/bg_non_interactive/tasks # 5.0 % write /dev/cpuctl/bg_non_interactive/cpu.shares 52 - write /dev/cpuctl/bg_non_interactive/cpu.rt_runtime_us 1000 + write /dev/cpuctl/bg_non_interactive/cpu.rt_runtime_us 100000 write /dev/cpuctl/bg_non_interactive/cpu.rt_period_us 1000000 mkdir /dev/cpuctl/audio_app