Commit c81b995f 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 fixes from Thomas Gleixner:
 "A pile of perf updates:

  Kernel side:

   - Remove an incorrect warning in uprobe_init_insn() when
     insn_get_length() fails. The error return code is handled at the
     call site.

   - Move the inline keyword to the right place in the perf ringbuffer
     code to address a W=1 build warning.

  Tooling:

  perf stat:

   - Fix metric column header display alignment

   - Improve error messages for default attributes, providing better
     output for error in command line.

   - Add --interval-clear option, to provide a 'watch' like printing

  perf script:

   - Show hw-cache events too

  perf c2c:

   - Fix data dependency problem in layout of 'struct c2c_hist_entry'

  Core:

   - Do not blindly assume that 'struct perf_evsel' can be obtained via
     a straight forward container_of() as there are call sites which
     hand in a plain 'struct hist' which is not part of a container.

   - Fix error index in the PMU event parser, so that error messages can
     point to the problematic token"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/core: Move the inline keyword at the beginning of the function declaration
  uprobes/x86: Remove incorrect WARN_ON() in uprobe_init_insn()
  perf script: Show hw-cache events
  perf c2c: Keep struct hist_entry at the end of struct c2c_hist_entry
  perf stat: Add event parsing error handling to add_default_attributes
  perf stat: Allow to specify specific metric column len
  perf stat: Fix metric column header display alignment
  perf stat: Use only color_fprintf call in print_metric_only
  perf stat: Add --interval-clear option
  perf tools: Fix error index for pmu event parser
  perf hists: Reimplement hists__has_callchains()
  perf hists browser gtk: Use hist_entry__has_callchains()
  perf hists: Make hist_entry__has_callchains() work with 'perf c2c'
  perf hists: Save the callchain_size in struct hist_entry
parents 2ce413ec 57d6a793

arch/x86/kernel/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool 
	insn_init(insn, auprobe->insn, sizeof(auprobe->insn), x86_64);

	/* has the side-effect of processing the entire instruction */

	insn_get_length(insn);

	if (WARN_ON_ONCE(!insn_complete(insn)))

	if (!insn_complete(insn))

		return -ENOEXEC;



	if (is_prefix_bad(insn))

kernel/events/ring_buffer.c

+3 −3
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ out: 
	preempt_enable();

}



static bool __always_inline

static __always_inline bool

ring_buffer_has_space(unsigned long head, unsigned long tail,

		      unsigned long data_size, unsigned int size,

		      bool backward)
@@ -114,7 +114,7 @@ ring_buffer_has_space(unsigned long head, unsigned long tail, 
		return CIRC_SPACE(tail, head, data_size) >= size;

}



static int __always_inline

static __always_inline int

__perf_output_begin(struct perf_output_handle *handle,

		    struct perf_event *event, unsigned int size,

		    bool backward)
@@ -414,7 +414,7 @@ err: 
}

EXPORT_SYMBOL_GPL(perf_aux_output_begin);



static bool __always_inline rb_need_aux_wakeup(struct ring_buffer *rb)

static __always_inline bool rb_need_aux_wakeup(struct ring_buffer *rb)

{

	if (rb->aux_overwrite)

		return false;

tools/perf/Documentation/perf-stat.txt

+3 −0
Original line number Diff line number Diff line
@@ -178,6 +178,9 @@ Print count deltas for fixed number of times. 
This option should be used together with "-I" option.

	example: 'perf stat -I 1000 --interval-count 2 -e cycles -a'



--interval-clear::

Clear the screen before next interval.



--timeout msecs::

Stop the 'perf stat' session and print count deltas after N milliseconds (minimum: 10 ms).

This option is not supported with the "-I" option.

tools/perf/builtin-c2c.c

+5 −5
Original line number Diff line number Diff line
@@ -56,16 +56,16 @@ struct c2c_hist_entry { 


	struct compute_stats	 cstats;



	unsigned long		 paddr;

	unsigned long		 paddr_cnt;

	bool			 paddr_zero;

	char			*nodestr;



	/*

	 * must be at the end,

	 * because of its callchain dynamic entry

	 */

	struct hist_entry	he;



	unsigned long		 paddr;

	unsigned long		 paddr_cnt;

	bool			 paddr_zero;

	char			*nodestr;

};



static char const *coalesce_default = "pid,iaddr";

tools/perf/builtin-script.c

+12 −0
Original line number Diff line number Diff line
@@ -180,6 +180,18 @@ static struct { 
				  PERF_OUTPUT_EVNAME | PERF_OUTPUT_TRACE

	},



	[PERF_TYPE_HW_CACHE] = {

		.user_set = false,



		.fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |

			      PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |

			      PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |

			      PERF_OUTPUT_SYM | PERF_OUTPUT_SYMOFFSET |

			      PERF_OUTPUT_DSO | PERF_OUTPUT_PERIOD,



		.invalid_fields = PERF_OUTPUT_TRACE | PERF_OUTPUT_BPF_OUTPUT,

	},



	[PERF_TYPE_RAW] = {

		.user_set = false,

CRA Git | Maintained and supported by SUSTech CRA and CCSE