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

Commit 36db171c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull perf updates from Ingo Molnar:
 "Bigger kernel side changes:

   - Add backwards writing capability to the perf ring-buffer code,
     which is preparation for future advanced features like robust
     'overwrite support' and snapshot mode.  (Wang Nan)

   - Add pause and resume ioctls for the perf ringbuffer (Wang Nan)

   - x86 Intel cstate code cleanups and reorgnization (Thomas Gleixner)

   - x86 Intel uncore and CPU PMU driver updates (Kan Liang, Peter
     Zijlstra)

   - x86 AUX (Intel PT) related enhancements and updates (Alexander
     Shishkin)

   - x86 MSR PMU driver enhancements and updates (Huang Rui)

   - ... and lots of other changes spread out over 40+ commits.

  Biggest tooling side changes:

   - 'perf trace' features and enhancements.  (Arnaldo Carvalho de Melo)

   - BPF tooling updates (Wang Nan)

   - 'perf sched' updates (Jiri Olsa)

   - 'perf probe' updates (Masami Hiramatsu)

   - ... plus 200+ other enhancements, fixes and cleanups to tools/

  The merge commits, the shortlog and the changelogs contain a lot more
  details"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (249 commits)
  perf/core: Disable the event on a truncated AUX record
  perf/x86/intel/pt: Generate PMI in the STOP region as well
  perf buildid-cache: Use lsdir() for looking up buildid caches
  perf symbols: Use lsdir() for the search in kcore cache directory
  perf tools: Use SBUILD_ID_SIZE where applicable
  perf tools: Fix lsdir to set errno correctly
  perf trace: Move seccomp args beautifiers to tools/perf/trace/beauty/
  perf trace: Move flock op beautifier to tools/perf/trace/beauty/
  perf build: Add build-test for debug-frame on arm/arm64
  perf build: Add build-test for libunwind cross-platforms support
  perf script: Fix export of callchains with recursion in db-export
  perf script: Fix callchain addresses in db-export
  perf script: Fix symbol insertion behavior in db-export
  perf symbols: Add dso__insert_symbol function
  perf scripting python: Use Py_FatalError instead of die()
  perf tools: Remove xrealloc and ALLOC_GROW
  perf help: Do not use ALLOC_GROW in add_cmd_list
  perf pmu: Make pmu_formats_string to check return value of strbuf
  perf header: Make topology checkers to check return value of strbuf
  perf tools: Make alias handler to check return value of strbuf
  ...
parents 3469d261 3f56e687

Documentation/sysctl/kernel.txt

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

- perf_cpu_time_max_percent

- perf_event_paranoid

- perf_event_max_stack

- pid_max

- powersave-nap               [ PPC only ]

- printk
@@ -654,6 +655,19 @@ users (without CAP_SYS_ADMIN). The default value is 2. 


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



perf_event_max_stack:



Controls maximum number of stack frames to copy 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 127.



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



pid_max:



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

arch/arm/kernel/hw_breakpoint.c

+2 −2
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) 
	info->address &= ~alignment_mask;

	info->ctrl.len <<= offset;



	if (!bp->overflow_handler) {

	if (is_default_overflow_handler(bp)) {

		/*

		 * Mismatch breakpoints are required for single-stepping

		 * breakpoints.
@@ -754,7 +754,7 @@ static void watchpoint_handler(unsigned long addr, unsigned int fsr, 
		 * mismatch breakpoint so we can single-step over the

		 * watchpoint trigger.

		 */

		if (!wp->overflow_handler)

		if (is_default_overflow_handler(wp))

			enable_single_step(wp, instruction_pointer(regs));



unlock:

arch/arm/kernel/perf_callchain.c

+1 −1
Original line number Diff line number Diff line
@@ -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 < PERF_MAX_STACK_DEPTH) &&

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

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

		tail = user_backtrace(tail, entry);

}

arch/arm64/kernel/hw_breakpoint.c

+2 −2
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static int breakpoint_handler(unsigned long unused, unsigned int esr, 
		perf_bp_event(bp, regs);



		/* Do we need to handle the stepping? */

		if (!bp->overflow_handler)

		if (is_default_overflow_handler(bp))

			step = 1;

unlock:

		rcu_read_unlock();
@@ -712,7 +712,7 @@ static int watchpoint_handler(unsigned long addr, unsigned int esr, 
		perf_bp_event(wp, regs);



		/* Do we need to handle the stepping? */

		if (!wp->overflow_handler)

		if (is_default_overflow_handler(wp))

			step = 1;



unlock:

arch/arm64/kernel/perf_callchain.c

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ void perf_callchain_user(struct perf_callchain_entry *entry, 


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



		while (entry->nr < PERF_MAX_STACK_DEPTH &&

		while (entry->nr < sysctl_perf_event_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 < PERF_MAX_STACK_DEPTH) &&

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

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

			tail = compat_user_backtrace(tail, entry);

#endif