Commit 0c3a6ef4 authored Apr 19, 2016 by Arnaldo Carvalho de Melo

perf trace: Make --pf maj/min/all use callchains too

Forgot about page faults, a software event, when adding support for callchains,
fix it:

  # trace --no-syscalls --pf maj --call dwarf
     0.000 ( 0.000 ms): Xorg/2068 majfault [sfbSegment1+0x0] => /usr/lib64/xorg/modules/drivers/intel_drv.so@0x11b490 (x.)
                                       sfbSegment1+0x0 (/usr/lib64/xorg/modules/drivers/intel_drv.so)
                                       fbPolySegment32+0x361 (/usr/lib64/xorg/modules/drivers/intel_drv.so)
                                       sna_poly_segment+0x743 (/usr/lib64/xorg/modules/drivers/intel_drv.so)
                                       damagePolySegment+0x77 (/usr/libexec/Xorg)
                                       ProcPolySegment+0xe7 (/usr/libexec/Xorg)
                                       Dispatch+0x25f (/usr/libexec/Xorg)
                                       dix_main+0x3c3 (/usr/libexec/Xorg)
                                       __libc_start_main+0xf0 (/usr/lib64/libc-2.22.so)
                                       _start+0x29 (/usr/libexec/Xorg)
     0.257 ( 0.000 ms): Xorg/2068 majfault [miZeroClipLine+0x0] => /usr/libexec/Xorg@0x18e830 (x.)
                                       miZeroClipLine+0x0 (/usr/libexec/Xorg)
                                       _fbSegment+0x2c0 (/usr/lib64/xorg/modules/drivers/intel_drv.so)
                                       sfbSegment1+0x67 (/usr/lib64/xorg/modules/drivers/intel_drv.so)
                                       fbPolySegment32+0x361 (/usr/lib64/xorg/modules/drivers/intel_drv.so)
                                       sna_poly_segment+0x743 (/usr/lib64/xorg/modules/drivers/intel_drv.so)
                                       damagePolySegment+0x77 (/usr/libexec/Xorg)
                                       ProcPolySegment+0xe7 (/usr/libexec/Xorg)
                                       Dispatch+0x25f (/usr/libexec/Xorg)
                                       dix_main+0x3c3 (/usr/libexec/Xorg)
                                       __libc_start_main+0xf0 (/usr/lib64/libc-2.22.so)
                                       _start+0x29 (/usr/libexec/Xorg)
^C#

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-8h6ssirw5z15qyhy2lwd6f89@git.kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 0ae537cb

tools/perf/builtin-trace.c

+41 −18

Original line number	Diff line number	Diff line
		@@ -2222,6 +2222,11 @@ static int trace__pgfault(struct trace *trace,
		print_location(trace->output, sample, &al, true, false);

		fprintf(trace->output, " (%c%c)\n", map_type, al.level);

		if (sample->callchain) {
		if (trace__resolve_callchain(trace, evsel, sample, &callchain_cursor) == 0)
		trace__fprintf_callchain(trace, sample);
		}
		out:
		err = 0;
		out_put:
		@@ -2547,9 +2552,26 @@ static int trace__run(struct trace trace, int argc, const char *argv)

		perf_evlist__config(evlist, &trace->opts, NULL);

		if (callchain_param.enabled && trace->syscalls.events.sys_exit) {
		if (callchain_param.enabled) {
		bool use_identifier = false;

		if (trace->syscalls.events.sys_exit) {
		perf_evsel__config_callchain(trace->syscalls.events.sys_exit,
		&trace->opts, &callchain_param);
		use_identifier = true;
		}

		if (pgfault_maj) {
		perf_evsel__config_callchain(pgfault_maj, &trace->opts, &callchain_param);
		use_identifier = true;
		}

		if (pgfault_min) {
		perf_evsel__config_callchain(pgfault_min, &trace->opts, &callchain_param);
		use_identifier = true;
		}

		if (use_identifier) {
		/*
		* Now we have evsels with different sample_ids, use
		* PERF_SAMPLE_IDENTIFIER to map from sample to evsel
		@@ -2566,6 +2588,7 @@ static int trace__run(struct trace trace, int argc, const char *argv)
		perf_evlist__set_sample_bit(evlist, IDENTIFIER);
		perf_evlist__reset_sample_bit(evlist, ID);
		}
		}

		signal(SIGCHLD, sig_handler);
		signal(SIGINT, sig_handler);

Admin message