perf_counter: x86: Allow unpriviliged use of NMIs
Commit-ID: a026dfecc035f213c1cfa0bf6407ce3155f6a9df Gitweb: http://git.kernel.org/tip/a026dfecc035f213c1cfa0bf6407ce3155f6a9df Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 13 May 2009 10:02:57 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 15 May 2009 09:46:57 +0200
perf_counter: x86: Allow unpriviliged use of NMIs
Apply sysctl_perf_counter_priv to NMIs. Also, fail the counter creation instead of silently down-grading to regular interrupts.
[ Impact: allow wider perf-counter usage ]
Signed-off-by Peter Zijlstra <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Corey Ashford <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/cpu/perf_counter.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +4 -1
@@ -280,8 +280,11 @@ static int __hw_perf_counter_init(struct perf_counter *counter)* If privileged enough, allow NMI events: */ hwc->nmi =0 ; -if (capable (CAP_SYS_ADMIN ) && hw_event->nmi) +if (hw_event->nmi) { +if (sysctl_perf_counter_priv && !capable (CAP_SYS_ADMIN )) +return -EACCES ; hwc->nmi =1 ; + } hwc->irq_period = hw_event->irq_period;if ((s64 )hwc->irq_period <=0 || hwc->irq_period > x86_pmu.max_period)