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

Commit 21f77d23 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-20160516' of... 

Merge tag 'perf-core-for-mingo-20160516' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

- Honour the kernel.perf_event_max_stack knob more precisely by not counting
  PERF_CONTEXT_{KERNEL,USER} when deciding when to stop adding entries to
  the perf_sample->ip_callchain[] array (Arnaldo Carvalho de Melo)

- Fix identation of 'stalled-backend-cycles' in 'perf stat' (Namhyung Kim)

- Update runtime using 'cpu-clock' event in 'perf stat' (Namhyung Kim)

- Use 'cpu-clock' for cpu targets in 'perf stat' (Namhyung Kim)

- Avoid fractional digits for integer scales in 'perf stat' (Andi Kleen)

- Store vdso buildid unconditionally, as it appears in callchains and
  we're not checking those when creating the build-id table, so we
  end up not being able to resolve VDSO symbols when doing analysis
  on a different machine than the one where recording was done, possibly
  of a different arch even (arm -> x86_64) (He Kuang)

Infrastructure changes:

- Generalize max_stack sysctl handler, will be used for configuring
  multiple kernel knobs related to callchains (Arnaldo Carvalho de Melo)

Cleanups:

- Introduce DSO__NAME_KALLSYMS and DSO__NAME_KCORE, to stop using
  open coded strings (Masami Hiramatsu)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b0a434fb a29d5c9b

Documentation/sysctl/kernel.txt

+14 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ show up in /proc/sys/kernel: 
- perf_cpu_time_max_percent

- perf_event_paranoid

- perf_event_max_stack

- perf_event_max_contexts_per_stack

- pid_max

- powersave-nap               [ PPC only ]

- printk
@@ -668,6 +669,19 @@ The default value is 127. 


==============================================================



perf_event_max_contexts_per_stack:



Controls maximum number of stack frame context entries for

(attr.sample_type & PERF_SAMPLE_CALLCHAIN) configured events, for

instance, when using 'perf record -g' or 'perf trace --call-graph fp'.



This can only be done when no events are in use that have callchains

enabled, otherwise writing to this file will return -EBUSY.



The default value is 8.



==============================================================



pid_max:



PID allocation wrap value.  When the kernel's next PID value

arch/arc/kernel/perf_event.c

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct arc_callchain_trace { 
static int callchain_trace(unsigned int addr, void *data)

{

	struct arc_callchain_trace *ctrl = data;

	struct perf_callchain_entry *entry = ctrl->perf_stuff;

	struct perf_callchain_entry_ctx *entry = ctrl->perf_stuff;

	perf_callchain_store(entry, addr);



	if (ctrl->depth++ < 3)
@@ -58,7 +58,7 @@ static int callchain_trace(unsigned int addr, void *data) 
}



void

perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)

perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)

{

	struct arc_callchain_trace ctrl = {

		.depth = 0,
@@ -69,7 +69,7 @@ perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs) 
}



void

perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)

perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)

{

	/*

	 * User stack can't be unwound trivially with kernel dwarf unwinder

arch/arm/kernel/perf_callchain.c

+5 −5
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct frame_tail { 
 */

static struct frame_tail __user *

user_backtrace(struct frame_tail __user *tail,

	       struct perf_callchain_entry *entry)

	       struct perf_callchain_entry_ctx *entry)

{

	struct frame_tail buftail;

	unsigned long err;
@@ -59,7 +59,7 @@ user_backtrace(struct frame_tail __user *tail, 
}



void

perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)

perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)

{

	struct frame_tail __user *tail;
@@ -75,7 +75,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) 


	tail = (struct frame_tail __user *)regs->ARM_fp - 1;



	while ((entry->nr < sysctl_perf_event_max_stack) &&

	while ((entry->nr < entry->max_stack) &&

	       tail && !((unsigned long)tail & 0x3))

		tail = user_backtrace(tail, entry);

}
@@ -89,13 +89,13 @@ static int 
callchain_trace(struct stackframe *fr,

		void *data)

{

	struct perf_callchain_entry *entry = data;

	struct perf_callchain_entry_ctx *entry = data;

	perf_callchain_store(entry, fr->pc);

	return 0;

}



void

perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)

perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)

{

	struct stackframe fr;

arch/arm64/kernel/perf_callchain.c

+7 −7
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct frame_tail { 
 */

static struct frame_tail __user *

user_backtrace(struct frame_tail __user *tail,

	       struct perf_callchain_entry *entry)

	       struct perf_callchain_entry_ctx *entry)

{

	struct frame_tail buftail;

	unsigned long err;
@@ -76,7 +76,7 @@ struct compat_frame_tail { 


static struct compat_frame_tail __user *

compat_user_backtrace(struct compat_frame_tail __user *tail,

		      struct perf_callchain_entry *entry)

		      struct perf_callchain_entry_ctx *entry)

{

	struct compat_frame_tail buftail;

	unsigned long err;
@@ -106,7 +106,7 @@ compat_user_backtrace(struct compat_frame_tail __user *tail, 
}

#endif /* CONFIG_COMPAT */



void perf_callchain_user(struct perf_callchain_entry *entry,

void perf_callchain_user(struct perf_callchain_entry_ctx *entry,

			 struct pt_regs *regs)

{

	if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
@@ -122,7 +122,7 @@ void perf_callchain_user(struct perf_callchain_entry *entry, 


		tail = (struct frame_tail __user *)regs->regs[29];



		while (entry->nr < sysctl_perf_event_max_stack &&

		while (entry->nr < entry->max_stack &&

		       tail && !((unsigned long)tail & 0xf))

			tail = user_backtrace(tail, entry);

	} else {
@@ -132,7 +132,7 @@ void perf_callchain_user(struct perf_callchain_entry *entry, 


		tail = (struct compat_frame_tail __user *)regs->compat_fp - 1;



		while ((entry->nr < sysctl_perf_event_max_stack) &&

		while ((entry->nr < entry->max_stack) &&

			tail && !((unsigned long)tail & 0x3))

			tail = compat_user_backtrace(tail, entry);

#endif
@@ -146,12 +146,12 @@ void perf_callchain_user(struct perf_callchain_entry *entry, 
 */

static int callchain_trace(struct stackframe *frame, void *data)

{

	struct perf_callchain_entry *entry = data;

	struct perf_callchain_entry_ctx *entry = data;

	perf_callchain_store(entry, frame->pc);

	return 0;

}



void perf_callchain_kernel(struct perf_callchain_entry *entry,

void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,

			   struct pt_regs *regs)

{

	struct stackframe frame;

arch/metag/kernel/perf_callchain.c

+5 −5
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static bool is_valid_call(unsigned long calladdr) 


static struct metag_frame __user *

user_backtrace(struct metag_frame __user *user_frame,

	       struct perf_callchain_entry *entry)

	       struct perf_callchain_entry_ctx *entry)

{

	struct metag_frame frame;

	unsigned long calladdr;
@@ -56,7 +56,7 @@ user_backtrace(struct metag_frame __user *user_frame, 
}



void

perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)

perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)

{

	unsigned long sp = regs->ctx.AX[0].U0;

	struct metag_frame __user *frame;
@@ -65,7 +65,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) 


	--frame;



	while ((entry->nr < sysctl_perf_event_max_stack) && frame)

	while ((entry->nr < entry->max_stack) && frame)

		frame = user_backtrace(frame, entry);

}
@@ -78,13 +78,13 @@ static int 
callchain_trace(struct stackframe *fr,

		void *data)

{

	struct perf_callchain_entry *entry = data;

	struct perf_callchain_entry_ctx *entry = data;

	perf_callchain_store(entry, fr->pc);

	return 0;

}



void

perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)

perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)

{

	struct stackframe fr;