Skip to contentSkip to conversation

perf_event: e500 support

PATCH Applied Scott Wood 3 participants 3 messages Feb 26, 2010 – Mar 5, 2010

Subsystems (2)
lore
Share & tools
lore

Scott Wood

author
#0 lore raw

PATCH 2/2 perf_event: e500 support

This implements perf_event support for the Freescale embedded performance monitor, based on the existing perf_event.c that supports server/classic chips.

Some limitations:
- Performance monitor interrupts are regular EE interrupts, and thus you can't profile places with interrupts disabled. We may want to implement soft IRQ-disabling, with perfmon interrupts exempted and treated as NMIs.
- When trying to schedule multiple event groups at once, and using restricted events, situations could arise where scheduling fails even though it would be possible. Consider three groups, each with two events. One group has restricted events, the others don't. The two non-restricted groups are scheduled, then one is removed, which happens to occupy the two counters that can't do restricted events. The remaining non-restricted group will not be moved to the non-restricted-capable counters to make room if the restricted group tries to be scheduled.

---
Changes from previous version:
- Factored out callchain makefile patch
- Split up header files
- Renamed pmu struct
- Added threshold support

 arch/powerpc/include/asm/perf_event.h              |  133 +----
 arch/powerpc/include/asm/perf_event_fsl_emb.h      |   50 ++
 .../asm/{perf_event.h => perf_event_server.h}      |    4 +-
 arch/powerpc/include/asm/reg_fsl_emb.h             |    2 +-
 arch/powerpc/kernel/Makefile                       |    4 +
 arch/powerpc/kernel/cputable.c                     |    2 +-
 arch/powerpc/kernel/e500-pmu.c                     |  129 ++++
 arch/powerpc/kernel/perf_event_fsl_emb.c           |  654 ++++++++++++++++++++
 arch/powerpc/platforms/Kconfig.cputype             |   10 +
 9 files changed, 874 insertions(+), 114 deletions(-)
 rewrite arch/powerpc/include/asm/perf_event.h (92%)
 create mode 100644 arch/powerpc/include/asm/perf_event_fsl_emb.h
 rename arch/powerpc/include/asm/{perf_event.h => perf_event_server.h} (98%)
 create mode 100644 arch/powerpc/kernel/e500-pmu.c
 create mode 100644 arch/powerpc/kernel/perf_event_fsl_emb.c
arch/powerpc/include/asm/perf_event.h +23 -110
dissimilarity index 92%
index 3288ce3..e6d4ce6 100644
@@ -1,110 +1,23 @@
-/*
- * Performance event support - PowerPC-specific definitions.
- *
- * Copyright 2008-2009 Paul Mackerras, IBM Corporation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#include <linux/types.h>
-
-#include <asm/hw_irq.h>
-
-#define MAX_HWEVENTS		8
-#define MAX_EVENT_ALTERNATIVES	8
-#define MAX_LIMITED_HWCOUNTERS	2
-
-/*
- * This struct provides the constants and functions needed to
- * describe the PMU on a particular POWER-family CPU.
- */
-struct power_pmu {
-	const char	*name;
-	int		n_counter;
-	int		max_alternatives;
-	unsigned long	add_fields;
-	unsigned long	test_adder;
-	int		(*compute_mmcr)(u64 events[], int n_ev,
-				unsigned int hwc[], unsigned long mmcr[]);
-	int		(*get_constraint)(u64 event_id, unsigned long *mskp,
-				unsigned long *valp);
-	int		(*get_alternatives)(u64 event_id, unsigned int flags,
-				u64 alt[]);
-	void		(*disable_pmc)(unsigned int pmc, unsigned long mmcr[]);
-	int		(*limited_pmc_event)(u64 event_id);
-	u32		flags;
-	int		n_generic;
-	int		*generic_events;
-	int		(*cache_events)[PERF_COUNT_HW_CACHE_MAX]
-			       [PERF_COUNT_HW_CACHE_OP_MAX]
-			       [PERF_COUNT_HW_CACHE_RESULT_MAX];
-};
-
-/*
- * Values for power_pmu.flags
- */
-#define PPMU_LIMITED_PMC5_6	1	/* PMC5/6 have limited function */
-#define PPMU_ALT_SIPR		2	/* uses alternate posn for SIPR/HV */
-
-/*
- * Values for flags to get_alternatives()
- */
-#define PPMU_LIMITED_PMC_OK	1	/* can put this on a limited PMC */
-#define PPMU_LIMITED_PMC_REQD	2	/* have to put this on a limited PMC */
-#define PPMU_ONLY_COUNT_RUN	4	/* only counting in run state */
-
-extern int register_power_pmu(struct power_pmu *);
-
-struct pt_regs;
-extern unsigned long perf_misc_flags(struct pt_regs *regs);
-extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
-
-#define PERF_EVENT_INDEX_OFFSET	1
-
-/*
- * Only override the default definitions in include/linux/perf_event.h
- * if we have hardware PMU support.
- */
-#ifdef CONFIG_PPC_PERF_CTRS
-#define perf_misc_flags(regs)	perf_misc_flags(regs)
-#endif
-
-/*
- * The power_pmu.get_constraint function returns a 32/64-bit value and
- * a 32/64-bit mask that express the constraints between this event_id and
- * other events.
- *
- * The value and mask are divided up into (non-overlapping) bitfields
- * of three different types:
- *
- * Select field: this expresses the constraint that some set of bits
- * in MMCR* needs to be set to a specific value for this event_id.  For a
- * select field, the mask contains 1s in every bit of the field, and
- * the value contains a unique value for each possible setting of the
- * MMCR* bits.  The constraint checking code will ensure that two events
- * that set the same field in their masks have the same value in their
- * value dwords.
- *
- * Add field: this expresses the constraint that there can be at most
- * N events in a particular class.  A field of k bits can be used for
- * N <= 2^(k-1) - 1.  The mask has the most significant bit of the field
- * set (and the other bits 0), and the value has only the least significant
- * bit of the field set.  In addition, the 'add_fields' and 'test_adder'
- * in the struct power_pmu for this processor come into play.  The
- * add_fields value contains 1 in the LSB of the field, and the
- * test_adder contains 2^(k-1) - 1 - N in the field.
- *
- * NAND field: this expresses the constraint that you may not have events
- * in all of a set of classes.  (For example, on PPC970, you can't select
- * events from the FPU, ISU and IDU simultaneously, although any two are
- * possible.)  For N classes, the field is N+1 bits wide, and each class
- * is assigned one bit from the least-significant N bits.  The mask has
- * only the most-significant bit set, and the value has only the bit
- * for the event_id's class set.  The test_adder has the least significant
- * bit set in the field.
- *
- * If an event_id is not subject to the constraint expressed by a particular
- * field, then it will have 0 in both the mask and value for that field.
- */
+/*
+ * Performance event support - hardware-specific disambiguation
+ *
+ * For now this is a compile-time decision, but eventually it should be
+ * runtime.  This would allow multiplatform perf event support for e300 (fsl
+ * embedded perf counters) plus server/classic, and would accommodate
+ * devices other than the core which provide their own performance counters.
+ *
+ * Copyright 2010 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#ifdef CONFIG_PPC_PERF_CTRS
+#include <asm/perf_event_server.h>
+#endif
+
+#ifdef CONFIG_FSL_EMB_PERF_EVENT
+#include <asm/perf_event_fsl_emb.h>
+#endif
arch/powerpc/include/asm/perf_event_fsl_emb.h new file +50 -0

50 lines not on this page · raw message

arch/powerpc/include/asm/perf_event_server.h renamed from arch/powerpc/include/asm/perf_event.h +2 -2
similarity index 98%
rename from arch/powerpc/include/asm/perf_event.h
rename to arch/powerpc/include/asm/perf_event_server.h
index 3288ce3..8f1df12 100644
@@ -1,5 +1,5 @@
 /*
- * Performance event support - PowerPC-specific definitions.
+ * Performance event support - PowerPC classic/server specific definitions.
  *
  * Copyright 2008-2009 Paul Mackerras, IBM Corporation.
  *
@@ -8,8 +8,8 @@
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  */
-#include <linux/types.h>
 
+#include <linux/types.h>
 #include <asm/hw_irq.h>
 
 #define MAX_HWEVENTS		8
arch/powerpc/include/asm/reg_fsl_emb.h +1 -1
index 0de404d..77bb71c 100644
@@ -31,7 +31,7 @@
 #define PMLCA_FCM0	0x08000000	/* Freeze when PMM==0 */
 #define PMLCA_CE	0x04000000	/* Condition Enable */
 
-#define PMLCA_EVENT_MASK 0x007f0000	/* Event field */
+#define PMLCA_EVENT_MASK 0x00ff0000	/* Event field */
 #define PMLCA_EVENT_SHIFT	16
 
 #define PMRN_PMLCB0	0x110	/* PM Local Control B0 */
arch/powerpc/kernel/Makefile +4 -0
index 93fd162..8773263 100644
@@ -99,11 +99,15 @@ obj64-$(CONFIG_AUDIT)		+= compat_audit.o
 obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o
 obj-$(CONFIG_FUNCTION_GRAPH_TRACER)	+= ftrace.o
 obj-$(CONFIG_PERF_EVENTS)	+= perf_callchain.o
+
 obj-$(CONFIG_PPC_PERF_CTRS)	+= perf_event.o
 obj64-$(CONFIG_PPC_PERF_CTRS)	+= power4-pmu.o ppc970-pmu.o power5-pmu.o \
 				   power5+-pmu.o power6-pmu.o power7-pmu.o
 obj32-$(CONFIG_PPC_PERF_CTRS)	+= mpc7450-pmu.o
 
+obj-$(CONFIG_FSL_EMB_PERF_EVENT) += perf_event_fsl_emb.o
+obj-$(CONFIG_FSL_EMB_PERF_EVENT_E500) += e500-pmu.o
+
 obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o
 
 ifneq ($(CONFIG_PPC_INDIRECT_IO),y)
arch/powerpc/kernel/cputable.c +1 -1
index 2fc82ba..8af4949 100644
@@ -1808,7 +1808,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
 		.icache_bsize		= 64,
 		.dcache_bsize		= 64,
 		.num_pmcs		= 4,
-		.oprofile_cpu_type	= "ppc/e500", /* xxx - galak, e500mc? */
+		.oprofile_cpu_type	= "ppc/e500mc",
 		.oprofile_type		= PPC_OPROFILE_FSL_EMB,
 		.cpu_setup		= __setup_cpu_e500mc,
 		.machine_check		= machine_check_e500,
arch/powerpc/kernel/e500-pmu.c new file +129 -0

129 lines not on this page · raw message

arch/powerpc/kernel/perf_event_fsl_emb.c new file +654 -0

654 lines not on this page · raw message

arch/powerpc/platforms/Kconfig.cputype +10 -0
index fa0f690..a8aae0b 100644
@@ -144,6 +144,16 @@ config FSL_EMB_PERFMON
 	  and some e300 cores (c3 and c4).  Select this only if your
 	  core supports the Embedded Performance Monitor APU
 
+config FSL_EMB_PERF_EVENT
+	bool
+	depends on FSL_EMB_PERFMON && PERF_EVENTS && !PPC_PERF_CTRS
+	default y
+
+config FSL_EMB_PERF_EVENT_E500
+	bool
+	depends on FSL_EMB_PERF_EVENT && E500
+	default y
+
 config 4xx
 	bool
 	depends on 40x || 44x
Signature · 1 line
1.6.4.4
#1 lore raw
Quoted 1 line · Scott Wood

This implements perf_event support for the Freescale embedded =

performance

Quoted 1 line

monitor, based on the existing perf_event.c that supports =

server/classic

Quoted 4 lines

chips.
=20
Some limitations:
- Performance monitor interrupts are regular EE interrupts, and thus =

you

Quoted 1 line

can't profile places with interrupts disabled. We may want to =

implement

Quoted 1 line

soft IRQ-disabling, with perfmon interrupts exempted and treated as =

NMIs.

Quoted 3 lines

- When trying to schedule multiple event groups at once, and using restricted events, situations could arise where scheduling fails even though it would be possible. Consider three groups, each with two =

events.

Quoted 1 line

One group has restricted events, the others don't. The two =

non-restricted

Quoted 1 line

groups are scheduled, then one is removed, which happens to occupy =

the two

Quoted 1 line

counters that can't do restricted events. The remaining =

non-restricted

Quoted 1 line

group will not be moved to the non-restricted-capable counters to =

make

Quoted 13 lines

room if the restricted group tries to be scheduled.
=20

---
Changes from previous version:
- Factored out callchain makefile patch
- Split up header files
- Renamed pmu struct
- Added threshold support
=20
arch/powerpc/include/asm/perf_event.h | 133 +----
arch/powerpc/include/asm/perf_event_fsl_emb.h | 50 ++
.../asm/{perf_event.h =3D> perf_event_server.h} | 4 +-

Quoted 5 lines
arch/powerpc/include/asm/reg_fsl_emb.h             |    2 +-
arch/powerpc/kernel/Makefile                       |    4 +
arch/powerpc/kernel/cputable.c                     |    2 +-
arch/powerpc/kernel/e500-pmu.c                     |  129 ++++
arch/powerpc/kernel/perf_event_fsl_emb.c           |  654 =

++++++++++++++++++++

Quoted 5 lines

arch/powerpc/platforms/Kconfig.cputype | 10 +

9 files changed, 874 insertions(+), 114 deletions(-)

rewrite arch/powerpc/include/asm/perf_event.h (92%) create mode 100644 arch/powerpc/include/asm/perf_event_fsl_emb.h rename arch/powerpc/include/asm/{perf_event.h =3D> =

perf_event_server.h} (98%)

Quoted 2 lines

create mode 100644 arch/powerpc/kernel/e500-pmu.c create mode 100644 arch/powerpc/kernel/perf_event_fsl_emb.c

Paul do you intend to Ack this or don't care?

- k