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

Commit e9def1b2 authored by David Carrillo-Cisneros's avatar David Carrillo-Cisneros Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add feature header record to pipe-mode 



Add header record types to pipe-mode, reusing the functions
used in file-mode and leveraging the new struct feat_fd.

For alignment, check that synthesized events don't exceed
pagesize.

Add the perf_event__synthesize_feature event call back to
process the new header records.

Before this patch:

  $ perf record -o - -e cycles sleep 1 | perf report --stdio --header
  [ perf record: Woken up 1 times to write data ]
  [ perf record: Captured and wrote 0.000 MB - ]
  ...

After this patch:
  $ perf record -o - -e cycles sleep 1 | perf report --stdio --header
  # ========
  # captured on: Mon May 22 16:33:43 2017
  # ========
  #
  # hostname : my_hostname
  # os release : 4.11.0-dbx-up_perf
  # perf version : 4.11.rc6.g6277c80
  # arch : x86_64
  # nrcpus online : 72
  # nrcpus avail : 72
  # cpudesc : Intel(R) Xeon(R) CPU E5-2696 v3 @ 2.30GHz
  # cpuid : GenuineIntel,6,63,2
  # total memory : 263457192 kB
  # cmdline : /root/perf record -o - -e cycles -c 100000 sleep 1
  # HEADER_CPU_TOPOLOGY info available, use -I to display
  # HEADER_NUMA_TOPOLOGY info available, use -I to display
  # pmu mappings: intel_bts = 6, uncore_imc_4 = 22, uncore_sbox_1 = 47, uncore_cbox_5 = 33, uncore_ha_0 = 16, uncore_cbox
  [ perf record: Woken up 1 times to write data ]
  [ perf record: Captured and wrote 0.000 MB - ]
  ...

Support added for the subcommands: report, inject, annotate and script.

Signed-off-by: default avatarDavid Carrillo-Cisneros <davidcc@google.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Simon Que <sque@chromium.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20170718042549.145161-16-davidcc@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 114f709e

tools/perf/Documentation/perf.data-file-format.txt

+8 −2
Original line number Diff line number Diff line
@@ -398,6 +398,11 @@ struct auxtrace_error_event { 
	char msg[MAX_AUXTRACE_ERROR_MSG];

};



	PERF_RECORD_HEADER_FEATURE		= 80,



Describes a header feature. These are records used in pipe-mode that

contain information that otherwise would be in perf.data file's header.



Event types



Define the event attributes with their IDs.
@@ -422,8 +427,9 @@ struct perf_pipe_file_header { 
};



The information about attrs, data, and event_types is instead in the

synthesized events PERF_RECORD_ATTR, PERF_RECORD_HEADER_TRACING_DATA and

PERF_RECORD_HEADER_EVENT_TYPE that are generated by perf record in pipe-mode.

synthesized events PERF_RECORD_ATTR, PERF_RECORD_HEADER_TRACING_DATA,

PERF_RECORD_HEADER_EVENT_TYPE, and PERF_RECORD_HEADER_FEATURE

that are generated by perf record in pipe-mode.





References:

tools/perf/builtin-annotate.c

+1 −0
Original line number Diff line number Diff line
@@ -397,6 +397,7 @@ int cmd_annotate(int argc, const char **argv) 
			.namespaces = perf_event__process_namespaces,

			.attr	= perf_event__process_attr,

			.build_id = perf_event__process_build_id,

			.feature	= perf_event__process_feature,

			.ordered_events = true,

			.ordering_requires_timestamps = true,

		},

tools/perf/builtin-inject.c

+1 −0
Original line number Diff line number Diff line
@@ -770,6 +770,7 @@ int cmd_inject(int argc, const char **argv) 
			.finished_round	= perf_event__repipe_oe_synth,

			.build_id	= perf_event__repipe_op2_synth,

			.id_index	= perf_event__repipe_op2_synth,

			.feature	= perf_event__repipe_op2_synth,

		},

		.input_name  = "-",

		.samples = LIST_HEAD_INIT(inject.samples),

tools/perf/builtin-record.c

+7 −0
Original line number Diff line number Diff line
@@ -799,6 +799,13 @@ static int record__synthesize(struct record *rec, bool tail) 
		return 0;



	if (file->is_pipe) {

		err = perf_event__synthesize_features(

			tool, session, rec->evlist, process_synthesized_event);

		if (err < 0) {

			pr_err("Couldn't synthesize features.\n");

			return err;

		}



		err = perf_event__synthesize_attrs(tool, session,

						   process_synthesized_event);

		if (err < 0) {

tools/perf/builtin-report.c

+1 −0
Original line number Diff line number Diff line
@@ -718,6 +718,7 @@ int cmd_report(int argc, const char **argv) 
			.id_index	 = perf_event__process_id_index,

			.auxtrace_info	 = perf_event__process_auxtrace_info,

			.auxtrace	 = perf_event__process_auxtrace,

			.feature	 = perf_event__process_feature,

			.ordered_events	 = true,

			.ordering_requires_timestamps = true,

		},