cdd6c482c9
Bye-bye Performance Counters, welcome Performance Events! In the past few months the perfcounters subsystem has grown out its initial role of counting hardware events, and has become (and is becoming) a much broader generic event enumeration, reporting, logging, monitoring, analysis facility. Naming its core object 'perf_counter' and naming the subsystem 'perfcounters' has become more and more of a misnomer. With pending code like hw-breakpoints support the 'counter' name is less and less appropriate. All in one, we've decided to rename the subsystem to 'performance events' and to propagate this rename through all fields, variables and API names. (in an ABI compatible fashion) The word 'event' is also a bit shorter than 'counter' - which makes it slightly more convenient to write/handle as well. Thanks goes to Stephane Eranian who first observed this misnomer and suggested a rename. User-space tooling and ABI compatibility is not affected - this patch should be function-invariant. (Also, defconfigs were not touched to keep the size down.) This patch has been generated via the following script: FILES=$(find * -type f | grep -vE 'oprofile|[^K]config') sed -i \ -e 's/PERF_EVENT_/PERF_RECORD_/g' \ -e 's/PERF_COUNTER/PERF_EVENT/g' \ -e 's/perf_counter/perf_event/g' \ -e 's/nb_counters/nb_events/g' \ -e 's/swcounter/swevent/g' \ -e 's/tpcounter_event/tp_event/g' \ $FILES for N in $(find . -name perf_counter.[ch]); do M=$(echo $N | sed 's/perf_counter/perf_event/g') mv $N $M done FILES=$(find . -name perf_event.*) sed -i \ -e 's/COUNTER_MASK/REG_MASK/g' \ -e 's/COUNTER/EVENT/g' \ -e 's/\<event\>/event_id/g' \ -e 's/counter/event/g' \ -e 's/Counter/Event/g' \ $FILES ... to keep it as correct as possible. This script can also be used by anyone who has pending perfcounters patches - it converts a Linux kernel tree over to the new naming. We tried to time this change to the point in time where the amount of pending patches is the smallest: the end of the merge window. Namespace clashes were fixed up in a preparatory patch - and some stylistic fallout will be fixed up in a subsequent patch. ( NOTE: 'counters' are still the proper terminology when we deal with hardware registers - and these sed scripts are a bit over-eager in renaming them. I've undone some of that, but in case there's something left where 'counter' would be better than 'event' we can undo that on an individual basis instead of touching an otherwise nicely automated patch. ) Suggested-by: Stephane Eranian <eranian@google.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Paul Mackerras <paulus@samba.org> Reviewed-by: Arjan van de Ven <arjan@linux.intel.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: David Howells <dhowells@redhat.com> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: <linux-arch@vger.kernel.org> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
171 lines
3.3 KiB
C
171 lines
3.3 KiB
C
/* pcr.c: Generic sparc64 performance counter infrastructure.
|
|
*
|
|
* Copyright (C) 2009 David S. Miller (davem@davemloft.net)
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/irq.h>
|
|
|
|
#include <linux/perf_event.h>
|
|
|
|
#include <asm/pil.h>
|
|
#include <asm/pcr.h>
|
|
#include <asm/nmi.h>
|
|
|
|
/* This code is shared between various users of the performance
|
|
* counters. Users will be oprofile, pseudo-NMI watchdog, and the
|
|
* perf_event support layer.
|
|
*/
|
|
|
|
#define PCR_SUN4U_ENABLE (PCR_PIC_PRIV | PCR_STRACE | PCR_UTRACE)
|
|
#define PCR_N2_ENABLE (PCR_PIC_PRIV | PCR_STRACE | PCR_UTRACE | \
|
|
PCR_N2_TOE_OV1 | \
|
|
(2 << PCR_N2_SL1_SHIFT) | \
|
|
(0xff << PCR_N2_MASK1_SHIFT))
|
|
|
|
u64 pcr_enable;
|
|
unsigned int picl_shift;
|
|
|
|
/* Performance counter interrupts run unmasked at PIL level 15.
|
|
* Therefore we can't do things like wakeups and other work
|
|
* that expects IRQ disabling to be adhered to in locking etc.
|
|
*
|
|
* Therefore in such situations we defer the work by signalling
|
|
* a lower level cpu IRQ.
|
|
*/
|
|
void deferred_pcr_work_irq(int irq, struct pt_regs *regs)
|
|
{
|
|
struct pt_regs *old_regs;
|
|
|
|
clear_softint(1 << PIL_DEFERRED_PCR_WORK);
|
|
|
|
old_regs = set_irq_regs(regs);
|
|
irq_enter();
|
|
#ifdef CONFIG_PERF_EVENTS
|
|
perf_event_do_pending();
|
|
#endif
|
|
irq_exit();
|
|
set_irq_regs(old_regs);
|
|
}
|
|
|
|
void set_perf_event_pending(void)
|
|
{
|
|
set_softint(1 << PIL_DEFERRED_PCR_WORK);
|
|
}
|
|
|
|
const struct pcr_ops *pcr_ops;
|
|
EXPORT_SYMBOL_GPL(pcr_ops);
|
|
|
|
static u64 direct_pcr_read(void)
|
|
{
|
|
u64 val;
|
|
|
|
read_pcr(val);
|
|
return val;
|
|
}
|
|
|
|
static void direct_pcr_write(u64 val)
|
|
{
|
|
write_pcr(val);
|
|
}
|
|
|
|
static const struct pcr_ops direct_pcr_ops = {
|
|
.read = direct_pcr_read,
|
|
.write = direct_pcr_write,
|
|
};
|
|
|
|
static void n2_pcr_write(u64 val)
|
|
{
|
|
unsigned long ret;
|
|
|
|
ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val);
|
|
if (val != HV_EOK)
|
|
write_pcr(val);
|
|
}
|
|
|
|
static const struct pcr_ops n2_pcr_ops = {
|
|
.read = direct_pcr_read,
|
|
.write = n2_pcr_write,
|
|
};
|
|
|
|
static unsigned long perf_hsvc_group;
|
|
static unsigned long perf_hsvc_major;
|
|
static unsigned long perf_hsvc_minor;
|
|
|
|
static int __init register_perf_hsvc(void)
|
|
{
|
|
if (tlb_type == hypervisor) {
|
|
switch (sun4v_chip_type) {
|
|
case SUN4V_CHIP_NIAGARA1:
|
|
perf_hsvc_group = HV_GRP_NIAG_PERF;
|
|
break;
|
|
|
|
case SUN4V_CHIP_NIAGARA2:
|
|
perf_hsvc_group = HV_GRP_N2_CPU;
|
|
break;
|
|
|
|
default:
|
|
return -ENODEV;
|
|
}
|
|
|
|
|
|
perf_hsvc_major = 1;
|
|
perf_hsvc_minor = 0;
|
|
if (sun4v_hvapi_register(perf_hsvc_group,
|
|
perf_hsvc_major,
|
|
&perf_hsvc_minor)) {
|
|
printk("perfmon: Could not register hvapi.\n");
|
|
return -ENODEV;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static void __init unregister_perf_hsvc(void)
|
|
{
|
|
if (tlb_type != hypervisor)
|
|
return;
|
|
sun4v_hvapi_unregister(perf_hsvc_group);
|
|
}
|
|
|
|
int __init pcr_arch_init(void)
|
|
{
|
|
int err = register_perf_hsvc();
|
|
|
|
if (err)
|
|
return err;
|
|
|
|
switch (tlb_type) {
|
|
case hypervisor:
|
|
pcr_ops = &n2_pcr_ops;
|
|
pcr_enable = PCR_N2_ENABLE;
|
|
picl_shift = 2;
|
|
break;
|
|
|
|
case cheetah:
|
|
case cheetah_plus:
|
|
pcr_ops = &direct_pcr_ops;
|
|
pcr_enable = PCR_SUN4U_ENABLE;
|
|
break;
|
|
|
|
case spitfire:
|
|
/* UltraSPARC-I/II and derivatives lack a profile
|
|
* counter overflow interrupt so we can't make use of
|
|
* their hardware currently.
|
|
*/
|
|
/* fallthrough */
|
|
default:
|
|
err = -ENODEV;
|
|
goto out_unregister;
|
|
}
|
|
|
|
return nmi_init();
|
|
|
|
out_unregister:
|
|
unregister_perf_hsvc();
|
|
return err;
|
|
}
|
|
|
|
arch_initcall(pcr_arch_init);
|