diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-10-30 15:30:38 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-10-31 08:57:53 -0400 |
commit | 2f967f1dbbc1f746ad0deda8352bcf563d59e1c7 (patch) | |
tree | e72d49db875e7c97b461a887dbab76cac8f4212d /tools | |
parent | fbd7458db75790e37903c75be68513a4c087737c (diff) |
perf trace beauty: Use the mmap flags table generated from headers
Instead of requiring us to go on and edit sources to add new flag.
# perf trace -e *mmap sleep 0.1
0.025 ( 0.005 ms): sleep/29876 mmap(len: 163746, prot: READ, flags: PRIVATE, fd: 3) = 0x7faa68ad1000
0.059 ( 0.004 ms): sleep/29876 mmap(len: 8192, prot: READ|WRITE, flags: PRIVATE|ANONYMOUS) = 0x7faa68acf000
0.069 ( 0.006 ms): sleep/29876 mmap(len: 3889792, prot: EXEC|READ, flags: PRIVATE|DENYWRITE, fd: 3) = 0x7faa6851f000
0.086 ( 0.009 ms): sleep/29876 mmap(addr: 0x7faa688cb000, len: 24576, prot: READ|WRITE, flags: PRIVATE|FIXED|DENYWRITE, fd: 3, off: 1753088) = 0x7faa688cb000
0.101 ( 0.005 ms): sleep/29876 mmap(addr: 0x7faa688d1000, len: 14976, prot: READ|WRITE, flags: PRIVATE|FIXED|ANONYMOUS) = 0x7faa688d1000
0.348 ( 0.005 ms): sleep/29876 mmap(len: 111950656, prot: READ, flags: PRIVATE, fd: 3) = 0x7faa61a5b000
#
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-ggmoy6vxoygh5yim890ht0kf@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/trace/beauty/mmap.c | 48 |
1 files changed, 11 insertions, 37 deletions
diff --git a/tools/perf/trace/beauty/mmap.c b/tools/perf/trace/beauty/mmap.c index 0605593552c6..c534bd96ef5c 100644 --- a/tools/perf/trace/beauty/mmap.c +++ b/tools/perf/trace/beauty/mmap.c | |||
@@ -1,5 +1,6 @@ | |||
1 | // SPDX-License-Identifier: LGPL-2.1 | 1 | // SPDX-License-Identifier: LGPL-2.1 |
2 | #include <uapi/linux/mman.h> | 2 | #include <uapi/linux/mman.h> |
3 | #include <linux/log2.h> | ||
3 | 4 | ||
4 | static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, | 5 | static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, |
5 | struct syscall_arg *arg) | 6 | struct syscall_arg *arg) |
@@ -30,50 +31,23 @@ static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, | |||
30 | 31 | ||
31 | #define SCA_MMAP_PROT syscall_arg__scnprintf_mmap_prot | 32 | #define SCA_MMAP_PROT syscall_arg__scnprintf_mmap_prot |
32 | 33 | ||
34 | static size_t mmap__scnprintf_flags(unsigned long flags, char *bf, size_t size) | ||
35 | { | ||
36 | #include "trace/beauty/generated/mmap_flags_array.c" | ||
37 | static DEFINE_STRARRAY(mmap_flags); | ||
38 | |||
39 | return strarray__scnprintf_flags(&strarray__mmap_flags, bf, size, flags); | ||
40 | } | ||
41 | |||
33 | static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, | 42 | static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, |
34 | struct syscall_arg *arg) | 43 | struct syscall_arg *arg) |
35 | { | 44 | { |
36 | int printed = 0, flags = arg->val; | 45 | unsigned long flags = arg->val; |
37 | 46 | ||
38 | if (flags & MAP_ANONYMOUS) | 47 | if (flags & MAP_ANONYMOUS) |
39 | arg->mask |= (1 << 4) | (1 << 5); /* Mask 4th ('fd') and 5th ('offset') args, ignored */ | 48 | arg->mask |= (1 << 4) | (1 << 5); /* Mask 4th ('fd') and 5th ('offset') args, ignored */ |
40 | 49 | ||
41 | #define P_MMAP_FLAG(n) \ | 50 | return mmap__scnprintf_flags(flags, bf, size); |
42 | if (flags & MAP_##n) { \ | ||
43 | printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", #n); \ | ||
44 | flags &= ~MAP_##n; \ | ||
45 | } | ||
46 | |||
47 | P_MMAP_FLAG(SHARED); | ||
48 | P_MMAP_FLAG(PRIVATE); | ||
49 | #ifdef MAP_32BIT | ||
50 | P_MMAP_FLAG(32BIT); | ||
51 | #endif | ||
52 | P_MMAP_FLAG(ANONYMOUS); | ||
53 | P_MMAP_FLAG(DENYWRITE); | ||
54 | P_MMAP_FLAG(EXECUTABLE); | ||
55 | P_MMAP_FLAG(FILE); | ||
56 | P_MMAP_FLAG(FIXED); | ||
57 | #ifdef MAP_FIXED_NOREPLACE | ||
58 | P_MMAP_FLAG(FIXED_NOREPLACE); | ||
59 | #endif | ||
60 | P_MMAP_FLAG(GROWSDOWN); | ||
61 | P_MMAP_FLAG(HUGETLB); | ||
62 | P_MMAP_FLAG(LOCKED); | ||
63 | P_MMAP_FLAG(NONBLOCK); | ||
64 | P_MMAP_FLAG(NORESERVE); | ||
65 | P_MMAP_FLAG(POPULATE); | ||
66 | P_MMAP_FLAG(STACK); | ||
67 | P_MMAP_FLAG(UNINITIALIZED); | ||
68 | #ifdef MAP_SYNC | ||
69 | P_MMAP_FLAG(SYNC); | ||
70 | #endif | ||
71 | #undef P_MMAP_FLAG | ||
72 | |||
73 | if (flags) | ||
74 | printed += scnprintf(bf + printed, size - printed, "%s%#x", printed ? "|" : "", flags); | ||
75 | |||
76 | return printed; | ||
77 | } | 51 | } |
78 | 52 | ||
79 | #define SCA_MMAP_FLAGS syscall_arg__scnprintf_mmap_flags | 53 | #define SCA_MMAP_FLAGS syscall_arg__scnprintf_mmap_flags |