Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ff2b289 authored May 22, 2012 by Linus Torvalds

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

Pull perf changes from Ingo Molnar:
 "Lots of changes:

   - (much) improved assembly annotation support in perf report, with
     jump visualization, searching, navigation, visual output
     improvements and more.

    - kernel support for AMD IBS PMU hardware features.  Notably 'perf
      record -e cycles:p' and 'perf top -e cycles:p' should work without
      skid now, like PEBS does on the Intel side, because it takes
      advantage of IBS transparently.

    - the libtracevents library: it is the first step towards unifying
      tracing tooling and perf, and it also gives a tracing library for
      external tools like powertop to rely on.

    - infrastructure: various improvements and refactoring of the UI
      modules and related code

    - infrastructure: cleanup and simplification of the profiling
      targets code (--uid, --pid, --tid, --cpu, --all-cpus, etc.)

    - tons of robustness fixes all around

    - various ftrace updates: speedups, cleanups, robustness
      improvements.

    - typing 'make' in tools/ will now give you a menu of projects to
      build and a short help text to explain what each does.

    - ... and lots of other changes I forgot to list.

  The perf record make bzImage + perf report regression you reported
  should be fixed."

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (166 commits)
  tracing: Remove kernel_lock annotations
  tracing: Fix initial buffer_size_kb state
  ring-buffer: Merge separate resize loops
  perf evsel: Create events initially disabled -- again
  perf tools: Split term type into value type and term type
  perf hists: Fix callchain ip printf format
  perf target: Add uses_mmap field
  ftrace: Remove selecting FRAME_POINTER with FUNCTION_TRACER
  ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()
  ftrace: Make ftrace_modify_all_code() global for archs to use
  ftrace: Return record ip addr for ftrace_location()
  ftrace: Consolidate ftrace_location() and ftrace_text_reserved()
  ftrace: Speed up search by skipping pages by address
  ftrace: Remove extra helper functions
  ftrace: Sort all function addresses, not just per page
  tracing: change CPU ring buffer state from tracing_cpumask
  tracing: Check return value of tracing_dentry_percpu()
  ring-buffer: Reset head page before running self test
  ring-buffer: Add integrity check at end of iter read
  ring-buffer: Make addition of pages in ring buffer atomic
  ...

parents 88d6ae8d 73787190

Makefile

+7 −0

Original line number	Diff line number	Diff line
		@@ -1471,6 +1471,13 @@ kernelrelease:
		kernelversion:
		@echo $(KERNELVERSION)

		# Clear a bunch of variables before executing the submake
		tools/: FORCE
		$(Q)$(MAKE) LDFLAGS= MAKEFLAGS= -C $(src)/tools/

		tools/%: FORCE
		$(Q)$(MAKE) LDFLAGS= MAKEFLAGS= -C $(src)/tools/ $*

		# Single targets
		# ---------------------------------------------------------------------------
		# Single targets are compatible with:

arch/alpha/kernel/perf_event.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -824,7 +824,6 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr,

		idx = la_ptr;

		perf_sample_data_init(&data, 0);
		for (j = 0; j < cpuc->n_events; j++) {
		if (cpuc->current_idx[j] == idx)
		break;
		@@ -848,7 +847,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr,

		hwc = &event->hw;
		alpha_perf_event_update(event, hwc, idx, alpha_pmu->pmc_max_period[idx]+1);
		data.period = event->hw.last_period;
		perf_sample_data_init(&data, 0, hwc->last_period);

		if (alpha_perf_event_set_period(event, hwc, idx)) {
		if (perf_event_overflow(event, &data, regs)) {

arch/arm/configs/bcmring_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ CONFIG_KALLSYMS_EXTRA_PASS=y
		# CONFIG_TIMERFD is not set
		# CONFIG_EVENTFD is not set
		# CONFIG_AIO is not set
		CONFIG_PERF_COUNTERS=y
		CONFIG_PERF_EVENTS=y
		# CONFIG_VM_EVENT_COUNTERS is not set
		# CONFIG_SLUB_DEBUG is not set
		# CONFIG_COMPAT_BRK is not set

arch/arm/kernel/perf_event_v6.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -489,8 +489,6 @@ armv6pmu_handle_irq(int irq_num,
		*/
		armv6_pmcr_write(pmcr);

		perf_sample_data_init(&data, 0);

		cpuc = &__get_cpu_var(cpu_hw_events);
		for (idx = 0; idx < cpu_pmu->num_events; ++idx) {
		struct perf_event *event = cpuc->events[idx];
		@@ -509,7 +507,7 @@ armv6pmu_handle_irq(int irq_num,

		hwc = &event->hw;
		armpmu_event_update(event, hwc, idx);
		data.period = event->hw.last_period;
		perf_sample_data_init(&data, 0, hwc->last_period);
		if (!armpmu_event_set_period(event, hwc, idx))
		continue;

arch/arm/kernel/perf_event_v7.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1077,8 +1077,6 @@ static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev)
		*/
		regs = get_irq_regs();

		perf_sample_data_init(&data, 0);

		cpuc = &__get_cpu_var(cpu_hw_events);
		for (idx = 0; idx < cpu_pmu->num_events; ++idx) {
		struct perf_event *event = cpuc->events[idx];
		@@ -1097,7 +1095,7 @@ static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev)

		hwc = &event->hw;
		armpmu_event_update(event, hwc, idx);
		data.period = event->hw.last_period;
		perf_sample_data_init(&data, 0, hwc->last_period);
		if (!armpmu_event_set_period(event, hwc, idx))
		continue;