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

Commit 5c5e854b authored by Stephane Eranian's avatar Stephane Eranian Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add attr->mmap2 support 



This patch adds support for the new PERF_RECORD_MMAP2 record type
exposed by the kernel. This is an extended PERF_RECORD_MMAP record.

It adds for each file-backed mapping the device major, minor number and
the inode number and generation.

This triplet uniquely identifies the source of a file-backed mapping. It
can be used to detect identical virtual mappings between processes, for
instance.

The patch will prefer MMAP2 over MMAP.

Signed-off-by: default avatarStephane Eranian <eranian@google.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1377079825-19057-3-git-send-email-eranian@google.com


[ Cope with 314add6b "Change machine__findnew_thread() to set thread pid",
  fix 'perf test' regression test entry affected,
  use perf_missing_features.mmap2 to fallback to not using .mmap2 in older kernels,
  so that new tools can work with kernels where this feature is not present ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e71aa283

tools/perf/builtin-annotate.c

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) 
		.tool = {

			.sample	= process_sample_event,

			.mmap	= perf_event__process_mmap,

			.mmap2	= perf_event__process_mmap2,

			.comm	= perf_event__process_comm,

			.exit	= perf_event__process_exit,

			.fork	= perf_event__process_fork,

tools/perf/builtin-inject.c

+15 −0
Original line number Diff line number Diff line
@@ -123,6 +123,19 @@ static int perf_event__repipe_mmap(struct perf_tool *tool, 
	return err;

}



static int perf_event__repipe_mmap2(struct perf_tool *tool,

				   union perf_event *event,

				   struct perf_sample *sample,

				   struct machine *machine)

{

	int err;



	err = perf_event__process_mmap2(tool, event, sample, machine);

	perf_event__repipe(tool, event, sample, machine);



	return err;

}



static int perf_event__repipe_fork(struct perf_tool *tool,

				   union perf_event *event,

				   struct perf_sample *sample,
@@ -339,6 +352,7 @@ static int __cmd_inject(struct perf_inject *inject) 


	if (inject->build_ids || inject->sched_stat) {

		inject->tool.mmap	  = perf_event__repipe_mmap;

		inject->tool.mmap2	  = perf_event__repipe_mmap2;

		inject->tool.fork	  = perf_event__repipe_fork;

		inject->tool.tracing_data = perf_event__repipe_tracing_data;

	}
@@ -390,6 +404,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
		.tool = {

			.sample		= perf_event__repipe_sample,

			.mmap		= perf_event__repipe,

			.mmap2		= perf_event__repipe,

			.comm		= perf_event__repipe,

			.fork		= perf_event__repipe,

			.exit		= perf_event__repipe,

tools/perf/builtin-mem.c

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ int cmd_mem(int argc, const char **argv, const char *prefix __maybe_unused) 
		.tool = {

			.sample		= process_sample_event,

			.mmap		= perf_event__process_mmap,

			.mmap2		= perf_event__process_mmap2,

			.comm		= perf_event__process_comm,

			.lost		= perf_event__process_lost,

			.fork		= perf_event__process_fork,

tools/perf/builtin-report.c

+1 −0
Original line number Diff line number Diff line
@@ -744,6 +744,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 
		.tool = {

			.sample		 = process_sample_event,

			.mmap		 = perf_event__process_mmap,

			.mmap2		 = perf_event__process_mmap2,

			.comm		 = perf_event__process_comm,

			.exit		 = perf_event__process_exit,

			.fork		 = perf_event__process_fork,

tools/perf/builtin-script.c

+1 −0
Original line number Diff line number Diff line
@@ -542,6 +542,7 @@ static int process_sample_event(struct perf_tool *tool __maybe_unused, 
static struct perf_tool perf_script = {

	.sample		 = process_sample_event,

	.mmap		 = perf_event__process_mmap,

	.mmap2		 = perf_event__process_mmap2,

	.comm		 = perf_event__process_comm,

	.exit		 = perf_event__process_exit,

	.fork		 = perf_event__process_fork,