Merge tag 'perf-core-for-mingo-5.5-20191122' of... (8cacac6e) · Commits · 戴 / test

tools/include/uapi/linux/perf_event.h

+8 −2

Original line number	Diff line number	Diff line
		@@ -141,8 +141,9 @@ enum perf_event_sample_format {
		PERF_SAMPLE_TRANSACTION = 1U << 17,
		PERF_SAMPLE_REGS_INTR = 1U << 18,
		PERF_SAMPLE_PHYS_ADDR = 1U << 19,
		PERF_SAMPLE_AUX = 1U << 20,

		PERF_SAMPLE_MAX = 1U << 20, /* non-ABI */
		PERF_SAMPLE_MAX = 1U << 21, /* non-ABI */

		__PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */
		};
		@@ -300,6 +301,7 @@ enum perf_event_read_format {
		/* add: sample_stack_user */
		#define PERF_ATTR_SIZE_VER4 104 /* add: sample_regs_intr */
		#define PERF_ATTR_SIZE_VER5 112 /* add: aux_watermark */
		#define PERF_ATTR_SIZE_VER6 120 /* add: aux_sample_size */

		/*
		* Hardware event_id to monitor via a performance monitoring event:
		@@ -424,7 +426,9 @@ struct perf_event_attr {
		*/
		__u32 aux_watermark;
		__u16 sample_max_stack;
		__u16 __reserved_2; /* align to __u64 */
		__u16 __reserved_2;
		__u32 aux_sample_size;
		__u32 __reserved_3;
		};

		/*
		@@ -864,6 +868,8 @@ enum perf_event_type {
		* { u64 abi; # enum perf_sample_regs_abi
		* u64 regs[weight(mask)]; } && PERF_SAMPLE_REGS_INTR
		* { u64 phys_addr;} && PERF_SAMPLE_PHYS_ADDR
		* { u64 size;
		* char data[size]; } && PERF_SAMPLE_AUX
		* };
		*/
		PERF_RECORD_SAMPLE = 9,

tools/lib/traceevent/Makefile

+4 −4

Original line number	Diff line number	Diff line
		@@ -232,10 +232,10 @@ install_pkgconfig:

		install_headers:
		$(call QUIET_INSTALL, headers) \
		$(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
		$(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
		$(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
		$(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
		$(call do_install,event-parse.h,$(includedir_SQ),644); \
		$(call do_install,event-utils.h,$(includedir_SQ),644); \
		$(call do_install,trace-seq.h,$(includedir_SQ),644); \
		$(call do_install,kbuffer.h,$(includedir_SQ),644)

		install: install_lib

tools/lib/traceevent/parse-filter.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -1473,8 +1473,10 @@ static int copy_filter_type(struct tep_event_filter *filter,
		if (strcmp(str, "TRUE") == 0 \|\| strcmp(str, "FALSE") == 0) {
		/* Add trivial event */
		arg = allocate_arg();
		if (arg == NULL)
		if (arg == NULL) {
		free(str);
		return -1;
		}

		arg->type = TEP_FILTER_ARG_BOOLEAN;
		if (strcmp(str, "TRUE") == 0)
		@@ -1483,8 +1485,11 @@ static int copy_filter_type(struct tep_event_filter *filter,
		arg->boolean.value = 0;

		filter_type = add_filter_type(filter, event->id);
		if (filter_type == NULL)
		if (filter_type == NULL) {
		free(str);
		free_arg(arg);
		return -1;
		}

		filter_type->filter = arg;

tools/perf/Documentation/intel-pt.txt

+57 −2

Original line number	Diff line number	Diff line
		@@ -434,6 +434,56 @@ pwr_evt Enable power events. The power events provide information about
		"0" otherwise.


		AUX area sampling option
		------------------------

		To select Intel PT "sampling" the AUX area sampling option can be used:

		--aux-sample

		Optionally it can be followed by the sample size in bytes e.g.

		--aux-sample=8192

		In addition, the Intel PT event to sample must be defined e.g.

		-e intel_pt//u

		Samples on other events will be created containing Intel PT data e.g. the
		following will create Intel PT samples on the branch-misses event, note the
		events must be grouped using {}:

		perf record --aux-sample -e '{intel_pt//u,branch-misses:u}'

		An alternative to '--aux-sample' is to add the config term 'aux-sample-size' to
		events. In this case, the grouping is implied e.g.

		perf record -e intel_pt//u -e branch-misses/aux-sample-size=8192/u

		is the same as:

		perf record -e '{intel_pt//u,branch-misses/aux-sample-size=8192/u}'

		but allows for also using an address filter e.g.:

		perf record -e intel_pt//u --filter 'filter * @/bin/ls' -e branch-misses/aux-sample-size=8192/u -- ls

		It is important to select a sample size that is big enough to contain at least
		one PSB packet. If not a warning will be displayed:

		Intel PT sample size (%zu) may be too small for PSB period (%zu)

		The calculation used for that is: if sample_size <= psb_period + 256 display the
		warning. When sampling is used, psb_period defaults to 0 (2KiB).

		The default sample size is 4KiB.

		The sample size is passed in aux_sample_size in struct perf_event_attr. The
		sample size is limited by the maximum event size which is 64KiB. It is
		difficult to know how big the event might be without the trace sample attached,
		but the tool validates that the sample size is not greater than 60KiB.


		new snapshot option
		-------------------

		@@ -487,8 +537,8 @@ their mlock limit (which defaults to 64KiB but is not multiplied by the number
		of cpus).

		In full-trace mode, powers of two are allowed for buffer size, with a minimum
		size of 2 pages. In snapshot mode, it is the same but the minimum size is
		1 page.
		size of 2 pages. In snapshot mode or sampling mode, it is the same but the
		minimum size is 1 page.

		The mmap size and auxtrace mmap size are displayed if the -vv option is used e.g.

		@@ -501,12 +551,17 @@ Intel PT modes of operation

		Intel PT can be used in 2 modes:
		full-trace mode
		sample mode
		snapshot mode

		Full-trace mode traces continuously e.g.

		perf record -e intel_pt//u uname

		Sample mode attaches a Intel PT sample to other events e.g.

		perf record --aux-sample -e intel_pt//u -e branch-misses:u

		Snapshot mode captures the available data when a signal is sent e.g.

		perf record -v -e intel_pt//u -S ./loopy 1000000000 &

tools/perf/Documentation/perf-record.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,9 @@ OPTIONS
		like this: name=\'CPU_CLK_UNHALTED.THREAD:cmask=0x1\'.
		- 'aux-output': Generate AUX records instead of events. This requires
		that an AUX area event is also provided.
		- 'aux-sample-size': Set sample size for AUX area sampling. If the
		'--aux-sample' option has been used, set aux-sample-size=0 to disable
		AUX area sampling for the event.

		See the linkperf:perf-list[1] man page for more parameters.

		@@ -433,6 +436,12 @@ can be specified in a string that follows this option:
		In Snapshot Mode trace data is captured only when signal SIGUSR2 is received
		and on exit if the above 'e' option is given.

		--aux-sample[=OPTIONS]::
		Select AUX area sampling. At least one of the events selected by the -e option
		must be an AUX area event. Samples on other events will be created containing
		data from the AUX area. Optionally sample size may be specified, otherwise it
		defaults to 4KiB.

		--proc-map-timeout::
		When processing pre-existing threads /proc/XXX/mmap, it may take a long time,
		because the file may be huge. A time out is needed in such cases.

Admin message