1 files changed, 11 insertions, 4 deletions

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);
                                         } else if (!found_vdso_mmap)
-                                                found_vdso_mmap = !strcmp(event->mmap.filename, "[vdso]");
+                                                found_vdso_mmap = !strcmp(mmap_filename, "[vdso]");
                                         break;
 
                                 case PERF_RECORD_SAMPLE: