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

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

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

Pull perf updates from Ingo Molnar:
 "Mostly tooling and PMU driver fixes, but also a number of late updates
  such as the reworking of the call-chain size limiting logic to make
  call-graph recording more robust, plus tooling side changes for the
  new 'backwards ring-buffer' extension to the perf ring-buffer"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (34 commits)
  perf record: Read from backward ring buffer
  perf record: Rename variable to make code clear
  perf record: Prevent reading invalid data in record__mmap_read
  perf evlist: Add API to pause/resume
  perf trace: Use the ptr->name beautifier as default for "filename" args
  perf trace: Use the fd->name beautifier as default for "fd" args
  perf report: Add srcline_from/to branch sort keys
  perf evsel: Record fd into perf_mmap
  perf evsel: Add overwrite attribute and check write_backward
  perf tools: Set buildid dir under symfs when --symfs is provided
  perf trace: Only auto set call-graph to "dwarf" when syscalls are being traced
  perf annotate: Sort list of recognised instructions
  perf annotate: Fix identification of ARM blt and bls instructions
  perf tools: Fix usage of max_stack sysctl
  perf callchain: Stop validating callchains by the max_stack sysctl
  perf trace: Fix exit_group() formatting
  perf top: Use machine->kptr_restrict_warned
  perf trace: Warn when trying to resolve kernel addresses with kptr_restrict=1
  perf machine: Do not bail out if not managing to read ref reloc symbol
  perf/x86/intel/p4: Trival indentation fix, remove space
  ...
parents c4a34600 0c9f790f

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

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -8881,6 +8881,7 @@ F: arch/*/kernel/*/perf_event*.c 
F:	arch/*/kernel/*/*/perf_event*.c

F:	arch/*/include/asm/perf_event.h

F:	arch/*/kernel/perf_callchain.c

F:	arch/*/events/*

F:	tools/perf/



PERSONALITY HANDLING

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;