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: Stephane 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 314add6 "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: Arnaldo Carvalho de Melo <acme@redhat.com>

17 files changed, 200 insertions, 25 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index f988d380c52f..5ebd0c3b71b6 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -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,
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 9b336fdb6f71..423875c999b2 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -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,
diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
index 791b432df847..253133a6251d 100644
--- a/tools/perf/builtin-mem.c
+++ b/tools/perf/builtin-mem.c
@@ -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,
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 9725aa375414..8e50d8d77419 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -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,
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 93a34cef9676..7f31a3ded1b6 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -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,
diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c
index 72d8881873b0..b8a7056519ac 100644
--- a/tools/perf/tests/perf-record.c
+++ b/tools/perf/tests/perf-record.c
@@ -50,7 +50,7 @@ int test__PERF_RECORD(void)
         struct perf_sample sample;
         const char *cmd = "sleep";
         const char *argv[] = { cmd, "1", NULL, };
-        char *bname;
+        char *bname, *mmap_filename;
         u64 prev_time = 0;
         bool found_cmd_mmap = false,
              found_libc_mmap = false,
@@ -212,6 +212,7 @@ int test__PERF_RECORD(void)
 
                                 if ((type == PERF_RECORD_COMM ||
                                      type == PERF_RECORD_MMAP ||
+                                     type == PERF_RECORD_MMAP2 ||
                                      type == PERF_RECORD_FORK ||
                                      type == PERF_RECORD_EXIT) &&
                                      (pid_t)event->comm.pid != evlist->workload.pid) {
@@ -220,7 +221,8 @@ int test__PERF_RECORD(void)
                                 }
 
                                 if ((type == PERF_RECORD_COMM ||
-                                     type == PERF_RECORD_MMAP) &&
+                                     type == PERF_RECORD_MMAP ||
+                                     type == PERF_RECORD_MMAP2) &&
                                      event->comm.pid != event->comm.tid) {
                                         pr_debug("%s with different pid/tid!\n", name);
                                         ++errs;
@@ -236,7 +238,12 @@ int test__PERF_RECORD(void)
                                 case PERF_RECORD_EXIT:
                                         goto found_exit;
                                 case PERF_RECORD_MMAP:
-                                        bname = strrchr(event->mmap.filename, '/');
+                                        mmap_filename = event->mmap.filename;
+                                        goto check_bname;
+                                case PERF_RECORD_MMAP2:
+                                        mmap_filename = event->mmap2.filename;
+                                check_bname:
+                                        bname = strrchr(mmap_filename, '/');
                                         if (bname != NULL) {
                                                 if (!found_cmd_mmap)
                                                         found_cmd_mmap = !strcmp(bname + 1, cmd);
@@ -245,7 +252,7 @@ int test__PERF_RECORD(void)
                                                 if (!found_ld_mmap)
                                                         found_ld_mmap = !strncmp(bname + 1, "ld", 2);