Commit 3c659eed authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add id index 



Add an index of the event identifiers, in preparation for Intel PT.

The event id (also called the sample id) is a unique number
allocated by the kernel to the event created by perf_event_open().  Events
can include the event id by having a sample type including PERF_SAMPLE_ID or
PERF_SAMPLE_IDENTIFIER.

Currently the main use of the event id is to match an event back to the
evsel to which it belongs i.e. perf_evlist__id2evsel()

The purpose of this patch is to make it possible to match an event back to
the mmap from which it was read.  The reason that is useful is because the
mmap represents a time-ordered context (either for a cpu or for a thread).
Intel PT decodes trace information on that basis.  In full-trace mode, that
information can be recorded when the Intel PT trace is read, but in
sample-mode the Intel PT trace data is embedded in a sample and it is in
that case that the "id index" is needed.

So the mmaps are numbered (idx) and the cpu and tid recorded against the id
by perf_evlist__set_sid_idx() which is called by perf_evlist__mmap_per_evsel().

That information is recorded on the perf.data file in the new "id index".
idx, cpu and tid are added to struct perf_sample_id (which is the node of
evlist's hash table to match ids to evsels).  The information can be
retrieved using perf_evlist__id2sid().  Note however this all depends on
having a sample type including PERF_SAMPLE_ID or PERF_SAMPLE_IDENTIFIER,
otherwise ids are not recorded.

The "id index" is a synthesized event record which will be created when
Intel PT sampling is used by calling perf_event__synthesize_id_index().

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1414417770-18602-2-git-send-email-adrian.hunter@intel.com


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

tools/perf/builtin-inject.c

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
			.tracing_data	= perf_event__repipe_op2_synth,

			.finished_round	= perf_event__repipe_op2_synth,

			.build_id	= perf_event__repipe_op2_synth,

			.id_index	= perf_event__repipe_op2_synth,

		},

		.input_name  = "-",

		.samples = LIST_HEAD_INIT(inject.samples),

tools/perf/util/event.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ static const char *perf_event__names[] = { 
	[PERF_RECORD_HEADER_TRACING_DATA]	= "TRACING_DATA",

	[PERF_RECORD_HEADER_BUILD_ID]		= "BUILD_ID",

	[PERF_RECORD_FINISHED_ROUND]		= "FINISHED_ROUND",

	[PERF_RECORD_ID_INDEX]			= "ID_INDEX",

};



const char *perf_event__name(unsigned int id)

tools/perf/util/event.h

+15 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ enum perf_user_event_type { /* above any possible kernel type */ 
	PERF_RECORD_HEADER_TRACING_DATA		= 66,

	PERF_RECORD_HEADER_BUILD_ID		= 67,

	PERF_RECORD_FINISHED_ROUND		= 68,

	PERF_RECORD_ID_INDEX			= 69,

	PERF_RECORD_HEADER_MAX

};
@@ -239,6 +240,19 @@ struct tracing_data_event { 
	u32 size;

};



struct id_index_entry {

	u64 id;

	u64 idx;

	u64 cpu;

	u64 tid;

};



struct id_index_event {

	struct perf_event_header header;

	u64 nr;

	struct id_index_entry entries[0];

};



union perf_event {

	struct perf_event_header	header;

	struct mmap_event		mmap;
@@ -253,6 +267,7 @@ union perf_event { 
	struct event_type_event		event_type;

	struct tracing_data_event	tracing_data;

	struct build_id_event		build_id;

	struct id_index_event		id_index;

};



void perf_event__print_totals(void);

tools/perf/util/evlist.c

+23 −3
Original line number Diff line number Diff line
@@ -527,6 +527,22 @@ static int perf_evlist__id_add_fd(struct perf_evlist *evlist, 
	return 0;

}



static void perf_evlist__set_sid_idx(struct perf_evlist *evlist,

				     struct perf_evsel *evsel, int idx, int cpu,

				     int thread)

{

	struct perf_sample_id *sid = SID(evsel, cpu, thread);

	sid->idx = idx;

	if (evlist->cpus && cpu >= 0)

		sid->cpu = evlist->cpus->map[cpu];

	else

		sid->cpu = -1;

	if (!evsel->system_wide && evlist->threads && thread >= 0)

		sid->tid = evlist->threads->map[thread];

	else

		sid->tid = -1;

}



struct perf_sample_id *perf_evlist__id2sid(struct perf_evlist *evlist, u64 id)

{

	struct hlist_head *head;
@@ -805,9 +821,13 @@ static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx, 
			return -1;

		}



		if ((evsel->attr.read_format & PERF_FORMAT_ID) &&

		    perf_evlist__id_add_fd(evlist, evsel, cpu, thread, fd) < 0)

		if (evsel->attr.read_format & PERF_FORMAT_ID) {

			if (perf_evlist__id_add_fd(evlist, evsel, cpu, thread,

						   fd) < 0)

				return -1;

			perf_evlist__set_sid_idx(evlist, evsel, idx, cpu,

						 thread);

		}

	}



	return 0;

tools/perf/util/evsel.h

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ struct perf_sample_id { 
	struct hlist_node 	node;

	u64		 	id;

	struct perf_evsel	*evsel;

	int			idx;

	int			cpu;

	pid_t			tid;



	/* Holds total ID period value for PERF_SAMPLE_READ processing. */

	u64			period;

CRA Git | Maintained and supported by SUSTech CRA and CCSE