Commit 4d4abdcb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (123 commits)
  perf: Remove the nmi parameter from the oprofile_perf backend
  x86, perf: Make copy_from_user_nmi() a library function
  perf: Remove perf_event_attr::type check
  x86, perf: P4 PMU - Fix typos in comments and style cleanup
  perf tools: Make test use the preset debugfs path
  perf tools: Add automated tests for events parsing
  perf tools: De-opt the parse_events function
  perf script: Fix display of IP address for non-callchain path
  perf tools: Fix endian conversion reading event attr from file header
  perf tools: Add missing 'node' alias to the hw_cache[] array
  perf probe: Support adding probes on offline kernel modules
  perf probe: Add probed module in front of function
  perf probe: Introduce debuginfo to encapsulate dwarf information
  perf-probe: Move dwarf library routines to dwarf-aux.{c, h}
  perf probe: Remove redundant dwarf functions
  perf probe: Move strtailcmp to string.c
  perf probe: Rename DIE_FIND_CB_FOUND to DIE_FIND_CB_END
  tracing/kprobe: Update symbol reference when loading module
  tracing/kprobes: Support module init function probing
  kprobes: Return -ENOENT if probe point doesn't exist
  ...
parents 0342cbcf 7fcfd1ab

Documentation/trace/kprobetrace.txt

+5 −4
Original line number Diff line number Diff line
@@ -22,14 +22,15 @@ current_tracer. Instead of that, add probe points via 


Synopsis of kprobe_events

-------------------------

  p[:[GRP/]EVENT] SYMBOL[+offs]|MEMADDR [FETCHARGS]	: Set a probe

  r[:[GRP/]EVENT] SYMBOL[+0] [FETCHARGS]		: Set a return probe

  p[:[GRP/]EVENT] [MOD:]SYM[+offs]|MEMADDR [FETCHARGS]	: Set a probe

  r[:[GRP/]EVENT] [MOD:]SYM[+0] [FETCHARGS]		: Set a return probe

  -:[GRP/]EVENT						: Clear a probe



 GRP		: Group name. If omitted, use "kprobes" for it.

 EVENT		: Event name. If omitted, the event name is generated

		  based on SYMBOL+offs or MEMADDR.

 SYMBOL[+offs]	: Symbol+offset where the probe is inserted.

		  based on SYM+offs or MEMADDR.

 MOD		: Module name which has given SYM.

 SYM[+offs]	: Symbol+offset where the probe is inserted.

 MEMADDR	: Address where the probe is inserted.



 FETCHARGS	: Arguments. Each probe can have up to 128 args.

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1290,6 +1290,7 @@ help: 
	@echo  '  make O=dir [targets] Locate all output files in "dir", including .config'

	@echo  '  make C=1   [targets] Check all c source with $$CHECK (sparse by default)'

	@echo  '  make C=2   [targets] Force check of all c source with $$CHECK'

	@echo  '  make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'

	@echo  '  make W=n   [targets] Enable extra gcc checks, n=1,2,3 where'

	@echo  '		1: warnings which may be relevant and do not occur too often'

	@echo  '		2: warnings which occur quite often but may still be relevant'

arch/alpha/kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr, 
	data.period = event->hw.last_period;



	if (alpha_perf_event_set_period(event, hwc, idx)) {

		if (perf_event_overflow(event, 1, &data, regs)) {

		if (perf_event_overflow(event, &data, regs)) {

			/* Interrupts coming too quickly; "throttle" the

			 * counter, i.e., disable it for a little while.

			 */

arch/alpha/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ DEFINE_PER_CPU(u8, irq_work_pending); 
#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_irq_work_pending(void)

void arch_irq_work_raise(void)

{

	set_irq_work_pending_flag();

}

arch/arm/kernel/perf_event_v6.c

+29 −1
Original line number Diff line number Diff line
@@ -173,6 +173,20 @@ static const unsigned armv6_perf_cache_map[PERF_COUNT_HW_CACHE_MAX] 
			[C(RESULT_MISS)]	= CACHE_OP_UNSUPPORTED,

		},

	},

	[C(NODE)] = {

		[C(OP_READ)] = {

			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,

			[C(RESULT_MISS)]	= CACHE_OP_UNSUPPORTED,

		},

		[C(OP_WRITE)] = {

			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,

			[C(RESULT_MISS)]	= CACHE_OP_UNSUPPORTED,

		},

		[C(OP_PREFETCH)] = {

			[C(RESULT_ACCESS)]	= CACHE_OP_UNSUPPORTED,

			[C(RESULT_MISS)]	= CACHE_OP_UNSUPPORTED,

		},

	},

};



enum armv6mpcore_perf_types {
@@ -310,6 +324,20 @@ static const unsigned armv6mpcore_perf_cache_map[PERF_COUNT_HW_CACHE_MAX] 
			[C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,

		},

	},

	[C(NODE)] = {

		[C(OP_READ)] = {

			[C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,

			[C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,

		},

		[C(OP_WRITE)] = {

			[C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,

			[C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,

		},

		[C(OP_PREFETCH)] = {

			[C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,

			[C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,

		},

	},

};



static inline unsigned long
@@ -479,7 +507,7 @@ armv6pmu_handle_irq(int irq_num, 
		if (!armpmu_event_set_period(event, hwc, idx))

			continue;



		if (perf_event_overflow(event, 0, &data, regs))

		if (perf_event_overflow(event, &data, regs))

			armpmu->disable(hwc, idx);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE