From 57a0af93133ad0d190a79372b702653f96b99fe8 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Fri, 9 May 2014 17:44:18 -0700 Subject: [PATCH] init: logd: Allow Developer settings to adjust logd size - AID_SYSTEM can set persist.logd.size - AID_SYSTEM can issue command to /dev/socket/logd to change the runtime global log sizes. - Add support for ro.logd.size.* as populated by BoardConfig.mk - Limit size to maximum ~3% of physical memory. Bug: 14563261 Bug: 14627052 Change-Id: I606420db2e9d9d032296e71149e4a5b20cbd1137 --- init/property_service.c | 1 + logd/LogBuffer.cpp | 71 +++++++++++++++++++++++++++++++++++------ logd/LogCommand.cpp | 2 +- 3 files changed, 64 insertions(+), 10 deletions(-) diff --git a/init/property_service.c b/init/property_service.c index 7e8d79a07..4bcf88376 100644 --- a/init/property_service.c +++ b/init/property_service.c @@ -90,6 +90,7 @@ struct { { "log.", AID_SHELL, 0 }, { "service.adb.root", AID_SHELL, 0 }, { "service.adb.tcp.port", AID_SHELL, 0 }, + { "persist.logd.size",AID_SYSTEM, 0 }, { "persist.sys.", AID_SYSTEM, 0 }, { "persist.service.", AID_SYSTEM, 0 }, { "persist.security.", AID_SYSTEM, 0 }, diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp index dc9d47ee6..ae167aa95 100644 --- a/logd/LogBuffer.cpp +++ b/logd/LogBuffer.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -32,6 +33,34 @@ // Default #define LOG_BUFFER_SIZE (256 * 1024) // Tuned on a per-platform basis here? #define log_buffer_size(id) mMaxSize[id] +#define LOG_BUFFER_MIN_SIZE (64 * 1024UL) +#define LOG_BUFFER_MAX_SIZE (256 * 1024 * 1024UL) + +static bool valid_size(unsigned long value) { + if ((value < LOG_BUFFER_MIN_SIZE) || (LOG_BUFFER_MAX_SIZE < value)) { + return false; + } + + long pages = sysconf(_SC_PHYS_PAGES); + if (pages < 1) { + return true; + } + + long pagesize = sysconf(_SC_PAGESIZE); + if (pagesize <= 1) { + pagesize = PAGE_SIZE; + } + + // maximum memory impact a somewhat arbitrary ~3% + pages = (pages + 31) / 32; + unsigned long maximum = pages * pagesize; + + if ((maximum < LOG_BUFFER_MIN_SIZE) || (LOG_BUFFER_MAX_SIZE < maximum)) { + return true; + } + + return value <= maximum; +} static unsigned long property_get_size(const char *key) { char property[PROPERTY_VALUE_MAX]; @@ -56,6 +85,10 @@ static unsigned long property_get_size(const char *key) { value = 0; } + if (!valid_size(value)) { + value = 0; + } + return value; } @@ -64,18 +97,38 @@ LogBuffer::LogBuffer(LastLogTimes *times) pthread_mutex_init(&mLogElementsLock, NULL); dgram_qlen_statistics = false; - static const char global_default[] = "persist.logd.size"; - unsigned long default_size = property_get_size(global_default); + static const char global_tuneable[] = "persist.logd.size"; // Settings App + static const char global_default[] = "ro.logd.size"; // BoardConfig.mk + + unsigned long default_size = property_get_size(global_tuneable); + if (!default_size) { + default_size = property_get_size(global_default); + } log_id_for_each(i) { - setSize(i, LOG_BUFFER_SIZE); - setSize(i, default_size); - char key[PROP_NAME_MAX]; - snprintf(key, sizeof(key), "%s.%s", - global_default, android_log_id_to_name(i)); - setSize(i, property_get_size(key)); + snprintf(key, sizeof(key), "%s.%s", + global_tuneable, android_log_id_to_name(i)); + unsigned long property_size = property_get_size(key); + + if (!property_size) { + snprintf(key, sizeof(key), "%s.%s", + global_default, android_log_id_to_name(i)); + property_size = property_get_size(key); + } + + if (!property_size) { + property_size = default_size; + } + + if (!property_size) { + property_size = LOG_BUFFER_SIZE; + } + + if (setSize(i, property_size)) { + setSize(i, LOG_BUFFER_MIN_SIZE); + } } } @@ -339,7 +392,7 @@ unsigned long LogBuffer::getSizeUsed(log_id_t id) { // set the total space allocated to "id" int LogBuffer::setSize(log_id_t id, unsigned long size) { // Reasonable limits ... - if ((size < (64 * 1024)) || ((256 * 1024 * 1024) < size)) { + if (!valid_size(size)) { return -1; } pthread_mutex_lock(&mLogElementsLock); diff --git a/logd/LogCommand.cpp b/logd/LogCommand.cpp index 0873e6383..e4c138eab 100644 --- a/logd/LogCommand.cpp +++ b/logd/LogCommand.cpp @@ -64,7 +64,7 @@ bool clientHasLogCredentials(SocketClient * cli) { } gid_t gid = cli->getGid(); - if ((gid == AID_ROOT) || (gid == AID_LOG)) { + if ((gid == AID_ROOT) || (gid == AID_SYSTEM) || (gid == AID_LOG)) { return true; }