From 0f476f2bbc1b46f76f9383dfe647858a888549aa Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 26 Apr 2018 11:30:50 -0300 Subject: [PATCH] perf machine: Set PROT_EXEC for executable PERF_RECORD_MMAP records The kernel doesn't fill the map 'prot' field for PERF_RECORD_MMAP records, and we will use that info to replace checking for MAP__VARIABLE, so store that when processing the PERF_RECORD_MISC_MMAP_DATA perf_event_attr.header.misc bit. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: https://lkml.kernel.org/n/tip-es3zz9r0q2qlssg4wh1w1d8p@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/machine.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 3422ef67ec21..53bc2fb88be4 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -24,6 +24,7 @@ #include "sane_ctype.h" #include +#include static void __machine__remove_thread(struct machine *machine, struct thread *th, bool lock); @@ -1457,6 +1458,7 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event struct thread *thread; struct map *map; enum map_type type; + u32 prot = 0; int ret = 0; if (dump_trace) @@ -1477,12 +1479,14 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event if (event->header.misc & PERF_RECORD_MISC_MMAP_DATA) type = MAP__VARIABLE; - else + else { type = MAP__FUNCTION; + prot = PROT_EXEC; + } map = map__new(machine, event->mmap.start, event->mmap.len, event->mmap.pgoff, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, prot, 0, event->mmap.filename, type, thread);