aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/tests/kmod-path.c
diff options
context:
space:
mode:
authorWang Nan <wangnan0@huawei.com>2015-06-03 04:52:21 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-06-03 09:02:38 -0400
commit1f121b03d058dd07199d8924373d3c52a207f63b (patch)
treef8fe8788f068105ea71719e0c942b2ac6d1d599d /tools/perf/tests/kmod-path.c
parent4fc62a89dc607cee4f75f6dbb102cd6215fd0d64 (diff)
perf tools: Deal with kernel module names in '[]' correctly
Before patch ba92732e9808 ('perf kmaps: Check kmaps to make code more robust'), 'perf report' and 'perf annotate' will segfault if trace data contains kernel module information like this: # perf report -D -i ./perf.data ... 0 0 0x188 [0x50]: PERF_RECORD_MMAP -1/0: [0xffffffbff1018000(0xf068000) @ 0]: x [test_module] ... # perf report -i ./perf.data --objdump=/path/to/objdump --kallsyms=/path/to/kallsyms perf: Segmentation fault -------- backtrace -------- /path/to/perf[0x503478] /lib64/libc.so.6(+0x3545f)[0x7fb201f3745f] /path/to/perf[0x499b56] /path/to/perf(dso__load_kallsyms+0x13c)[0x49b56c] /path/to/perf(dso__load+0x72e)[0x49c21e] /path/to/perf(map__load+0x6e)[0x4ae9ee] /path/to/perf(thread__find_addr_map+0x24c)[0x47deec] /path/to/perf(perf_event__preprocess_sample+0x88)[0x47e238] /path/to/perf[0x43ad02] /path/to/perf[0x4b55bc] /path/to/perf(ordered_events__flush+0xca)[0x4b57ea] /path/to/perf[0x4b1a01] /path/to/perf(perf_session__process_events+0x3be)[0x4b428e] /path/to/perf(cmd_report+0xf11)[0x43bfc1] /path/to/perf[0x474702] /path/to/perf(main+0x5f5)[0x42de95] /lib64/libc.so.6(__libc_start_main+0xf4)[0x7fb201f23bd4] /path/to/perf[0x42dfc4] This is because __kmod_path__parse treats '[' leading names as kernel name instead of names of kernel module. If perf.data contains build information and the buildid of such modules can be found, the dso->kernel of it will be set to DSO_TYPE_KERNEL by __event_process_build_id(), not kernel module. It will then be passed to dso__load() -> dso__load_kernel_sym() -> dso__load_kcore() if --kallsyms is provided. The refered patch adds NULL pointer checker to avoid segfault. However, such kernel modules are still processed incorrectly. This patch fixes __kmod_path__parse, makes it treat names like '[test_module]' as kernel modules. kmod-path.c is also update to reflect the above changes. Signed-off-by: Wang Nan <wangnan0@huawei.com> Acked-by: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Zefan Li <lizefan@huawei.com> Link: http://lkml.kernel.org/r/1433321541-170245-1-git-send-email-wangnan0@huawei.com [ Fixed the merged with 0443f36b0de0 ("perf machine: Fix the search for the kernel DSO on the unified list" ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/tests/kmod-path.c')
-rw-r--r--tools/perf/tests/kmod-path.c72
1 files changed, 72 insertions, 0 deletions
diff --git a/tools/perf/tests/kmod-path.c b/tools/perf/tests/kmod-path.c
index e8d7cbb9320c..08c433b4bf4f 100644
--- a/tools/perf/tests/kmod-path.c
+++ b/tools/perf/tests/kmod-path.c
@@ -34,9 +34,21 @@ static int test(const char *path, bool alloc_name, bool alloc_ext,
34 return 0; 34 return 0;
35} 35}
36 36
37static int test_is_kernel_module(const char *path, int cpumode, bool expect)
38{
39 TEST_ASSERT_VAL("is_kernel_module",
40 (!!is_kernel_module(path, cpumode)) == (!!expect));
41 pr_debug("%s (cpumode: %d) - is_kernel_module: %s\n",
42 path, cpumode, expect ? "true" : "false");
43 return 0;
44}
45
37#define T(path, an, ae, k, c, n, e) \ 46#define T(path, an, ae, k, c, n, e) \
38 TEST_ASSERT_VAL("failed", !test(path, an, ae, k, c, n, e)) 47 TEST_ASSERT_VAL("failed", !test(path, an, ae, k, c, n, e))
39 48
49#define M(path, c, e) \
50 TEST_ASSERT_VAL("failed", !test_is_kernel_module(path, c, e))
51
40int test__kmod_path__parse(void) 52int test__kmod_path__parse(void)
41{ 53{
42 /* path alloc_name alloc_ext kmod comp name ext */ 54 /* path alloc_name alloc_ext kmod comp name ext */
@@ -44,30 +56,90 @@ int test__kmod_path__parse(void)
44 T("/xxxx/xxxx/x-x.ko", false , true , true, false, NULL , NULL); 56 T("/xxxx/xxxx/x-x.ko", false , true , true, false, NULL , NULL);
45 T("/xxxx/xxxx/x-x.ko", true , false , true, false, "[x_x]", NULL); 57 T("/xxxx/xxxx/x-x.ko", true , false , true, false, "[x_x]", NULL);
46 T("/xxxx/xxxx/x-x.ko", false , false , true, false, NULL , NULL); 58 T("/xxxx/xxxx/x-x.ko", false , false , true, false, NULL , NULL);
59 M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_CPUMODE_UNKNOWN, true);
60 M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_KERNEL, true);
61 M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_USER, false);
47 62
48 /* path alloc_name alloc_ext kmod comp name ext */ 63 /* path alloc_name alloc_ext kmod comp name ext */
49 T("/xxxx/xxxx/x.ko.gz", true , true , true, true, "[x]", "gz"); 64 T("/xxxx/xxxx/x.ko.gz", true , true , true, true, "[x]", "gz");
50 T("/xxxx/xxxx/x.ko.gz", false , true , true, true, NULL , "gz"); 65 T("/xxxx/xxxx/x.ko.gz", false , true , true, true, NULL , "gz");
51 T("/xxxx/xxxx/x.ko.gz", true , false , true, true, "[x]", NULL); 66 T("/xxxx/xxxx/x.ko.gz", true , false , true, true, "[x]", NULL);
52 T("/xxxx/xxxx/x.ko.gz", false , false , true, true, NULL , NULL); 67 T("/xxxx/xxxx/x.ko.gz", false , false , true, true, NULL , NULL);
68 M("/xxxx/xxxx/x.ko.gz", PERF_RECORD_MISC_CPUMODE_UNKNOWN, true);
69 M("/xxxx/xxxx/x.ko.gz", PERF_RECORD_MISC_KERNEL, true);
70 M("/xxxx/xxxx/x.ko.gz", PERF_RECORD_MISC_USER, false);
53 71
54 /* path alloc_name alloc_ext kmod comp name ext */ 72 /* path alloc_name alloc_ext kmod comp name ext */
55 T("/xxxx/xxxx/x.gz", true , true , false, true, "x.gz" ,"gz"); 73 T("/xxxx/xxxx/x.gz", true , true , false, true, "x.gz" ,"gz");
56 T("/xxxx/xxxx/x.gz", false , true , false, true, NULL ,"gz"); 74 T("/xxxx/xxxx/x.gz", false , true , false, true, NULL ,"gz");
57 T("/xxxx/xxxx/x.gz", true , false , false, true, "x.gz" , NULL); 75 T("/xxxx/xxxx/x.gz", true , false , false, true, "x.gz" , NULL);
58 T("/xxxx/xxxx/x.gz", false , false , false, true, NULL , NULL); 76 T("/xxxx/xxxx/x.gz", false , false , false, true, NULL , NULL);
77 M("/xxxx/xxxx/x.gz", PERF_RECORD_MISC_CPUMODE_UNKNOWN, false);
78 M("/xxxx/xxxx/x.gz", PERF_RECORD_MISC_KERNEL, false);
79 M("/xxxx/xxxx/x.gz", PERF_RECORD_MISC_USER, false);
59 80
60 /* path alloc_name alloc_ext kmod comp name ext */ 81 /* path alloc_name alloc_ext kmod comp name ext */
61 T("x.gz", true , true , false, true, "x.gz", "gz"); 82 T("x.gz", true , true , false, true, "x.gz", "gz");
62 T("x.gz", false , true , false, true, NULL , "gz"); 83 T("x.gz", false , true , false, true, NULL , "gz");
63 T("x.gz", true , false , false, true, "x.gz", NULL); 84 T("x.gz", true , false , false, true, "x.gz", NULL);
64 T("x.gz", false , false , false, true, NULL , NULL); 85 T("x.gz", false , false , false, true, NULL , NULL);
86 M("x.gz", PERF_RECORD_MISC_CPUMODE_UNKNOWN, false);
87 M("x.gz", PERF_RECORD_MISC_KERNEL, false);
88 M("x.gz", PERF_RECORD_MISC_USER, false);
65 89
66 /* path alloc_name alloc_ext kmod comp name ext */ 90 /* path alloc_name alloc_ext kmod comp name ext */
67 T("x.ko.gz", true , true , true, true, "[x]", "gz"); 91 T("x.ko.gz", true , true , true, true, "[x]", "gz");
68 T("x.ko.gz", false , true , true, true, NULL , "gz"); 92 T("x.ko.gz", false , true , true, true, NULL , "gz");
69 T("x.ko.gz", true , false , true, true, "[x]", NULL); 93 T("x.ko.gz", true , false , true, true, "[x]", NULL);
70 T("x.ko.gz", false , false , true, true, NULL , NULL); 94 T("x.ko.gz", false , false , true, true, NULL , NULL);
95 M("x.ko.gz", PERF_RECORD_MISC_CPUMODE_UNKNOWN, true);
96 M("x.ko.gz", PERF_RECORD_MISC_KERNEL, true);
97 M("x.ko.gz", PERF_RECORD_MISC_USER, false);
98
99 /* path alloc_name alloc_ext kmod comp name ext */
100 T("[test_module]", true , true , true, false, "[test_module]", NULL);
101 T("[test_module]", false , true , true, false, NULL , NULL);
102 T("[test_module]", true , false , true, false, "[test_module]", NULL);
103 T("[test_module]", false , false , true, false, NULL , NULL);
104 M("[test_module]", PERF_RECORD_MISC_CPUMODE_UNKNOWN, true);
105 M("[test_module]", PERF_RECORD_MISC_KERNEL, true);
106 M("[test_module]", PERF_RECORD_MISC_USER, false);
107
108 /* path alloc_name alloc_ext kmod comp name ext */
109 T("[test.module]", true , true , true, false, "[test.module]", NULL);
110 T("[test.module]", false , true , true, false, NULL , NULL);
111 T("[test.module]", true , false , true, false, "[test.module]", NULL);
112 T("[test.module]", false , false , true, false, NULL , NULL);
113 M("[test.module]", PERF_RECORD_MISC_CPUMODE_UNKNOWN, true);
114 M("[test.module]", PERF_RECORD_MISC_KERNEL, true);
115 M("[test.module]", PERF_RECORD_MISC_USER, false);
116
117 /* path alloc_name alloc_ext kmod comp name ext */
118 T("[vdso]", true , true , false, false, "[vdso]", NULL);
119 T("[vdso]", false , true , false, false, NULL , NULL);
120 T("[vdso]", true , false , false, false, "[vdso]", NULL);
121 T("[vdso]", false , false , false, false, NULL , NULL);
122 M("[vdso]", PERF_RECORD_MISC_CPUMODE_UNKNOWN, false);
123 M("[vdso]", PERF_RECORD_MISC_KERNEL, false);
124 M("[vdso]", PERF_RECORD_MISC_USER, false);
125
126 /* path alloc_name alloc_ext kmod comp name ext */
127 T("[vsyscall]", true , true , false, false, "[vsyscall]", NULL);
128 T("[vsyscall]", false , true , false, false, NULL , NULL);
129 T("[vsyscall]", true , false , false, false, "[vsyscall]", NULL);
130 T("[vsyscall]", false , false , false, false, NULL , NULL);
131 M("[vsyscall]", PERF_RECORD_MISC_CPUMODE_UNKNOWN, false);
132 M("[vsyscall]", PERF_RECORD_MISC_KERNEL, false);
133 M("[vsyscall]", PERF_RECORD_MISC_USER, false);
134
135 /* path alloc_name alloc_ext kmod comp name ext */
136 T("[kernel.kallsyms]", true , true , false, false, "[kernel.kallsyms]", NULL);
137 T("[kernel.kallsyms]", false , true , false, false, NULL , NULL);
138 T("[kernel.kallsyms]", true , false , false, false, "[kernel.kallsyms]", NULL);
139 T("[kernel.kallsyms]", false , false , false, false, NULL , NULL);
140 M("[kernel.kallsyms]", PERF_RECORD_MISC_CPUMODE_UNKNOWN, false);
141 M("[kernel.kallsyms]", PERF_RECORD_MISC_KERNEL, false);
142 M("[kernel.kallsyms]", PERF_RECORD_MISC_USER, false);
71 143
72 return 0; 144 return 0;
73} 145}