Skip to contentSkip to conversation

perf: Optimize perf_disable

tip:perf/urgent tip-bot for Peter Zijlstra 1 participant 1 message Mar 10, 2010

lore
Share & tools
lore
#0 lore raw
Commit-ID:  32975a4f114be52286f9a5bf6c230dbb8c0e1903
Gitweb:     http://git.kernel.org/tip/32975a4f114be52286f9a5bf6c230dbb8c0e1903
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Sat, 6 Mar 2010 19:49:19 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 10 Mar 2010 13:22:25 +0100

perf: Optimize perf_disable

Currently we always call hw_perf_disable(), even if its already disabled, this seems superflous, esp. since it cannot be made NMI safe (see further patches).

LKML-Reference: <new-submission>

---
 kernel/perf_event.c |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)
kernel/perf_event.c +3 -13
index 73329de..d810846 100644
@@ -93,25 +93,15 @@ void __weak perf_event_print_debug(void)	{ }
 
 static DEFINE_PER_CPU(int, perf_disable_count);
 
-void __perf_disable(void)
-{
-	__get_cpu_var(perf_disable_count)++;
-}
-
-bool __perf_enable(void)
-{
-	return !--__get_cpu_var(perf_disable_count);
-}
-
 void perf_disable(void)
 {
-	__perf_disable();
-	hw_perf_disable();
+	if (!__get_cpu_var(perf_disable_count)++)
+		hw_perf_disable();
 }
 
 void perf_enable(void)
 {
-	if (__perf_enable())
+	if (!--__get_cpu_var(perf_disable_count))
 		hw_perf_enable();
 }