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

Commit 61929785 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-fixes-for-linus' of... 

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

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
  trace, filters: Initialize the match variable in process_ops() properly
  trace, documentation: Fix branch profiling location in debugfs
  oprofile, s390: Cleanups
  oprofile, s390: Remove hwsampler_files.c and merge it into init.c
  perf: Fix tear-down of inherited group events
  perf: Reorder & optimize perf_event_context to remove alignment padding on 64 bit builds
  perf: Handle stopped state with tracepoints
  perf: Fix the software events state check
  perf, powerpc: Handle events that raise an exception without overflowing
  perf, x86: Use INTEL_*_CONSTRAINT() for all PEBS event constraints
  perf, x86: Clean up SandyBridge PEBS events
  perf lock: Fix sorting by wait_min
  perf tools: Version incorrect with some versions of grep
  perf evlist: New command to list the names of events present in a perf.data file
  perf script: Add support for H/W and S/W events
  perf script: Add support for dumping symbols
  perf script: Support custom field selection for output
  perf script: Move printing of 'common' data from print_event and rename
  perf tracing: Remove print_graph_cpu and print_graph_proc from trace-event-parse
  perf script: Change process_event prototype
  ...
parents e16b396c 1ef1d1c2

arch/powerpc/include/asm/reg.h

+1 −0
Original line number Diff line number Diff line
@@ -892,6 +892,7 @@ 
#define PV_970		0x0039

#define PV_POWER5	0x003A

#define PV_POWER5p	0x003B

#define PV_POWER7	0x003F

#define PV_970FX	0x003C

#define PV_630		0x0040

#define PV_630p	0x0041

arch/powerpc/kernel/perf_event.c

+23 −1
Original line number Diff line number Diff line
@@ -1269,6 +1269,28 @@ unsigned long perf_instruction_pointer(struct pt_regs *regs) 
	return ip;

}



static bool pmc_overflow(unsigned long val)

{

	if ((int)val < 0)

		return true;



	/*

	 * Events on POWER7 can roll back if a speculative event doesn't

	 * eventually complete. Unfortunately in some rare cases they will

	 * raise a performance monitor exception. We need to catch this to

	 * ensure we reset the PMC. In all cases the PMC will be 256 or less

	 * cycles from overflow.

	 *

	 * We only do this if the first pass fails to find any overflowing

	 * PMCs because a user might set a period of less than 256 and we

	 * don't want to mistakenly reset them.

	 */

	if (__is_processor(PV_POWER7) && ((0x80000000 - val) <= 256))

		return true;



	return false;

}



/*

 * Performance monitor interrupt stuff

 */
@@ -1316,7 +1338,7 @@ static void perf_event_interrupt(struct pt_regs *regs) 
			if (is_limited_pmc(i + 1))

				continue;

			val = read_pmc(i + 1);

			if ((int)val < 0)

			if (pmc_overflow(val))

				write_pmc(i + 1, 0);

		}

	}

arch/s390/oprofile/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \ 
		oprofilefs.o oprofile_stats.o  \

		timer_int.o )



oprofile-y				:= $(DRIVER_OBJS) init.o backtrace.o
 
oprofile-y :=	$(DRIVER_OBJS) init.o backtrace.o hwsampler.o