diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-04-26 11:30:50 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-04-26 13:47:19 -0300 |
| commit | 0f476f2bbc1b46f76f9383dfe647858a888549aa (patch) | |
| tree | 9466b0c5a2fe4c0635ae4ffcc737a99b41ed12d6 /tools/perf/util/machine.c | |
| parent | af30bffa2f9aa73a648ea932ed468dc3031ac1f9 (diff) | |
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 <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-es3zz9r0q2qlssg4wh1w1d8p@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/machine.c')
| -rw-r--r-- | tools/perf/util/machine.c | 8 |
1 files 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 <symbol/kallsyms.h> +#include <linux/mman.h> 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); |