[PATCH 11/15] perf tools: Add support to display build id for mmap2 events

[Jiri Olsa]

Adding support to display build id in mmap2 events:

  $ perf script --show-mmap-events | head -4
  swapper ... @ 0xffffffff81000000 <ff1969b3ba5e43911208bb46fa7d5b1eb809e422>]: 
---p [kernel.kallsyms]_text
  swapper ... @ 0 <5f62adb730272c9417883ae8b8a8ec224df8cddd>]: ---p 
/lib/modules/5.9.0-rc5buildid+/kernel/drivers/firmware/qemu_fw_cfg.ko
  swapper ... @ 0 <c9ac6e1dafc1ebdadb048f967854e810706c8bab>]: ---p 
/lib/modules/5.9.0-rc5buildid+/kernel/drivers/char/virtio_console.ko
  swapper ... @ 0 <86441a4c5b2c2ff5b440682f4c612bd4b426eb5c>]: ---p 
/lib/modules/5.9.0-rc5buildid+/kernel/lib/libcrc32c.ko

  $ perf report -D | grep MMAP2 | head -4
  0 0 ... @ 0xffffffff81000000 <ff1969b3ba5e43911208bb46fa7d5b1eb809e422>]: 
---p [kernel.kallsyms]_text
  0 0 ... @ 0 <5f62adb730272c9417883ae8b8a8ec224df8cddd>]: ---p 
/lib/modules/5.9.0-rc5buildid+/kernel/drivers/firmware/qemu_fw_cfg.ko
  0 0 ... @ 0 <c9ac6e1dafc1ebdadb048f967854e810706c8bab>]: ---p 
/lib/modules/5.9.0-rc5buildid+/kernel/drivers/char/virtio_console.ko
  0 0 ... @ 0 <86441a4c5b2c2ff5b440682f4c612bd4b426eb5c>]: ---p 
/lib/modules/5.9.0-rc5buildid+/kernel/lib/libcrc32c.ko

Adding build id data into <> brackets.

Acked-by: Ian Rogers <irog...@google.com>
Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
 tools/perf/util/event.c | 41 ++++++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 05616d4138a9..fbe8578e4c47 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -288,17 +288,36 @@ size_t perf_event__fprintf_mmap(union perf_event *event, 
FILE *fp)
 
 size_t perf_event__fprintf_mmap2(union perf_event *event, FILE *fp)
 {
-       return fprintf(fp, " %d/%d: [%#" PRI_lx64 "(%#" PRI_lx64 ") @ %#" 
PRI_lx64
-                          " %02x:%02x %"PRI_lu64" %"PRI_lu64"]: %c%c%c%c %s\n",
-                      event->mmap2.pid, event->mmap2.tid, event->mmap2.start,
-                      event->mmap2.len, event->mmap2.pgoff, event->mmap2.maj,
-                      event->mmap2.min, event->mmap2.ino,
-                      event->mmap2.ino_generation,
-                      (event->mmap2.prot & PROT_READ) ? 'r' : '-',
-                      (event->mmap2.prot & PROT_WRITE) ? 'w' : '-',
-                      (event->mmap2.prot & PROT_EXEC) ? 'x' : '-',
-                      (event->mmap2.flags & MAP_SHARED) ? 's' : 'p',
-                      event->mmap2.filename);
+       if (event->header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) {
+               char sbuild_id[SBUILD_ID_SIZE];
+               struct build_id bid;
+
+               build_id__init(&bid, event->mmap2.build_id,
+                              event->mmap2.build_id_size);
+               build_id__sprintf(&bid, sbuild_id);
+
+               return fprintf(fp, " %d/%d: [%#" PRI_lx64 "(%#" PRI_lx64 ") @ 
%#" PRI_lx64
+                                  " <%s>]: %c%c%c%c %s\n",
+                              event->mmap2.pid, event->mmap2.tid, 
event->mmap2.start,
+                              event->mmap2.len, event->mmap2.pgoff, sbuild_id,
+                              (event->mmap2.prot & PROT_READ) ? 'r' : '-',
+                              (event->mmap2.prot & PROT_WRITE) ? 'w' : '-',
+                              (event->mmap2.prot & PROT_EXEC) ? 'x' : '-',
+                              (event->mmap2.flags & MAP_SHARED) ? 's' : 'p',
+                              event->mmap2.filename);
+       } else {
+               return fprintf(fp, " %d/%d: [%#" PRI_lx64 "(%#" PRI_lx64 ") @ 
%#" PRI_lx64
+                                  " %02x:%02x %"PRI_lu64" %"PRI_lu64"]: 
%c%c%c%c %s\n",
+                              event->mmap2.pid, event->mmap2.tid, 
event->mmap2.start,
+                              event->mmap2.len, event->mmap2.pgoff, 
event->mmap2.maj,
+                              event->mmap2.min, event->mmap2.ino,
+                              event->mmap2.ino_generation,
+                              (event->mmap2.prot & PROT_READ) ? 'r' : '-',
+                              (event->mmap2.prot & PROT_WRITE) ? 'w' : '-',
+                              (event->mmap2.prot & PROT_EXEC) ? 'x' : '-',
+                              (event->mmap2.flags & MAP_SHARED) ? 's' : 'p',
+                              event->mmap2.filename);
+       }
 }
 
 size_t perf_event__fprintf_thread_map(union perf_event *event, FILE *fp)
-- 
2.26.2