perf: Register PMU implementations
Subsystems (8)
Commit-ID: b0a873ebbf87bf38bf70b5e39a7cadc96099fa13 Gitweb: http://git.kernel.org/tip/b0a873ebbf87bf38bf70b5e39a7cadc96099fa13 Author: Peter Zijlstra <[email protected]> AuthorDate: Fri, 11 Jun 2010 13:35:08 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 9 Sep 2010 20:46:28 +0200
perf: Register PMU implementations
Simple registration interface for struct pmu, this provides the infrastructure for removing all the weak functions.
Signed-off-by Peter Zijlstra <[email protected]>
Cc paulus <[email protected]>
Cc stephane eranian <[email protected]>
Cc Robert Richter <[email protected]>
Cc Will Deacon <[email protected]>
Cc Paul Mundt <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Cyrill Gorcunov <[email protected]>
Cc Lin Ming <[email protected]>
Cc Yanmin <[email protected]>
Cc Deng-Cheng Zhu <[email protected]>
Cc David Miller <[email protected]>
Cc Michael Cree <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/alpha/kernel/perf_event.c | 37 ++- arch/arm/kernel/perf_event.c | 38 ++- arch/powerpc/kernel/perf_event.c | 46 ++-- arch/powerpc/kernel/perf_event_fsl_emb.c | 37 +- arch/sh/kernel/perf_event.c | 35 ++- arch/sparc/kernel/perf_event.c | 29 +- arch/x86/kernel/cpu/perf_event.c | 45 ++- include/linux/perf_event.h | 10 +- kernel/hw_breakpoint.c | 35 ++- kernel/perf_event.c | 588 +++++++++++++++--------------- 10 files changed, 488 insertions(+), 412 deletions(-)
arch/alpha/kernel/perf_event.c +22 -15
@@ -642,34 +642,39 @@ static int __hw_perf_event_init(struct perf_event *event)return 0 ; } -static struct pmu pmu = { - .enable = alpha_pmu_enable, - .disable = alpha_pmu_disable, - .read = alpha_pmu_read, - .unthrottle = alpha_pmu_unthrottle, -}; - -/* * Main entry point to initialise a HW performance event. */ -struct pmu *hw_perf_event_init (struct perf_event *event) +static int alpha_pmu_event_init (struct perf_event *event) {int err; +switch (event->attr.type) { +case PERF_TYPE_RAW : +case PERF_TYPE_HARDWARE : +case PERF_TYPE_HW_CACHE : +break ; + +default : +return -ENOENT ; + } +if (!alpha_pmu) -return ERR_PTR (-ENODEV ); +return -ENODEV ;/* Do the real initialisation work. */ err =__hw_perf_event_init (event); -if (err) -return ERR_PTR (err); - -return &pmu; +return err; } - +static struct pmu pmu = { + .event_init = alpha_pmu_event_init, + .enable = alpha_pmu_enable, + .disable = alpha_pmu_disable, + .read = alpha_pmu_read, + .unthrottle = alpha_pmu_unthrottle, +};/* * Main entry point - enable HW performance counters.
@@ -838,5 +843,7 @@ void __init init_hw_perf_events(void)/* And set up PMU specification */ alpha_pmu = &ev67_pmu; perf_max_events = alpha_pmu->num_pmcs; + +perf_pmu_register (&pmu); }
arch/arm/kernel/perf_event.c +26 -12
@@ -306,12 +306,7 @@ out:return err; } -static struct pmu pmu = { - .enable = armpmu_enable, - .disable = armpmu_disable, - .unthrottle = armpmu_unthrottle, - .read = armpmu_read, -}; +static struct pmu pmu; static int validate_event(struct cpu_hw_events *cpuc,
@@ -491,20 +486,29 @@ __hw_perf_event_init(struct perf_event *event)return err; } -struct pmu * -hw_perf_event_init (struct perf_event *event) +static int armpmu_event_init (struct perf_event *event) {int err =0 ; +switch (event->attr.type) { +case PERF_TYPE_RAW : +case PERF_TYPE_HARDWARE : +case PERF_TYPE_HW_CACHE : +break ; + +default : +return -ENOENT ; + } +if (!armpmu) -return ERR_PTR (-ENODEV ); +return -ENODEV ; event->destroy = hw_perf_event_destroy;if (!atomic_inc_not_zero (&active_events)) {if (atomic_read (&active_events) > perf_max_events) {atomic_dec (&active_events); -return ERR_PTR (-ENOSPC ); +return -ENOSPC ; }mutex_lock (&pmu_reserve_mutex);
@@ -518,15 +522,23 @@ hw_perf_event_init(struct perf_event *event) }if (err) -return ERR_PTR (err); +return err; err =__hw_perf_event_init (event);if (err)hw_perf_event_destroy (event); -return err ?ERR_PTR (err) : &pmu; +return err; } +static struct pmu pmu = { + .event_init = armpmu_event_init, + .enable = armpmu_enable, + .disable = armpmu_disable, + .unthrottle = armpmu_unthrottle, + .read = armpmu_read, +}; +void hw_perf_enable (void ) {
@@ -2994,6 +3006,8 @@ init_hw_perf_events(void) perf_max_events =-1 ; } +perf_pmu_register (&pmu); +return 0 ; }arch_initcall (init_hw_perf_events);
arch/powerpc/kernel/perf_event.c +24 -22
115 lines not on this page · raw message
arch/powerpc/kernel/perf_event_fsl_emb.c +19 -18
@@ -378,13 +378,6 @@ static void fsl_emb_pmu_unthrottle(struct perf_event *event)local_irq_restore (flags); } -static struct pmu fsl_emb_pmu = { - .enable = fsl_emb_pmu_enable, - .disable = fsl_emb_pmu_disable, - .read = fsl_emb_pmu_read, - .unthrottle = fsl_emb_pmu_unthrottle, -}; -/* * Release the PMU if this is the last perf_event. */
@@ -428,7 +421,7 @@ static int hw_perf_cache_event(u64 config, u64 *eventp)return 0 ; } -struct pmu *hw_perf_event_init (struct perf_event *event) +static int fsl_emb_pmu_event_init (struct perf_event *event) {u64 ev;struct perf_event *events[MAX_HWEVENTS ];
@@ -441,14 +434,14 @@ struct pmu *hw_perf_event_init(struct perf_event *event)case PERF_TYPE_HARDWARE : ev = event->attr.config;if (ev >= ppmu->n_generic || ppmu->generic_events[ev] ==0 ) -return ERR_PTR (-EOPNOTSUPP ); +return -EOPNOTSUPP ; ev = ppmu->generic_events[ev];break ;case PERF_TYPE_HW_CACHE : err =hw_perf_cache_event (event->attr.config, &ev);if (err) -return ERR_PTR (err); +return err;break ;case PERF_TYPE_RAW :
@@ -456,12 +449,12 @@ struct pmu *hw_perf_event_init(struct perf_event *event)break ;default : -return ERR_PTR (-EINVAL ); +return -ENOENT ; } event->hw.config = ppmu->xlate_event (ev);if (!(event->hw.config &FSL_EMB_EVENT_VALID )) -return ERR_PTR (-EINVAL ); +return -EINVAL ;/* * If this is in a group, check if it can go on with all the
@@ -473,7 +466,7 @@ struct pmu *hw_perf_event_init(struct perf_event *event) n =collect_events (event->group_leader, ppmu->n_counter -1 , events);if (n <0 ) -return ERR_PTR (-EINVAL ); +return -EINVAL ; }if (event->hw.config &FSL_EMB_EVENT_RESTRICTED ) {
@@ -484,7 +477,7 @@ struct pmu *hw_perf_event_init(struct perf_event *event) }if (num_restricted >= ppmu->n_restricted) -return ERR_PTR (-EINVAL ); +return -EINVAL ; } event->hw.idx =-1 ;
@@ -497,7 +490,7 @@ struct pmu *hw_perf_event_init(struct perf_event *event)if (event->attr.exclude_kernel) event->hw.config_base |=PMLCA_FCS ;if (event->attr.exclude_idle) -return ERR_PTR (-ENOTSUPP ); +return -ENOTSUPP ; event->hw.last_period = event->hw.sample_period;local64_set (&event->hw.period_left, event->hw.last_period);
@@ -523,11 +516,17 @@ struct pmu *hw_perf_event_init(struct perf_event *event) } event->destroy = hw_perf_event_destroy; -if (err) -return ERR_PTR (err); -return &fsl_emb_pmu; +return err; } +static struct pmu fsl_emb_pmu = { + .event_init = fsl_emb_pmu_event_init, + .enable = fsl_emb_pmu_enable, + .disable = fsl_emb_pmu_disable, + .read = fsl_emb_pmu_read, + .unthrottle = fsl_emb_pmu_unthrottle, +}; +/* * A counter has overflowed; update its count and record * things if requested. Note that interrupts are hard-disabled
@@ -651,5 +650,7 @@ int register_fsl_emb_pmu(struct fsl_emb_pmu *pmu)pr_info ("%s performance monitor hardware support registered\n" , pmu->name); +perf_pmu_register (&fsl_emb_pmu); +return 0 ; }
arch/sh/kernel/perf_event.c +24 -11
@@ -257,26 +257,38 @@ static void sh_pmu_read(struct perf_event *event)sh_perf_event_update (event, &event->hw, event->hw.idx); } -static struct pmu pmu = { - .enable = sh_pmu_enable, - .disable = sh_pmu_disable, - .read = sh_pmu_read, -}; - -struct pmu *hw_perf_event_init (struct perf_event *event) +static int sh_pmu_event_init (struct perf_event *event) { -int err =__hw_perf_event_init (event); +int err; + +switch (event->attr.type) { +case PERF_TYPE_RAW : +case PERF_TYPE_HW_CACHE : +case PERF_TYPE_HARDWARE : + err =__hw_perf_event_init (event); +break ; + +default : +return -ENOENT ; + } +if (unlikely (err)) {if (event->destroy) event->destroy (event); -return ERR_PTR (err); } -return &pmu; +return err; } +static struct pmu pmu = { + .event_init = sh_pmu_event_init, + .enable = sh_pmu_enable, + .disable = sh_pmu_disable, + .read = sh_pmu_read, +}; +static void sh_pmu_setup (int cpu) -{ + struct cpu_hw_events *cpuhw = &per_cpu(cpu_hw_events, cpu);memset (cpuhw,0 ,sizeof (struct cpu_hw_events ));
@@ -325,6 +337,7 @@ int __cpuinit register_sh_pmu(struct sh_pmu *pmu)WARN_ON (pmu->num_events >MAX_HWEVENTS ); +perf_pmu_register (&pmu);perf_cpu_notifier (sh_pmu_notifier);return 0 ; }
arch/sparc/kernel/perf_event.c +16 -13
@@ -1025,7 +1025,7 @@ out:return ret; } -static int __hw_perf_event_init (struct perf_event *event) +static int sparc_pmu_event_init (struct perf_event *event) {struct perf_event_attr *attr = &event->attr;struct perf_event *evts[MAX_HWEVENTS ];
@@ -1038,17 +1038,27 @@ static int __hw_perf_event_init(struct perf_event *event)if (atomic_read (&nmi_active) <0 )return -ENODEV ; -if (attr->type ==PERF_TYPE_HARDWARE ) { +switch (attr->type) { +case PERF_TYPE_HARDWARE :if (attr->config >= sparc_pmu->max_events)return -EINVAL ; pmap = sparc_pmu->event_map (attr->config); - }else if (attr->type ==PERF_TYPE_HW_CACHE ) { +break ; + +case PERF_TYPE_HW_CACHE : pmap =sparc_map_cache_event (attr->config);if (IS_ERR (pmap))return PTR_ERR (pmap); - }else +break ; + +case PERF_TYPE_RAW :return -EOPNOTSUPP ; +default : +return -ENOENT ; + + } +/* We save the enable bits in the config_base. */ hwc->config_base = sparc_pmu->irq_bit;if (!attr->exclude_user)
@@ -1143,6 +1153,7 @@ static int sparc_pmu_commit_txn(struct pmu *pmu) }static struct pmu pmu = { + .event_init = sparc_pmu_event_init, .enable = sparc_pmu_enable, .disable = sparc_pmu_disable, .read = sparc_pmu_read,
@@ -1152,15 +1163,6 @@ static struct pmu pmu = { .commit_txn = sparc_pmu_commit_txn, }; -struct pmu *hw_perf_event_init (struct perf_event *event) -{ -int err =__hw_perf_event_init (event); - -if (err) -return ERR_PTR (err); -return &pmu; -} -void perf_event_print_debug (void ) {unsigned long flags;
@@ -1280,6 +1282,7 @@ void __init init_hw_perf_events(void)/* All sparc64 PMUs currently have 2 events. */ perf_max_events =2 ; +perf_pmu_register (&pmu);register_die_notifier (&perf_event_nmi_notifier); }
arch/x86/kernel/cpu/perf_event.c +28 -17
83 lines not on this page · raw message
include/linux/perf_event.h +9 -1
@@ -561,6 +561,13 @@ struct perf_event;* struct pmu - generic performance monitoring unit */ struct pmu { +struct list_head entry; + +/* +* Should return -ENOENT when the @event doesn't match this pmu +*/ +int (*event_init) (struct perf_event *event); +int (*enable) (struct perf_event *event);void (*disable) (struct perf_event *event);int (*start) (struct perf_event *event);
@@ -849,7 +856,8 @@ struct perf_output_handle {*/ extern int perf_max_events; -extern struct pmu *hw_perf_event_init (struct perf_event *event); +extern int perf_pmu_register (struct pmu *pmu); +extern void perf_pmu_unregister (struct pmu *pmu);extern void perf_event_task_sched_in (struct task_struct *task);extern void perf_event_task_sched_out (struct task_struct *task,struct task_struct *next);
kernel/hw_breakpoint.c +30 -5
@@ -565,6 +565,34 @@ static struct notifier_block hw_breakpoint_exceptions_nb = { .priority = 0x7fffffff }; +static void bp_perf_event_destroy (struct perf_event *event) +{ +release_bp_slot (event); +} + +static int hw_breakpoint_event_init (struct perf_event *bp) +{ +int err; + +if (bp->attr.type !=PERF_TYPE_BREAKPOINT ) +return -ENOENT ; + + err =register_perf_hw_breakpoint (bp); +if (err) +return err; + + bp->destroy = bp_perf_event_destroy; + +return 0 ; +} + +static struct pmu perf_breakpoint = { + .event_init = hw_breakpoint_event_init, + .enable = arch_install_hw_breakpoint, + .disable = arch_uninstall_hw_breakpoint, + .read = hw_breakpoint_pmu_read, +}; +static int __init init_hw_breakpoint (void ) {unsigned int **task_bp_pinned;
@@ -586,6 +614,8 @@ static int __init init_hw_breakpoint(void) constraints_initialized =1 ; +perf_pmu_register (&perf_breakpoint); +return register_die_notifier (&hw_breakpoint_exceptions_nb); err_alloc:
@@ -601,8 +631,3 @@ static int __init init_hw_breakpoint(void)core_initcall (init_hw_breakpoint); -struct pmu perf_ops_bp = { - .enable = arch_install_hw_breakpoint, - .disable = arch_uninstall_hw_breakpoint, - .read = hw_breakpoint_pmu_read, -};
kernel/perf_event.c +290 -298
700 lines not on this page · raw message