Skip to contentSkip to conversation

perfcounters/powerpc: fix oops with multiple counters in a group

PATCH In review Paul Mackerras 2 participants 2 messages Mar 6, 2009 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 perfcounters/powerpc: fix oops with multiple counters in a group

Impact: fix oops-causing bug

This fixes a bug in the powerpc hw_perf_counter_init where the code didn't initialize ctrs[n] before passing the ctrs array to check_excludes, leading to possible oopses and other incorrect behaviour. This fixes it by initializing ctrs[n] correctly.

---
Ingo, please pull this series of 3 patches from my perfcounters.git master branch at:

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perfcounters.git master

 arch/powerpc/kernel/perf_counter.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/powerpc/kernel/perf_counter.c +1 -0
index 112332d..4fec112 100644
@@ -633,6 +633,7 @@ hw_perf_counter_init(struct perf_counter *counter)
 			return NULL;
 	}
 	events[n] = ev;
+	ctrs[n] = counter;
 	if (check_excludes(ctrs, n, 1))
 		return NULL;
 	if (power_check_constraints(events, n + 1))
Signature · 1 line
1.5.6.3
#1 lore raw
Quoted 4 lines · Paul Mackerras

Ingo, please pull this series of 3 patches from my perfcounters.git master branch at:

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perfcounters.git master

Pulled into tip:perfcounters/core, thanks Paul!

Note, Mike Galbraith updated both perfstat.c and kerneltop.c to the new ABI, they can be picked up from:

http://redhat.com/~mingo/perfcounters/perfstat.c
http://redhat.com/~mingo/perfcounters/kerneltop.c

(I also extended kerneltop.c with the -r0x000 type of event IDs to pass in raw event IDs.)

Ingo