perf, x86: Restrict the ANY flag
Subsystems (2)
Commit-ID: 320ebf09cbb6d01954c9a060266aa8e0d27f4638 Gitweb: http://git.kernel.org/tip/320ebf09cbb6d01954c9a060266aa8e0d27f4638 Author: Peter Zijlstra <[email protected]> AuthorDate: Tue, 2 Mar 2010 12:35:37 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 2 Mar 2010 15:06:46 +0100
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 <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/cpu/perf_event.c | 3 +++ include/linux/perf_event.h | 15 +++++++++++++++ kernel/perf_event.c | 15 --------------- 3 files changed, 18 insertions(+), 15 deletions(-)
arch/x86/kernel/cpu/perf_event.c +3 -0
@@ -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 ; }
include/linux/perf_event.h +15 -0
@@ -857,6 +857,21 @@ extern int sysctl_perf_event_paranoid;extern int sysctl_perf_event_mlock;extern int sysctl_perf_event_sample_rate; +static inline bool perf_paranoid_tracepoint_raw (void ) +{ +return sysctl_perf_event_paranoid >-1 ; +} + +static inline bool perf_paranoid_cpu (void ) +{ +return sysctl_perf_event_paranoid >0 ; +} + +static inline bool perf_paranoid_kernel (void ) +{ +return sysctl_perf_event_paranoid >1 ; +} +extern void perf_event_init (void );extern void perf_tp_event (int event_id,u64 addr,u64 count,void *record,int entry_size);extern void perf_bp_event (struct perf_event *event,void *data);
kernel/perf_event.c +0 -15
@@ -56,21 +56,6 @@ static atomic_t nr_task_events __read_mostly;*/ int sysctl_perf_event_paranoid__read_mostly =1 ; -static inline bool perf_paranoid_tracepoint_raw (void ) -{ -return sysctl_perf_event_paranoid >-1 ; -} - -static inline bool perf_paranoid_cpu (void ) -{ -return sysctl_perf_event_paranoid >0 ; -} - -static inline bool perf_paranoid_kernel (void ) -{ -return sysctl_perf_event_paranoid >1 ; -} -int sysctl_perf_event_mlock__read_mostly =512 ;/* 'free' kb per user */ /*