diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-03-02 12:35:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-02 15:06:46 +0100 |
| commit | 320ebf09cbb6d01954c9a060266aa8e0d27f4638 (patch) | |
| tree | 0069898e64171dd89834327b0180c6d90860b46a /arch/x86 | |
| parent | bb1165d6882f423f90fc7007a88c6c993b7c2ac4 (diff) | |
| download | linux-3.10-320ebf09cbb6d01954c9a060266aa8e0d27f4638.tar.gz linux-3.10-320ebf09cbb6d01954c9a060266aa8e0d27f4638.tar.bz2 linux-3.10-320ebf09cbb6d01954c9a060266aa8e0d27f4638.zip | |
perf, x86: Restrict the ANY flag
The ANY flag can show SMT data of another task (like 'top'),
so we want to disable it when system-wide profiling is
disabled.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 6531b4bdb22..aab2e1ce9de 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -503,6 +503,9 @@ static int __hw_perf_event_init(struct perf_event *event) */ if (attr->type == PERF_TYPE_RAW) { hwc->config |= x86_pmu.raw_event(attr->config); + if ((hwc->config & ARCH_PERFMON_EVENTSEL_ANY) && + perf_paranoid_cpu() && !capable(CAP_SYS_ADMIN)) + return -EACCES; return 0; } |