Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

5d70f79b · Linus Torvalds <[email protected]> · 2010-10-21 12:54:49 -07:00

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (163 commits)
  tracing: Fix compile issue for trace_sched_wakeup.c
  [S390] hardirq: remove pointless header file includes
  [IA64] Move local_softirq_pending() definition
  perf, powerpc: Fix power_pmu_event_init to not use event->ctx
  ftrace: Remove recursion between recordmcount and scripts/mod/empty
  jump_label: Add COND_STMT(), reducer wrappery
  perf: Optimize sw events
  perf: Use jump_labels to optimize the scheduler hooks
  jump_label: Add atomic_t interface
  jump_label: Use more consistent naming
  perf, hw_breakpoint: Fix crash in hw_breakpoint creation
  perf: Find task before event alloc
  perf: Fix task refcount bugs
  perf: Fix group moving
  irq_work: Add generic hardirq context callbacks
  perf_events: Fix transaction recovery in group_sched_in()
  perf_events: Fix bogus AMD64 generic TLB events
  perf_events: Fix bogus context time tracking
  tracing: Remove parent recording in latency tracer graph options
  tracing: Use one prologue for the preempt irqs off tracer function tracers
  ...

Commit: 5d70f79b5ef6ea2de4f72a37b2d96e2601e40a22
Parents: 888a6f77 · 750ed158

Merge commit. Changes below are compared with the first parent: 888a6f77.

Changes

158 files changed · +7202 −3408

File	Status	Add	Del	Content
Documentation/kprobes.txt	modified	+5	−3	View file
Makefile	modified	+11	−0	View file
arch/Kconfig	modified	+3	−0	View file
arch/alpha/Kconfig	modified	+1	−0	View file
arch/alpha/include/asm/perf_event.h	modified	+0	−5	View file
arch/alpha/kernel/perf_event.c	modified	+86	−42	View file
arch/alpha/kernel/time.c	modified	+15	−15	View file
arch/arm/Kconfig	modified	+1	−0	View file
arch/arm/include/asm/perf_event.h	modified	+0	−12	View file
arch/arm/kernel/perf_event.c	modified	+102	−110	View file
arch/arm/oprofile/Makefile	modified	+4	−0	View file
arch/arm/oprofile/common.c	modified	+6	−305	View file
arch/frv/Kconfig	modified	+1	−0	View file
arch/frv/lib/Makefile	modified	+1	−1	View file
arch/frv/lib/perf_event.c	deleted	+0	−19	View before deletion
arch/ia64/include/asm/hardirq.h	modified	+5	−6	View file
arch/parisc/Kconfig	modified	+1	−0	View file
arch/parisc/include/asm/perf_event.h	modified	+1	−2	View file
arch/powerpc/Kconfig	modified	+1	−0	View file
arch/powerpc/include/asm/paca.h	modified	+1	−1	View file
arch/powerpc/kernel/perf_callchain.c	modified	+25	−61	View file
arch/powerpc/kernel/perf_event.c	modified	+102	−64	View file
arch/powerpc/kernel/perf_event_fsl_emb.c	modified	+90	−58	View file
arch/powerpc/kernel/time.c	modified	+21	−21	View file
arch/s390/Kconfig	modified	+1	−0	View file
arch/s390/include/asm/hardirq.h	modified	+0	−4	View file
arch/s390/include/asm/perf_event.h	modified	+1	−2	View file
arch/sh/Kconfig	modified	+14	−0	View file
arch/sh/include/asm/perf_event.h	modified	+0	−7	View file
arch/sh/kernel/perf_callchain.c	modified	+4	−46	View file
arch/sh/kernel/perf_event.c	modified	+112	−47	View file
arch/sh/oprofile/Makefile	modified	+4	−0	View file
arch/sh/oprofile/common.c	modified	+23	−92	View file
arch/sh/oprofile/op_impl.h	deleted	+0	−33	View before deletion
arch/sparc/Kconfig	modified	+3	−0	View file
arch/sparc/include/asm/jump_label.h	added	+32	−0	View file
arch/sparc/include/asm/perf_event.h	modified	+0	−4	View file
arch/sparc/kernel/Makefile	modified	+2	−0	View file
arch/sparc/kernel/jump_label.c	added	+47	−0	View file
arch/sparc/kernel/module.c	modified	+6	−0	View file
arch/sparc/kernel/pcr.c	modified	+4	−4	View file
arch/sparc/kernel/perf_event.c	modified	+123	−117	View file
arch/x86/Kconfig	modified	+8	−0	View file
arch/x86/include/asm/alternative.h	modified	+11	−0	View file
arch/x86/include/asm/entry_arch.h	modified	+2	−2	View file
arch/x86/include/asm/hardirq.h	modified	+1	−1	View file
arch/x86/include/asm/hw_irq.h	modified	+1	−1	View file
arch/x86/include/asm/irq_vectors.h	modified	+2	−2	View file
arch/x86/include/asm/jump_label.h	added	+37	−0	View file
arch/x86/include/asm/perf_event_p4.h	modified	+22	−30	View file
arch/x86/kernel/Makefile	modified	+2	−1	View file
arch/x86/kernel/alternative.c	modified	+68	−3	View file
arch/x86/kernel/cpu/perf_event.c	modified	+123	−157	View file
arch/x86/kernel/cpu/perf_event_amd.c	modified	+2	−2	View file
arch/x86/kernel/cpu/perf_event_intel.c	modified	+4	−4	View file
arch/x86/kernel/cpu/perf_event_intel_ds.c	modified	+7	−6	View file
arch/x86/kernel/cpu/perf_event_p4.c	modified	+268	−24	View file
arch/x86/kernel/entry_64.S	modified	+3	−3	View file
arch/x86/kernel/ftrace.c	modified	+1	−62	View file
arch/x86/kernel/irq.c	modified	+4	−4	View file
arch/x86/kernel/irq_work.c	added	+30	−0	View file
arch/x86/kernel/irqinit.c	modified	+3	−3	View file
arch/x86/kernel/jump_label.c	added	+50	−0	View file
arch/x86/kernel/kprobes.c	modified	+5	−9	View file
arch/x86/kernel/module.c	modified	+3	−0	View file
arch/x86/kernel/setup.c	modified	+6	−0	View file
arch/x86/mm/fault.c	modified	+4	−0	View file
arch/x86/mm/kmemcheck/kmemcheck.c	modified	+2	−0	View file
arch/x86/oprofile/backtrace.c	modified	+59	−11	View file
arch/x86/oprofile/nmi_int.c	modified	+1	−8	View file
drivers/oprofile/oprof.c	modified	+8	−24	View file
drivers/oprofile/oprof.h	modified	+1	−1	View file
drivers/oprofile/oprofile_files.c	modified	+5	−2	View file
drivers/oprofile/oprofile_perf.c	added	+328	−0	View file
drivers/oprofile/oprofilefs.c	modified	+20	−34	View file
include/asm-generic/hardirq.h	modified	+1	−1	View file
include/asm-generic/vmlinux.lds.h	modified	+10	−0	View file
include/linux/dynamic_debug.h	modified	+21	−18	View file
include/linux/ftrace_event.h	modified	+4	−4	View file
include/linux/interrupt.h	modified	+7	−1	View file
include/linux/irq_work.h	added	+20	−0	View file
include/linux/jump_label.h	added	+74	−0	View file
include/linux/jump_label_ref.h	added	+44	−0	View file
include/linux/module.h	modified	+4	−1	View file
include/linux/oprofile.h	modified	+7	−0	View file
include/linux/percpu.h	modified	+9	−0	View file
include/linux/perf_event.h	modified	+138	−74	View file
include/linux/sched.h	modified	+8	−1	View file
include/linux/stop_machine.h	modified	+8	−2	View file
include/linux/tracepoint.h	modified	+4	−1	View file
include/trace/events/irq.h	modified	+24	−2	View file
include/trace/events/napi.h	modified	+23	−2	View file
include/trace/events/net.h	added	+82	−0	View file
include/trace/events/power.h	modified	+87	−3	View file
include/trace/events/skb.h	modified	+17	−0	View file
init/Kconfig	modified	+8	−0	View file
kernel/Makefile	modified	+3	−1	View file
kernel/exit.c	modified	+1	−3	View file
kernel/hw_breakpoint.c	modified	+63	−12	View file
kernel/irq_work.c	added	+164	−0	View file
kernel/jump_label.c	added	+429	−0	View file
kernel/kprobes.c	modified	+17	−9	View file
kernel/module.c	modified	+6	−0	View file
kernel/perf_event.c	modified	+1557	−1115	View file
kernel/sched.c	modified	+1	−1	View file
kernel/test_kprobes.c	modified	+9	−3	View file
kernel/timer.c	modified	+5	−2	View file
kernel/trace/Kconfig	modified	+5	−0	View file
kernel/trace/ftrace.c	modified	+82	−45	View file
kernel/trace/ring_buffer.c	modified	+15	−6	View file
kernel/trace/trace.c	modified	+1	−1	View file
kernel/trace/trace.h	modified	+4	−0	View file
kernel/trace/trace_event_perf.c	modified	+16	−12	View file
kernel/trace/trace_events.c	modified	+18	−37	View file
kernel/trace/trace_functions_graph.c	modified	+201	−8	View file
kernel/trace/trace_irqsoff.c	modified	+55	−97	View file
kernel/trace/trace_sched_wakeup.c	modified	+232	−24	View file
kernel/trace/trace_workqueue.c	modified	+5	−5	View file
kernel/tracepoint.c	modified	+12	−2	View file
kernel/watchdog.c	modified	+15	−26	View file
lib/Kconfig.debug	modified	+4	−4	View file
lib/dynamic_debug.c	modified	+3	−39	View file
net/core/datagram.c	modified	+1	−0	View file
net/core/dev.c	modified	+8	−0	View file
net/core/net-traces.c	modified	+1	−0	View file
net/core/skbuff.c	modified	+1	−0	View file
scripts/Makefile	modified	+1	−0	View file
scripts/Makefile.build	modified	+10	−0	View file
scripts/Makefile.lib	modified	+1	−10	View file
scripts/basic/Makefile	modified	+1	−1	View file
scripts/basic/hash.c	deleted	+0	−64	View before deletion
scripts/gcc-goto.sh	added	+5	−0	View file
scripts/recordmcount.c	added	+363	−0	View file
scripts/recordmcount.h	added	+366	−0	View file
tools/perf/Documentation/perf-annotate.txt	modified	+9	−2	View file
tools/perf/Documentation/perf-report.txt	modified	+7	−0	View file
tools/perf/Makefile	modified	+24	−6	View file
tools/perf/builtin-annotate.c	modified	+16	−10	View file
tools/perf/builtin-report.c	modified	+12	−2	View file
tools/perf/feature-tests.mak	modified	+11	−0	View file
tools/perf/scripts/python/bin/netdev-times-record	added	+8	−0	View file
tools/perf/scripts/python/bin/netdev-times-report	added	+5	−0	View file
tools/perf/scripts/python/netdev-times.py	added	+464	−0	View file
tools/perf/util/cache.h	modified	+2	−0	View file
tools/perf/util/callchain.c	modified	+78	−20	View file
tools/perf/util/callchain.h	modified	+17	−10	View file
tools/perf/util/hist.c	modified	+3	−1	View file
tools/perf/util/path.c	modified	+2	−1	View file
tools/perf/util/sort.h	modified	+1	−1	View file
tools/perf/util/symbol.c	modified	+14	−0	View file
tools/perf/util/symbol.h	modified	+1	−0	View file
tools/perf/util/ui/browser.c	modified	+63	−54	View file
tools/perf/util/ui/browser.h	modified	+7	−2	View file
tools/perf/util/ui/browsers/annotate.c	modified	+17	−21	View file
tools/perf/util/ui/browsers/hists.c	modified	+196	−131	View file
tools/perf/util/ui/browsers/map.c	modified	+13	−19	View file
tools/perf/util/ui/util.c	modified	+1	−3	View file
tools/perf/util/util.h	modified	+0	−13	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/kprobes.txt

View file

diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt
index 1762b81..741fe66 100644
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
@@ -542,9 +542,11 @@ Kprobes does not use mutexes or allocate memory except during
 registration and unregistration.
 
 Probe handlers are run with preemption disabled.  Depending on the
-architecture, handlers may also run with interrupts disabled.  In any
-case, your handler should not yield the CPU (e.g., by attempting to
-acquire a semaphore).
+architecture and optimization state, handlers may also run with
+interrupts disabled (e.g., kretprobe handlers and optimized kprobe
+handlers run without interrupt disabled on x86/x86-64).  In any case,
+your handler should not yield the CPU (e.g., by attempting to acquire
+a semaphore).
 
 Since a return probe is implemented by replacing the return
 address with the trampoline's address, stack backtraces and calls

Makefile

View file

diff --git a/Makefile b/Makefile
index 860c26a..d3c1071 100644
--- a/Makefile
+++ b/Makefile
@@ -568,6 +568,12 @@ endif
 
 ifdef CONFIG_FUNCTION_TRACER
 KBUILD_CFLAGS	+= -pg
+ifdef CONFIG_DYNAMIC_FTRACE
+	ifdef CONFIG_HAVE_C_RECORDMCOUNT
+		BUILD_C_RECORDMCOUNT := y
+		export BUILD_C_RECORDMCOUNT
+	endif
+endif
 endif
 
 # We trigger additional mismatches with less inlining
@@ -591,6 +597,11 @@ KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)
 # conserve stack if available
 KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)
 
+# check for 'asm goto'
+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y)
+	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
+endif
+
 # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
 # But warn user when we do so
 warn-assign = \

arch/Kconfig

View file

diff --git a/arch/Kconfig b/arch/Kconfig
index fe48fc7..53d7f61 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -158,4 +158,7 @@ config HAVE_PERF_EVENTS_NMI
 	  subsystem.  Also has support for calculating CPU cycle events
 	  to determine how many clock cycles in a given period.
 
+config HAVE_ARCH_JUMP_LABEL
+	bool
+
 source "kernel/gcov/Kconfig"

arch/alpha/Kconfig

View file

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index b9647bb..d04ccd7 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -9,6 +9,7 @@ config ALPHA
 	select HAVE_IDE
 	select HAVE_OPROFILE
 	select HAVE_SYSCALL_WRAPPERS
+	select HAVE_IRQ_WORK
 	select HAVE_PERF_EVENTS
 	select HAVE_DMA_ATTRS
 	help

arch/alpha/include/asm/perf_event.h

View file

diff --git a/arch/alpha/include/asm/perf_event.h b/arch/alpha/include/asm/perf_event.h
index 4157cd3..fe792ca 100644
--- a/arch/alpha/include/asm/perf_event.h
+++ b/arch/alpha/include/asm/perf_event.h
@@ -1,11 +1,6 @@
 #ifndef __ASM_ALPHA_PERF_EVENT_H
 #define __ASM_ALPHA_PERF_EVENT_H
 
-/* Alpha only supports software events through this interface. */
-extern void set_perf_event_pending(void);
-
-#define PERF_EVENT_INDEX_OFFSET 0
-
 #ifdef CONFIG_PERF_EVENTS
 extern void init_hw_perf_events(void);
 #else

arch/alpha/kernel/perf_event.c

View file

diff --git a/arch/alpha/kernel/perf_event.c b/arch/alpha/kernel/perf_event.c
index 85d8e4f..1cc4968 100644
--- a/arch/alpha/kernel/perf_event.c
+++ b/arch/alpha/kernel/perf_event.c
@@ -307,7 +307,7 @@ again:
 			     new_raw_count) != prev_raw_count)
 		goto again;
 
-	delta = (new_raw_count  - (prev_raw_count & alpha_pmu->pmc_count_mask[idx])) + ovf;
+	delta = (new_raw_count - (prev_raw_count & alpha_pmu->pmc_count_mask[idx])) + ovf;
 
 	/* It is possible on very rare occasions that the PMC has overflowed
 	 * but the interrupt is yet to come.  Detect and fix this situation.
@@ -402,14 +402,13 @@ static void maybe_change_configuration(struct cpu_hw_events *cpuc)
 		struct hw_perf_event *hwc = &pe->hw;
 		int idx = hwc->idx;
 
-		if (cpuc->current_idx[j] != PMC_NO_INDEX) {
-			cpuc->idx_mask |= (1<<cpuc->current_idx[j]);
-			continue;
+		if (cpuc->current_idx[j] == PMC_NO_INDEX) {
+			alpha_perf_event_set_period(pe, hwc, idx);
+			cpuc->current_idx[j] = idx;
 		}
 
-		alpha_perf_event_set_period(pe, hwc, idx);
-		cpuc->current_idx[j] = idx;
-		cpuc->idx_mask |= (1<<cpuc->current_idx[j]);
+		if (!(hwc->state & PERF_HES_STOPPED))
+			cpuc->idx_mask |= (1<<cpuc->current_idx[j]);
 	}
 	cpuc->config = cpuc->event[0]->hw.config_base;
 }
@@ -420,12 +419,13 @@ static void maybe_change_configuration(struct cpu_hw_events *cpuc)
  *  - this function is called from outside this module via the pmu struct
  *    returned from perf event initialisation.
  */
-static int alpha_pmu_enable(struct perf_event *event)
+static int alpha_pmu_add(struct perf_event *event, int flags)
 {
 	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+	struct hw_perf_event *hwc = &event->hw;
 	int n0;
 	int ret;
-	unsigned long flags;
+	unsigned long irq_flags;
 
 	/*
 	 * The Sparc code has the IRQ disable first followed by the perf
@@ -435,8 +435,8 @@ static int alpha_pmu_enable(struct perf_event *event)
 	 * nevertheless we disable the PMCs first to enable a potential
 	 * final PMI to occur before we disable interrupts.
 	 */
-	perf_disable();
-	local_irq_save(flags);
+	perf_pmu_disable(event->pmu);
+	local_irq_save(irq_flags);
 
 	/* Default to error to be returned */
 	ret = -EAGAIN;
@@ -455,8 +455,12 @@ static int alpha_pmu_enable(struct perf_event *event)
 		}
 	}
 
-	local_irq_restore(flags);
-	perf_enable();
+	hwc->state = PERF_HES_UPTODATE;
+	if (!(flags & PERF_EF_START))
+		hwc->state |= PERF_HES_STOPPED;
+
+	local_irq_restore(irq_flags);
+	perf_pmu_enable(event->pmu);
 
 	return ret;
 }
@@ -467,15 +471,15 @@ static int alpha_pmu_enable(struct perf_event *event)
  *  - this function is called from outside this module via the pmu struct
  *    returned from perf event initialisation.
  */
-static void alpha_pmu_disable(struct perf_event *event)
+static void alpha_pmu_del(struct perf_event *event, int flags)
 {
 	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
 	struct hw_perf_event *hwc = &event->hw;
-	unsigned long flags;
+	unsigned long irq_flags;
 	int j;
 
-	perf_disable();
-	local_irq_save(flags);
+	perf_pmu_disable(event->pmu);
+	local_irq_save(irq_flags);
 
 	for (j = 0; j < cpuc->n_events; j++) {
 		if (event == cpuc->event[j]) {
@@ -501,8 +505,8 @@ static void alpha_pmu_disable(struct perf_event *event)
 		}
 	}
 
-	local_irq_restore(flags);
-	perf_enable();
+	local_irq_restore(irq_flags);
+	perf_pmu_enable(event->pmu);
 }
 
 
@@ -514,13 +518,44 @@ static void alpha_pmu_read(struct perf_event *event)
 }
 
 
-static void alpha_pmu_unthrottle(struct perf_event *event)
+static void alpha_pmu_stop(struct perf_event *event, int flags)
+{
+	struct hw_perf_event *hwc = &event->hw;
+	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+
+	if (!(hwc->state & PERF_HES_STOPPED)) {
+		cpuc->idx_mask &= ~(1UL<<hwc->idx);
+		hwc->state |= PERF_HES_STOPPED;
+	}
+
+	if ((flags & PERF_EF_UPDATE) && !(hwc->state & PERF_HES_UPTODATE)) {
+		alpha_perf_event_update(event, hwc, hwc->idx, 0);
+		hwc->state |= PERF_HES_UPTODATE;
+	}
+
+	if (cpuc->enabled)
+		wrperfmon(PERFMON_CMD_DISABLE, (1UL<<hwc->idx));
+}
+
+
+static void alpha_pmu_start(struct perf_event *event, int flags)
 {
 	struct hw_perf_event *hwc = &event->hw;
 	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
 
+	if (WARN_ON_ONCE(!(hwc->state & PERF_HES_STOPPED)))
+		return;
+
+	if (flags & PERF_EF_RELOAD) {
+		WARN_ON_ONCE(!(hwc->state & PERF_HES_UPTODATE));
+		alpha_perf_event_set_period(event, hwc, hwc->idx);
+	}
+
+	hwc->state = 0;
+
 	cpuc->idx_mask |= 1UL<<hwc->idx;
-	wrperfmon(PERFMON_CMD_ENABLE, (1UL<<hwc->idx));
+	if (cpuc->enabled)
+		wrperfmon(PERFMON_CMD_ENABLE, (1UL<<hwc->idx));
 }
 
 
@@ -642,39 +677,36 @@ static int __hw_perf_event_init(struct perf_event *event)
 	return 0;
 }
 
-static const 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.
  */
-const 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;
 }
 
-
-
 /*
  * Main entry point - enable HW performance counters.
  */
-void hw_perf_enable(void)
+static void alpha_pmu_enable(struct pmu *pmu)
 {
 	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
 
@@ -700,7 +732,7 @@ void hw_perf_enable(void)
  * Main entry point - disable HW performance counters.
  */
 
-void hw_perf_disable(void)
+static void alpha_pmu_disable(struct pmu *pmu)
 {
 	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
 
@@ -713,6 +745,17 @@ void hw_perf_disable(void)
 	wrperfmon(PERFMON_CMD_DISABLE, cpuc->idx_mask);
 }
 
+static struct pmu pmu = {
+	.pmu_enable	= alpha_pmu_enable,
+	.pmu_disable	= alpha_pmu_disable,
+	.event_init	= alpha_pmu_event_init,
+	.add		= alpha_pmu_add,
+	.del		= alpha_pmu_del,
+	.start		= alpha_pmu_start,
+	.stop		= alpha_pmu_stop,
+	.read		= alpha_pmu_read,
+};
+
 
 /*
  * Main entry point - don't know when this is called but it
@@ -766,7 +809,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr,
 	wrperfmon(PERFMON_CMD_DISABLE, cpuc->idx_mask);
 
 	/* la_ptr is the counter that overflowed. */
-	if (unlikely(la_ptr >= perf_max_events)) {
+	if (unlikely(la_ptr >= alpha_pmu->num_pmcs)) {
 		/* This should never occur! */
 		irq_err_count++;
 		pr_warning("PMI: silly index %ld\n", la_ptr);
@@ -807,7 +850,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr,
 			/* Interrupts coming too quickly; "throttle" the
 			 * counter, i.e., disable it for a little while.
 			 */
-			cpuc->idx_mask &= ~(1UL<<idx);
+			alpha_pmu_stop(event, 0);
 		}
 	}
 	wrperfmon(PERFMON_CMD_ENABLE, cpuc->idx_mask);
@@ -837,6 +880,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/alpha/kernel/time.c

View file

diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c
index 396af17..0f1d849 100644
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
@@ -41,7 +41,7 @@
 #include <linux/init.h>
 #include <linux/bcd.h>
 #include <linux/profile.h>
-#include <linux/perf_event.h>
+#include <linux/irq_work.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -83,25 +83,25 @@ static struct {
 
 unsigned long est_cycle_freq;
 
-#ifdef CONFIG_PERF_EVENTS
+#ifdef CONFIG_IRQ_WORK
 
-DEFINE_PER_CPU(u8, perf_event_pending);
+DEFINE_PER_CPU(u8, irq_work_pending);
 
-#define set_perf_event_pending_flag()  __get_cpu_var(perf_event_pending) = 1
-#define test_perf_event_pending()      __get_cpu_var(perf_event_pending)
-#define clear_perf_event_pending()     __get_cpu_var(perf_event_pending) = 0
+#define set_irq_work_pending_flag()  __get_cpu_var(irq_work_pending) = 1
+#define test_irq_work_pending()      __get_cpu_var(irq_work_pending)
+#define clear_irq_work_pending()     __get_cpu_var(irq_work_pending) = 0
 
-void set_perf_event_pending(void)
+void set_irq_work_pending(void)
 {
-	set_perf_event_pending_flag();
+	set_irq_work_pending_flag();
 }
 
-#else  /* CONFIG_PERF_EVENTS */
+#else  /* CONFIG_IRQ_WORK */
 
-#define test_perf_event_pending()      0
-#define clear_perf_event_pending()
+#define test_irq_work_pending()      0
+#define clear_irq_work_pending()
 
-#endif /* CONFIG_PERF_EVENTS */
+#endif /* CONFIG_IRQ_WORK */
 
 
 static inline __u32 rpcc(void)
@@ -191,9 +191,9 @@ irqreturn_t timer_interrupt(int irq, void *dev)
 
 	write_sequnlock(&xtime_lock);
 
-	if (test_perf_event_pending()) {
-		clear_perf_event_pending();
-		perf_event_do_pending();
+	if (test_irq_work_pending()) {
+		clear_irq_work_pending();
+		irq_work_run();
 	}
 
 #ifndef CONFIG_SMP

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9c26ba7..9103904 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -23,6 +23,7 @@ config ARM
 	select HAVE_KERNEL_GZIP
 	select HAVE_KERNEL_LZO
 	select HAVE_KERNEL_LZMA
+	select HAVE_IRQ_WORK
 	select HAVE_PERF_EVENTS
 	select PERF_USE_VMALLOC
 	select HAVE_REGS_AND_STACK_ACCESS_API

arch/arm/include/asm/perf_event.h

View file

diff --git a/arch/arm/include/asm/perf_event.h b/arch/arm/include/asm/perf_event.h
index b5799a3..c4aa4e8 100644
--- a/arch/arm/include/asm/perf_event.h
+++ b/arch/arm/include/asm/perf_event.h
@@ -12,18 +12,6 @@
 #ifndef __ARM_PERF_EVENT_H__
 #define __ARM_PERF_EVENT_H__
 
-/*
- * NOP: on *most* (read: all supported) ARM platforms, the performance
- * counter interrupts are regular interrupts and not an NMI. This
- * means that when we receive the interrupt we can call
- * perf_event_do_pending() that handles all of the work with
- * interrupts disabled.
- */
-static inline void
-set_perf_event_pending(void)
-{
-}
-
 /* ARM performance counters start from 1 (in the cp15 accesses) so use the
  * same indexes here for consistency. */
 #define PERF_EVENT_INDEX_OFFSET 1

arch/arm/kernel/perf_event.c

View file

diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index ecbb028..49643b1 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -123,6 +123,12 @@ armpmu_get_max_events(void)
 }
 EXPORT_SYMBOL_GPL(armpmu_get_max_events);
 
+int perf_num_counters(void)
+{
+	return armpmu_get_max_events();
+}
+EXPORT_SYMBOL_GPL(perf_num_counters);
+
 #define HW_OP_UNSUPPORTED		0xFFFF
 
 #define C(_x) \
@@ -221,46 +227,56 @@ again:
 }
 
 static void
-armpmu_disable(struct perf_event *event)
+armpmu_read(struct perf_event *event)
 {
-	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
 	struct hw_perf_event *hwc = &event->hw;
-	int idx = hwc->idx;
-
-	WARN_ON(idx < 0);
-
-	clear_bit(idx, cpuc->active_mask);
-	armpmu->disable(hwc, idx);
-
-	barrier();
 
-	armpmu_event_update(event, hwc, idx);
-	cpuc->events[idx] = NULL;
-	clear_bit(idx, cpuc->used_mask);
+	/* Don't read disabled counters! */
+	if (hwc->idx < 0)
+		return;
 
-	perf_event_update_userpage(event);
+	armpmu_event_update(event, hwc, hwc->idx);
 }
 
 static void
-armpmu_read(struct perf_event *event)
+armpmu_stop(struct perf_event *event, int flags)
 {
 	struct hw_perf_event *hwc = &event->hw;
 
-	/* Don't read disabled counters! */
-	if (hwc->idx < 0)
+	if (!armpmu)
 		return;
 
-	armpmu_event_update(event, hwc, hwc->idx);
+	/*
+	 * ARM pmu always has to update the counter, so ignore
+	 * PERF_EF_UPDATE, see comments in armpmu_start().
+	 */
+	if (!(hwc->state & PERF_HES_STOPPED)) {
+		armpmu->disable(hwc, hwc->idx);
+		barrier(); /* why? */
+		armpmu_event_update(event, hwc, hwc->idx);
+		hwc->state |= PERF_HES_STOPPED | PERF_HES_UPTODATE;
+	}
 }
 
 static void
-armpmu_unthrottle(struct perf_event *event)
+armpmu_start(struct perf_event *event, int flags)
 {
 	struct hw_perf_event *hwc = &event->hw;
 
+	if (!armpmu)
+		return;
+
+	/*
+	 * ARM pmu always has to reprogram the period, so ignore
+	 * PERF_EF_RELOAD, see the comment below.
+	 */
+	if (flags & PERF_EF_RELOAD)
+		WARN_ON_ONCE(!(hwc->state & PERF_HES_UPTODATE));
+
+	hwc->state = 0;
 	/*
 	 * Set the period again. Some counters can't be stopped, so when we
-	 * were throttled we simply disabled the IRQ source and the counter
+	 * were stopped we simply disabled the IRQ source and the counter
 	 * may have been left counting. If we don't do this step then we may
 	 * get an interrupt too soon or *way* too late if the overflow has
 	 * happened since disabling.
@@ -269,14 +285,33 @@ armpmu_unthrottle(struct perf_event *event)
 	armpmu->enable(hwc, hwc->idx);
 }
 
+static void
+armpmu_del(struct perf_event *event, int flags)
+{
+	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+	struct hw_perf_event *hwc = &event->hw;
+	int idx = hwc->idx;
+
+	WARN_ON(idx < 0);
+
+	clear_bit(idx, cpuc->active_mask);
+	armpmu_stop(event, PERF_EF_UPDATE);
+	cpuc->events[idx] = NULL;
+	clear_bit(idx, cpuc->used_mask);
+
+	perf_event_update_userpage(event);
+}
+
 static int
-armpmu_enable(struct perf_event *event)
+armpmu_add(struct perf_event *event, int flags)
 {
 	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
 	struct hw_perf_event *hwc = &event->hw;
 	int idx;
 	int err = 0;
 
+	perf_pmu_disable(event->pmu);
+
 	/* If we don't have a space for the counter then finish early. */
 	idx = armpmu->get_event_idx(cpuc, hwc);
 	if (idx < 0) {
@@ -293,25 +328,19 @@ armpmu_enable(struct perf_event *event)
 	cpuc->events[idx] = event;
 	set_bit(idx, cpuc->active_mask);
 
-	/* Set the period for the event. */
-	armpmu_event_set_period(event, hwc, idx);
-
-	/* Enable the event. */
-	armpmu->enable(hwc, idx);
+	hwc->state = PERF_HES_STOPPED | PERF_HES_UPTODATE;
+	if (flags & PERF_EF_START)
+		armpmu_start(event, PERF_EF_RELOAD);
 
 	/* Propagate our changes to the userspace mapping. */
 	perf_event_update_userpage(event);
 
 out:
+	perf_pmu_enable(event->pmu);
 	return err;
 }
 
-static struct pmu pmu = {
-	.enable	    = armpmu_enable,
-	.disable    = armpmu_disable,