forked from Minki/linux
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>
178 lines
3.9 KiB
C
178 lines
3.9 KiB
C
/*
|
|
* Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>
|
|
*/
|
|
#ifndef _ASM_POWERPC_HW_IRQ_H
|
|
#define _ASM_POWERPC_HW_IRQ_H
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/errno.h>
|
|
#include <linux/compiler.h>
|
|
#include <asm/ptrace.h>
|
|
#include <asm/processor.h>
|
|
|
|
extern void timer_interrupt(struct pt_regs *);
|
|
|
|
#ifdef CONFIG_PPC64
|
|
#include <asm/paca.h>
|
|
|
|
static inline unsigned long local_get_flags(void)
|
|
{
|
|
unsigned long flags;
|
|
|
|
__asm__ __volatile__("lbz %0,%1(13)"
|
|
: "=r" (flags)
|
|
: "i" (offsetof(struct paca_struct, soft_enabled)));
|
|
|
|
return flags;
|
|
}
|
|
|
|
static inline unsigned long raw_local_irq_disable(void)
|
|
{
|
|
unsigned long flags, zero;
|
|
|
|
__asm__ __volatile__("li %1,0; lbz %0,%2(13); stb %1,%2(13)"
|
|
: "=r" (flags), "=&r" (zero)
|
|
: "i" (offsetof(struct paca_struct, soft_enabled))
|
|
: "memory");
|
|
|
|
return flags;
|
|
}
|
|
|
|
extern void raw_local_irq_restore(unsigned long);
|
|
extern void iseries_handle_interrupts(void);
|
|
|
|
#define raw_local_irq_enable() raw_local_irq_restore(1)
|
|
#define raw_local_save_flags(flags) ((flags) = local_get_flags())
|
|
#define raw_local_irq_save(flags) ((flags) = raw_local_irq_disable())
|
|
|
|
#define raw_irqs_disabled() (local_get_flags() == 0)
|
|
#define raw_irqs_disabled_flags(flags) ((flags) == 0)
|
|
|
|
#ifdef CONFIG_PPC_BOOK3E
|
|
#define __hard_irq_enable() __asm__ __volatile__("wrteei 1": : :"memory");
|
|
#define __hard_irq_disable() __asm__ __volatile__("wrteei 0": : :"memory");
|
|
#else
|
|
#define __hard_irq_enable() __mtmsrd(mfmsr() | MSR_EE, 1)
|
|
#define __hard_irq_disable() __mtmsrd(mfmsr() & ~MSR_EE, 1)
|
|
#endif
|
|
|
|
#define hard_irq_disable() \
|
|
do { \
|
|
__hard_irq_disable(); \
|
|
get_paca()->soft_enabled = 0; \
|
|
get_paca()->hard_enabled = 0; \
|
|
} while(0)
|
|
|
|
static inline int irqs_disabled_flags(unsigned long flags)
|
|
{
|
|
return flags == 0;
|
|
}
|
|
|
|
#else
|
|
|
|
#if defined(CONFIG_BOOKE)
|
|
#define SET_MSR_EE(x) mtmsr(x)
|
|
#define raw_local_irq_restore(flags) __asm__ __volatile__("wrtee %0" : : "r" (flags) : "memory")
|
|
#else
|
|
#define SET_MSR_EE(x) mtmsr(x)
|
|
#define raw_local_irq_restore(flags) mtmsr(flags)
|
|
#endif
|
|
|
|
static inline void raw_local_irq_disable(void)
|
|
{
|
|
#ifdef CONFIG_BOOKE
|
|
__asm__ __volatile__("wrteei 0": : :"memory");
|
|
#else
|
|
unsigned long msr;
|
|
|
|
msr = mfmsr();
|
|
SET_MSR_EE(msr & ~MSR_EE);
|
|
#endif
|
|
}
|
|
|
|
static inline void raw_local_irq_enable(void)
|
|
{
|
|
#ifdef CONFIG_BOOKE
|
|
__asm__ __volatile__("wrteei 1": : :"memory");
|
|
#else
|
|
unsigned long msr;
|
|
|
|
msr = mfmsr();
|
|
SET_MSR_EE(msr | MSR_EE);
|
|
#endif
|
|
}
|
|
|
|
static inline void raw_local_irq_save_ptr(unsigned long *flags)
|
|
{
|
|
unsigned long msr;
|
|
msr = mfmsr();
|
|
*flags = msr;
|
|
#ifdef CONFIG_BOOKE
|
|
__asm__ __volatile__("wrteei 0": : :"memory");
|
|
#else
|
|
SET_MSR_EE(msr & ~MSR_EE);
|
|
#endif
|
|
}
|
|
|
|
#define raw_local_save_flags(flags) ((flags) = mfmsr())
|
|
#define raw_local_irq_save(flags) raw_local_irq_save_ptr(&flags)
|
|
#define raw_irqs_disabled() ((mfmsr() & MSR_EE) == 0)
|
|
#define raw_irqs_disabled_flags(flags) (((flags) & MSR_EE) == 0)
|
|
|
|
#define hard_irq_disable() raw_local_irq_disable()
|
|
|
|
static inline int irqs_disabled_flags(unsigned long flags)
|
|
{
|
|
return (flags & MSR_EE) == 0;
|
|
}
|
|
|
|
#endif /* CONFIG_PPC64 */
|
|
|
|
/*
|
|
* interrupt-retrigger: should we handle this via lost interrupts and IPIs
|
|
* or should we not care like we do now ? --BenH.
|
|
*/
|
|
struct irq_chip;
|
|
|
|
#ifdef CONFIG_PERF_EVENTS
|
|
|
|
#ifdef CONFIG_PPC64
|
|
static inline unsigned long test_perf_event_pending(void)
|
|
{
|
|
unsigned long x;
|
|
|
|
asm volatile("lbz %0,%1(13)"
|
|
: "=r" (x)
|
|
: "i" (offsetof(struct paca_struct, perf_event_pending)));
|
|
return x;
|
|
}
|
|
|
|
static inline void set_perf_event_pending(void)
|
|
{
|
|
asm volatile("stb %0,%1(13)" : :
|
|
"r" (1),
|
|
"i" (offsetof(struct paca_struct, perf_event_pending)));
|
|
}
|
|
|
|
static inline void clear_perf_event_pending(void)
|
|
{
|
|
asm volatile("stb %0,%1(13)" : :
|
|
"r" (0),
|
|
"i" (offsetof(struct paca_struct, perf_event_pending)));
|
|
}
|
|
#endif /* CONFIG_PPC64 */
|
|
|
|
#else /* CONFIG_PERF_EVENTS */
|
|
|
|
static inline unsigned long test_perf_event_pending(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void clear_perf_event_pending(void) {}
|
|
#endif /* CONFIG_PERF_EVENTS */
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* _ASM_POWERPC_HW_IRQ_H */
|