Commit 6e052cfe authored by James Clark's avatar James Clark Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Dump callchain context marker names 



These are hard to interpret in the raw output because they are printed
as hex but are defined in perf_event.h as decimal. Make it much easier
to read the raw callchains by just printing their names.

For example:

  $ perf report -D

  1798195372321 0x4638 [0xb0]: PERF_RECORD_SAMPLE(IP, 0x4002): 44922/44922: 0x7c8046dd3400 period: 120218 addr: 0
  ... FP chain: nr:12
  .....  0: fffffffffffffe00 (PERF_CONTEXT_USER)
  .....  1: 00007c8046dd3400
  .....  2: 00007c8046db86d3

Reviewed-by: default avatarIan Rogers <irogers@google.com>
Signed-off-by: default avatarJames Clark <james.clark@linaro.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
[ Add PERF_CONTEXT_USER_DEFERRED too, as per Namhyung's review comment ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a66f6242

tools/perf/util/session.c

+25 −2
Original line number Diff line number Diff line
@@ -841,6 +841,28 @@ static void callchain__lbr_callstack_printf(struct perf_sample *sample) 
	}

}



static const char *callchain_context_str(u64 ip)

{

	switch (ip) {

	case PERF_CONTEXT_HV:

		return " (PERF_CONTEXT_HV)";

	case PERF_CONTEXT_KERNEL:

		return " (PERF_CONTEXT_KERNEL)";

	case PERF_CONTEXT_USER:

		return " (PERF_CONTEXT_USER)";

	case PERF_CONTEXT_GUEST:

		return " (PERF_CONTEXT_GUEST)";

	case PERF_CONTEXT_GUEST_KERNEL:

		return " (PERF_CONTEXT_GUEST_KERNEL)";

	case PERF_CONTEXT_GUEST_USER:

		return " (PERF_CONTEXT_GUEST_USER)";

	case PERF_CONTEXT_USER_DEFERRED:

		return " (PERF_CONTEXT_USER_DEFERRED)";

	default:

		return "";

	}

}



static void callchain__printf(struct evsel *evsel,

			      struct perf_sample *sample)

{
@@ -853,8 +875,9 @@ static void callchain__printf(struct evsel *evsel, 
	printf("... FP chain: nr:%" PRIu64 "\n", callchain->nr);



	for (i = 0; i < callchain->nr; i++)

		printf("..... %2d: %016" PRIx64 "\n",

		       i, callchain->ips[i]);

		printf("..... %2d: %016" PRIx64 "%s\n",

		       i, callchain->ips[i],

		       callchain_context_str(callchain->ips[i]));



	if (sample->deferred_callchain)

		printf("...... (deferred)\n");