summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-06-01 23:29:12 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-06-01 23:29:14 +0000
commit668878b3b73878edb9bcf960bd44cc07ec136cb0 (patch)
treea75ee11953caa54ae80a8fd4b94db9e6c7b819b3
parentf4f68176b3127d3b71a66ec63197849e50de3e5d (diff)
parent1137a8c357b1e5eabca80f98c3f34f7907794ee0 (diff)
downloadextras-668878b3b73878edb9bcf960bd44cc07ec136cb0.tar.gz
Merge "simpleperf: write -1 to perf_event_paranoid when running as root."
-rw-r--r--simpleperf/environment.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/simpleperf/environment.cpp b/simpleperf/environment.cpp
index d0cb8351..7fff85f1 100644
--- a/simpleperf/environment.cpp
+++ b/simpleperf/environment.cpp
@@ -361,8 +361,11 @@ static const char* GetLimitLevelDescription(int limit_level) {
}
bool CheckPerfEventLimit() {
- // root is not limited by /proc/sys/kernel/perf_event_paranoid.
- if (IsRoot()) {
+ // Root is not limited by /proc/sys/kernel/perf_event_paranoid. However, the monitored threads
+ // may create child processes not running as root. To make sure the child processes have
+ // enough permission to create inherited tracepoint events, write -1 to perf_event_paranoid.
+ // See http://b/62230699.
+ if (IsRoot() && android::base::WriteStringToFile("-1", "/proc/sys/kernel/perf_event_paranoid")) {
return true;
}
int limit_level;