Commit-ID:  fbe26abe118ee1262b4ab0d12fefd42647eaea35
Gitweb:     http://git.kernel.org/tip/fbe26abe118ee1262b4ab0d12fefd42647eaea35
Author:     Jiri Olsa <jo...@kernel.org>
AuthorDate: Mon, 14 Jul 2014 17:57:19 +0200
Committer:  Ingo Molnar <mi...@kernel.org>
CommitDate: Wed, 16 Jul 2014 13:31:22 +0200

perf: Add vm_ops->name call for mmap event name retrieval

The following patch added another way to get mmap name: 78d683e838a6
("mm, fs: Add vm_ops->name as an alternative to arch_vma_name")

The vdso vma mapping already switch to this and we no longer get vdso
name via arch_vma_name function. Adding this way to the perf mmap
event name retrieval code.

Caught this via perf test:

  $ sudo ./perf test -v 7
   7: Validate PERF_RECORD_* events & perf_sample fields     :
  --- start ---

SNIP

  PERF_RECORD_MMAP for [vdso] missing!
  test child finished with 255
  ---- end ----
  Validate PERF_RECORD_* events & perf_sample fields: FAILED!

Signed-off-by: Jiri Olsa <jo...@kernel.org>
Acked-by: Andy Lutomirski <l...@amacapital.net>
Signed-off-by: Peter Zijlstra <pet...@infradead.org>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Arnaldo Carvalho de Melo <a...@kernel.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Corey Ashford <cjash...@linux.vnet.ibm.com>
Cc: David Ahern <dsah...@gmail.com>
Cc: Frederic Weisbecker <fweis...@gmail.com>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Link: 
http://lkml.kernel.org/r/1405353439-14211-1-git-send-email-jo...@kernel.org
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
 kernel/events/core.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 67e3b9c..4799676 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5266,6 +5266,12 @@ static void perf_event_mmap_event(struct perf_mmap_event 
*mmap_event)
 
                goto got_name;
        } else {
+               if (vma->vm_ops && vma->vm_ops->name) {
+                       name = (char *) vma->vm_ops->name(vma);
+                       if (name)
+                               goto cpy_name;
+               }
+
                name = (char *)arch_vma_name(vma);
                if (name)
                        goto cpy_name;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to