perf tools: Fix /proc/kallsyms map split
Namhyung Kim
maintainercover perf tools: Fix /proc/kallsyms map split
Hello,
I found a weird bug in symbol handling for kallsyms. My system has a live patch which is a module and it has some symbols that conflict with the main kernel map.
For example, the symbols are common functions defined in the kernel like kmalloc and kfree. They have 'u' type which is a unique global symbol.
$ grep ' u ' /proc/kallsyms ffffffff98798dd0 u kmalloc_caches [livepatch] ffffffff97afb6c0 u kmalloc_trace_noprof [livepatch] ffffffff9739e7a0 u __list_add_valid_or_report [livepatch] ffffffff97afb240 u __kmalloc_noprof [livepatch] ffffffff970597f0 u klp_enable_patch [livepatch] ffffffff979939f0 u kfree [livepatch] ...
They are duplicate symbols and will be removed by the fixup routine. But if symbol_conf.allow_aliases is set, they remain. This is the case for perf lock contention, and it caused a trouble with the kallsyms split code.
$ grep ' kfree' /proc/kallsyms ffffffff97057a30 t kfree_rcu_shrink_scan ffffffff97394380 T kfree_strarray ffffffff9779b890 T kfree_skb_list_reason ffffffff9787be60 t kfree_pmc ffffffff979939f0 T kfree <<<--- here ffffffff979bbc50 T kfree_skb_partial ffffffff97a8f110 t kfree_rcu_work ffffffff97a8f2f0 t kfree_rcu_monitor ffffffff97a8f910 t kfree_rcu_shrink_count ffffffff97af67f0 T kfree_const ffffffff97afbbc0 T kfree_sensitive ffffffff97b5c4a0 T kfree_link ffffffff99255908 d kfree_rcu_shrinker ffffffff998beec0 T kfree_rcu_scheduler_running ffffffff979939f0 u kfree [livepatch] <<<--- duplicate
As the kfree function is in the livepatch module, any functions in the main kernel map that come later than 'kfree' will now to be splitted. This will create a lot of new kernel maps and loading them again will go to the routines to load kallsyms and split. So the process was in an infinite loop creating new maps and eventually gets killed.
I've added some defensive measures to prevent such situations and a test case to verify it. But maybe we need to do something for 'u' type symbols.
Thanks,
Namhyung
Namhyung Kim (5):
perf tools: Mark split kallsyms DSOs as loaded perf tools: Fix split kallsyms DSO counting perf tools: Fallback to initial kernel map properly perf tools: Use machine->root_dir to find /proc/kallsyms perf test: Add kallsyms split test
tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/fake_root/proc/kallsyms | 10 ++++ tools/perf/tests/fake_root/proc/modules | 1 + tools/perf/tests/fake_root/proc/version | 1 + tools/perf/tests/kallsyms-split.c | 72 ++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + tools/perf/util/symbol.c | 16 ++++-- 8 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 tools/perf/tests/fake_root/proc/kallsyms create mode 100644 tools/perf/tests/fake_root/proc/modules create mode 100644 tools/perf/tests/fake_root/proc/version create mode 100644 tools/perf/tests/kallsyms-split.c
Signature · 1 line
2.52.0.158.g65b55ccf14-goog
Namhyung Kim
maintainerPATCH 1/5 perf tools: Mark split kallsyms DSOs as loaded
The maps__split_kallsyms() will split symbols to module DSOs if it comes from a module. It also handled some unusual kernel symbols after modules by creating new kernel maps like "[kernel].0".
But they are pseudo DSOs to have those unexpected symbols. They should not be considered as unloaded kernel DSOs. Otherwise the dso__load() for them will end up calling dso__load_kallsyms() and then maps__split_kallsyms() again and again.
--- tools/perf/util/symbol.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/symbol.c +1 -0
@@ -972,6 +972,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,return -1 ;dso__set_kernel (ndso,dso__kernel (dso)); +dso__set_loaded (ndso); curr_map =map__new2 (pos->start, ndso);if (curr_map ==NULL ) {
Signature · 1 line
2.52.0.158.g65b55ccf14-goog
Re: [PATCH 1/5] perf tools: Mark split kallsyms DSOs as loaded
Quoted 11 lines · Namhyung Kim
The
maps__split_kallsyms()will split symbols to module DSOs if it comes from a module. It also handled some unusual kernel symbols after modules by creating new kernel maps like "[kernel].0".But they are pseudo DSOs to have those unexpected symbols. They should not be considered as unloaded kernel DSOs. Otherwise the
dso__load()for them will end up callingdso__load_kallsyms()and thenmaps__split_kallsyms()again and again.Fixes 2e538c4a1847291cf ("perf tools: Improve kernel/modules symbol lookup")
Fixed after 16 years :-)
Thanks,
Ian
Quoted 20 lines
Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/symbol.c | 1 + 1 file changed, 1 insertion(+)tools/perf/util/symbol.c +1
-1@@ -972,6 +972,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,return -1 ;dso__set_kernel (ndso,dso__kernel (dso)); +dso__set_loaded (ndso); curr_map =map__new2 (pos->start, ndso);if (curr_map ==NULL ) { --2.52.0.158.g65b55ccf14-goog
Namhyung Kim
maintainerPATCH 2/5 perf tools: Fix split kallsyms DSO counting
In reply to Namhyung KimIt's counted twice as it's increased after calling maps__insert(). I guess we want to increase it only after it's added properly.
--- tools/perf/util/symbol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/symbol.c +2 -2
@@ -960,11 +960,11 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,if (dso__kernel (dso) ==DSO_SPACE__KERNEL_GUEST )snprintf (dso_name,sizeof (dso_name),"[guest.kernel].%d" , - kernel_range++); + kernel_range);else snprintf (dso_name,sizeof (dso_name),"[kernel].%d" , - kernel_range++); + kernel_range); ndso =dso__new (dso_name);map__zput (curr_map);
Signature · 1 line
2.52.0.158.g65b55ccf14-goog
Re: [PATCH 2/5] perf tools: Fix split kallsyms DSO counting
Quoted 6 lines · Namhyung Kim
It's counted twice as it's increased after calling
maps__insert(). I guess we want to increase it only after it's added properly.Fixes 2e538c4a1847291cf ("perf tools: Improve kernel/modules symbol lookup")Signed-off-by Namhyung Kim <[email protected]>
Thanks,
Ian
Quoted 25 lines
--- tools/perf/util/symbol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/perf/util/symbol.c +2
-3@@ -960,11 +960,11 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,if (dso__kernel (dso) ==DSO_SPACE__KERNEL_GUEST )snprintf (dso_name,sizeof (dso_name),"[guest.kernel].%d" , - kernel_range++); + kernel_range);else snprintf (dso_name,sizeof (dso_name),"[kernel].%d" , - kernel_range++); + kernel_range); ndso =dso__new (dso_name);map__zput (curr_map); --2.52.0.158.g65b55ccf14-goog
Namhyung Kim
maintainerPATCH 3/5 perf tools: Fallback to initial kernel map properly
In reply to Namhyung KimIn maps__split_kallsyms(), it assumes new kernel map when it finds a symbol without module after any module and the initial kernel map has some symbols. Because it expects modules are out of the kernel map so modules should not have symbols in the kernel map.
For example, the following memory map shows symbols and maps. Any symbols in the module 1 area will go to the module 1. The main kernel map starts at 0xffffffffbc200000. But if any symbol has a module between the symbols in that area, next symbols after 0xffffffffbd008000 will generate new kernel maps like [kernel].1.
kernel address | |
| |
0xffffffffc0000000 |---------------------|
| (symbols) |
| ... | <--- [kernel].N
0xffffffffbc400000 |---------------------|
| (symbols) |
| module 2 | <--- bad?
0xffffffffbc380000 |---------------------|
| ... |
| (symbols) |
| [kernel.kallsyms] | <--- initial map
0xffffffffbc200000 |---------------------|
| |
| |
0xffffffffabcde000 |---------------------|
| (symbols) |
| module 1 |
0xffffffffabcd0000 |---------------------|This is very fragile when the module has a symbol that falls into the main kernel map for some reason. My system has a livepatch module with such symbols. And it created a lot of new kernel maps after those symbols. But the symbol may have broken addresses and the later symbols can still be found in the initial kernel map.
Let's check the symbol address in the initial map and use it if found.
--- tools/perf/util/symbol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/util/symbol.c +2 -1
@@ -951,7 +951,8 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, pos->end -= delta; } -if (count ==0 ) { +if (map__start (initial_map) <= (pos->start + delta) && + (pos->start + delta) <map__end (initial_map)) {map__zput (curr_map); curr_map =map__get (initial_map); goto add_symbol;
Signature · 1 line
2.52.0.158.g65b55ccf14-goog
Re: [PATCH 3/5] perf tools: Fallback to initial kernel map properly
Quoted 50 lines · Namhyung Kim
In
maps__split_kallsyms(), it assumes new kernel map when it finds a symbol without module after any module and the initial kernel map has some symbols. Because it expects modules are out of the kernel map so modules should not have symbols in the kernel map.For example, the following memory map shows symbols and maps. Any symbols in the module 1 area will go to the module 1. The main kernel map starts at
0xffffffffbc200000. But if any symbol has a module between the symbols in that area, next symbols after0xffffffffbd008000will generate new kernel maps like [kernel].1.kernel address | | | | 0xffffffffc0000000 |---------------------| | (symbols) | | ... | <--- [kernel].N 0xffffffffbc400000 |---------------------| | (symbols) | | module 2 | <--- bad? 0xffffffffbc380000 |---------------------| | ... | | (symbols) | | [kernel.kallsyms] | <--- initial map 0xffffffffbc200000 |---------------------| | | | | 0xffffffffabcde000 |---------------------| | (symbols) | | module 1 | 0xffffffffabcd0000 |---------------------|This is very fragile when the module has a symbol that falls into the main kernel map for some reason. My system has a livepatch module with such symbols. And it created a lot of new kernel maps after those symbols. But the symbol may have broken addresses and the later symbols can still be found in the initial kernel map.
Let's check the symbol address in the initial map and use it if found.
Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/symbol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)tools/perf/util/symbol.c +0
-0
tools/perf/util/symbol.c static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, · line 955
Quoted 6 lines
tools/perf/util/symbol.c +2
-1@@ -951,7 +951,8 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, pos->end -= delta; } -if (count ==0 ) { +if (map__start (initial_map) <= (pos->start + delta) && + (pos->start + delta) <map__end (initial_map)) {
nit: it looks a little clunky to subtract off delta above, but then add it on again here.
Thanks,
Ian
Quoted 6 lines
tools/perf/util/symbol.c +0
-1map__zput (curr_map); curr_map =map__get (initial_map); goto add_symbol; --2.52.0.158.g65b55ccf14-goog
Namhyung Kim
maintainerPATCH 4/5 perf tools: Use machine->root_dir to find /proc/kallsyms
In reply to Namhyung KimThis is for test functions to find the kallsyms correctly. It can find the machine from the kernel maps and use its root_dir. This is helpful to setup fake /proc directory for testing.
--- tools/perf/util/symbol.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/perf/util/symbol.c +7 -1
@@ -2002,6 +2002,7 @@ static char *dso__find_kallsyms(struct dso *dso, struct map *map)char sbuild_id[SBUILD_ID_SIZE ];bool is_host = false;char path[PATH_MAX ]; +struct kmap *kmap =map__kmap (map);if (!dso__has_build_id (dso)) {/*
@@ -2038,8 +2039,13 @@ static char *dso__find_kallsyms(struct dso *dso, struct map *map)return strdup (path);/* Use current /proc/kallsyms if possible */ -if (is_host) { proc_kallsyms: +if (kmap && kmap->kmaps) { +struct machine *machine =maps__machine (kmap->kmaps); + +scnprintf (path,sizeof (path),"%s/proc/kallsyms" , machine->root_dir); +return strdup (path); + }else if (is_host) {return strdup ("/proc/kallsyms" ); }
Signature · 1 line
2.52.0.158.g65b55ccf14-goog
Re: [PATCH 4/5] perf tools: Use machine->root_dir to find /proc/kallsyms
Quoted 15 lines · Namhyung Kim
This is for test functions to find the kallsyms correctly. It can find the machine from the kernel maps and use its
root_dir. This is helpful to setup fake /proc directory for testing.Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/symbol.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)tools/perf/util/symbol.c +0
-0
tools/perf/util/symbol.c static char *dso__find_kallsyms(struct dso *dso, struct map *map) · line 2005
Quoted 4 lines
tools/perf/util/symbol.c +1
-0@@ -2002,6 +2002,7 @@ static char *dso__find_kallsyms(struct dso *dso, struct map *map)char sbuild_id[SBUILD_ID_SIZE ];bool is_host = false;char path[PATH_MAX ]; +struct kmap *kmap =map__kmap (map);
nit: perhaps just use map__kmaps here to avoid testing two values below.
Thanks,
Ian
Quoted 21 lines
tools/perf/util/symbol.c +6
-2if (!dso__has_build_id (dso)) {/* @@ -2038,8 +2039,13 @@ static char *dso__find_kallsyms(struct dso *dso, struct map *map)return strdup (path);/* Use current /proc/kallsyms if possible */ -if (is_host) { proc_kallsyms: +if (kmap && kmap->kmaps) { +struct machine *machine =maps__machine (kmap->kmaps); + +scnprintf (path,sizeof (path),"%s/proc/kallsyms" , machine->root_dir); +return strdup (path); + }else if (is_host) {return strdup ("/proc/kallsyms" ); } --2.52.0.158.g65b55ccf14-goog
Namhyung Kim
maintainerRe: [PATCH 4/5] perf tools: Use machine->root_dir to find /proc/kallsyms
Quoted 23 lines · Ian Rogers
Quoted 15 lines · Namhyung Kim
This is for test functions to find the kallsyms correctly. It can find the machine from the kernel maps and use its
root_dir. This is helpful to setup fake /proc directory for testing.Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/symbol.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)tools/perf/util/symbol.c +0
-0tools/perf/util/symbol.c static char *dso__find_kallsyms(struct dso *dso, struct map *map) · line 2005
Quoted 4 lines
tools/perf/util/symbol.c +1
-0@@ -2002,6 +2002,7 @@ static char *dso__find_kallsyms(struct dso *dso, struct map *map)char sbuild_id[SBUILD_ID_SIZE ];bool is_host = false;char path[PATH_MAX ]; +struct kmap *kmap =map__kmap (map);Reviewed-by Ian Rogers <[email protected]>
Quoted 1 line
nit: perhaps just use
map__kmapshere to avoid testing two values below.
Right, will update. Thanks for your review!
Namhyung
Quoted 21 lines
Quoted 21 lines
tools/perf/util/symbol.c +6
-2if (!dso__has_build_id (dso)) {/* @@ -2038,8 +2039,13 @@ static char *dso__find_kallsyms(struct dso *dso, struct map *map)return strdup (path);/* Use current /proc/kallsyms if possible */ -if (is_host) { proc_kallsyms: +if (kmap && kmap->kmaps) { +struct machine *machine =maps__machine (kmap->kmaps); + +scnprintf (path,sizeof (path),"%s/proc/kallsyms" , machine->root_dir); +return strdup (path); + }else if (is_host) {return strdup ("/proc/kallsyms" ); } --2.52.0.158.g65b55ccf14-goog
Namhyung Kim
maintainerPATCH 5/5 perf test: Add kallsyms split test
In reply to Namhyung KimAdd fake_root directory for /proc/{version,modules,kallsyms}. The kallsyms has a bad symbol in the module and it causes the main map splitted. The test ensures it only has two maps - kernel and the module and it finds the initial map after the module without creating the split maps like [kernel].0 and so on.
$ perf test -vv "split kallsyms" 69: split kallsyms: --- start --- test child forked, pid 921678 try to find fake root directory maps__set_modules_path_dir: cannot open tests/fake_root/lib/modules/X.Y.Z dir Problems setting modules path maps, continuing anyway... Failed to open tests/fake_root/proc/kcore. Note /proc/kcore requires CAP_SYS_RAWIO capability to access. Using tests/fake_root/proc/kallsyms for symbols kernel map loaded - check symbol and map ---- end(0) ---- 69: split kallsyms : Ok
--- tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/fake_root/proc/kallsyms | 10 ++++ tools/perf/tests/fake_root/proc/modules | 1 + tools/perf/tests/fake_root/proc/version | 1 + tools/perf/tests/kallsyms-split.c | 72 ++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + 7 files changed, 87 insertions(+) create mode 100644 tools/perf/tests/fake_root/proc/kallsyms create mode 100644 tools/perf/tests/fake_root/proc/modules create mode 100644 tools/perf/tests/fake_root/proc/version create mode 100644 tools/perf/tests/kallsyms-split.c
tools/perf/tests/Build +1 -0
@@ -69,6 +69,7 @@ perf-test-y += util.o perf-test-y += hwmon_pmu.o perf-test-y += tool_pmu.o perf-test-y += subcmd-help.o +perf-test-y += kallsyms-split.o ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc)) perf-test-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o
tools/perf/tests/builtin-test.c +1 -0
@@ -140,6 +140,7 @@ static struct test_suite *generic_tests[] = { &suite__symbols, &suite__util, &suite__subcmd_help, + &suite__kallsyms_split, NULL, };
tools/perf/tests/fake_root/proc/kallsyms new file +10 -0
@@ -0,0 +1,10 @@ +ffffffffab200000 T _stext +ffffffffab200010 T good_symbol +ffffffffab200020 t bad_symbol +ffffffffab200030 t main_symbol1 +ffffffffab200040 t main_symbol2 +ffffffffab200050 t main_symbol3 +ffffffffab200060 T _etext +ffffffffcd000000 T start_module [module] +ffffffffab200020 u bad_symbol [module] +ffffffffcd000040 T end_module [module]
tools/perf/tests/fake_root/proc/modules new file +1 -0
@@ -0,0 +1 @@ +module 4096 1 - Live 0xffffffffcd000000
tools/perf/tests/fake_root/proc/version new file +1 -0
@@ -0,0 +1 @@ +Linux version X.Y.Z (just for perf test)
tools/perf/tests/kallsyms-split.c new file +72 -0
72 lines not on this page · raw message
tools/perf/tests/tests.h +1 -0
@@ -178,6 +178,7 @@ DECLARE_SUITE(event_groups);DECLARE_SUITE (symbols);DECLARE_SUITE (util);DECLARE_SUITE (subcmd_help); +DECLARE_SUITE (kallsyms_split);/* * PowerPC and S390 do not support creation of instruction breakpoints using the
Signature · 1 line
2.52.0.158.g65b55ccf14-goog
Ian Rogers
reviewerRe: [PATCH 5/5] perf test: Add kallsyms split test
Quoted 102 lines · Namhyung Kim
Add
fake_rootdirectory for/proc/{version,modules,kallsyms}. The kallsyms has a bad symbol in the module and it causes the main map splitted. The test ensures it only has two maps - kernel and the module and it finds the initial map after the module without creating the split maps like [kernel].0 and so on.$ perf test -vv "split kallsyms" 69: split kallsyms: --- start --- test child forked, pid 921678 try to find fake root directory maps__set_modules_path_dir: cannot open tests/fake_root/lib/modules/X.Y.Z dir Problems setting modules path maps, continuing anyway... Failed to open tests/fake_root/proc/kcore. Note /proc/kcore requires CAP_SYS_RAWIO capability to access. Using tests/fake_root/proc/kallsyms for symbols kernel map loaded - check symbol and map ---- end(0) ---- 69: split kallsyms : OkSigned-off-by Namhyung Kim <[email protected]>--- tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/fake_root/proc/kallsyms | 10 ++++ tools/perf/tests/fake_root/proc/modules | 1 + tools/perf/tests/fake_root/proc/version | 1 + tools/perf/tests/kallsyms-split.c | 72 ++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + 7 files changed, 87 insertions(+) create mode 100644 tools/perf/tests/fake_root/proc/kallsyms create mode 100644 tools/perf/tests/fake_root/proc/modules create mode 100644 tools/perf/tests/fake_root/proc/version create mode 100644 tools/perf/tests/kallsyms-split.ctools/perf/tests/Build +1
-0@@ -69,6 +69,7 @@ perf-test-y += util.o perf-test-y += hwmon_pmu.o perf-test-y += tool_pmu.o perf-test-y += subcmd-help.o +perf-test-y += kallsyms-split.o ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc)) perf-test-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.otools/perf/tests/builtin-test.c +1
-0@@ -140,6 +140,7 @@ static struct test_suite *generic_tests[] = { &suite__symbols, &suite__util, &suite__subcmd_help, + &suite__kallsyms_split, NULL, };tools/perf/tests/fake_root/proc/kallsyms new file +10
-0@@ -0,0 +1,10 @@ +ffffffffab200000 T _stext +ffffffffab200010 T good_symbol +ffffffffab200020 t bad_symbol +ffffffffab200030 t main_symbol1 +ffffffffab200040 t main_symbol2 +ffffffffab200050 t main_symbol3 +ffffffffab200060 T _etext +ffffffffcd000000 T start_module [module] +ffffffffab200020 u bad_symbol [module] +ffffffffcd000040 T end_module [module]tools/perf/tests/fake_root/proc/modules new file +1
-0@@ -0,0 +1 @@ +module 4096 1 - Live 0xffffffffcd000000tools/perf/tests/fake_root/proc/version new file +1
-0@@ -0,0 +1 @@ +Linux version X.Y.Z (just for perf test)tools/perf/tests/kallsyms-split.c new file +7
-0@@ -0,0 +1,72 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/compiler.h> +#include <unistd.h> +#include "util/dso.h" +#include "util/map.h" +#include "util/symbol.h" +#include "util/debug.h"
tools/perf/tests/kallsyms-split.c line 17
Quoted 10 lines
tools/perf/tests/kallsyms-split.c new file +10
-0+#include "util/machine.h" +#include "tests.h" + +static int test__kallsyms_split (struct test_suite *test__maybe_unused , +int subtest__maybe_unused ) +{ +struct machine m; +struct map *map =NULL ; +int ret =TEST_FAIL ; +const char *root_dirs[] = {"tests/fake_root" ,"tools/perf/tests/fake_root" ,"fake_root" };
I'm a little concerned about what will happen with the fake_root and installation. I think it'd be easier to just create the kallsyms file on the fly. We do similar for PMU testing in:
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/tests/pmu.c?h=perf-tools-next#n41
that'd avoid the need to search paths looking for the file. It'd also mean that creating a kallsyms file could be done for multiple different contexts for greater kallsyms testing.
Thanks,
Ian
Quoted 70 lines
tools/perf/tests/kallsyms-split.c new file +55
-0+unsigned int root_idx; + +/* force to use /proc/kallsyms */ + symbol_conf.ignore_vmlinux = true; + symbol_conf.ignore_vmlinux_buildid = true; + +pr_debug ("try to find fake root directory\n" ); +for (root_idx =0 ; root_idx <ARRAY_SIZE (root_dirs); root_idx++) { +char buf[128 ]; + +scnprintf (buf,sizeof (buf),"%s/proc/kallsyms" , root_dirs[root_idx]); +if (!access (buf,F_OK )) +break ; + } + +if (root_idx ==ARRAY_SIZE (root_dirs)) { +pr_debug ("SKIP: cannot find the fake root directory and files\n" ); +return TEST_SKIP ; + } + +machine__init (&m, root_dirs[root_idx],HOST_KERNEL_ID ); +if (machine__create_kernel_maps (&m) <0 ) { +pr_debug ("FAIL: failed to create kernel maps\n" ); + goto out; + } + +if (map__load (machine__kernel_map (&m)) <0 ) { +pr_debug ("SKIP: failed to load kallsyms\n" ); + goto out; + } + +pr_debug ("kernel map loaded - check symbol and map\n" ); +if (maps__nr_maps (machine__kernel_maps (&m)) !=2 ) { +pr_debug ("FAIL: it should have the kernel and a module, but has %u maps\n" , +maps__nr_maps (machine__kernel_maps (&m))); + goto out; + } + +if (machine__find_kernel_symbol_by_name (&m,"main_symbol3" , &map) ==NULL ) { +pr_debug ("FAIL: failed to find a symbol\n" ); + goto out; + } + +if (!RC_CHK_EQUAL (map,machine__kernel_map (&m))) { +pr_debug ("FAIL: the symbol is not in the kernel map\n" ); + goto out; + } + ret =TEST_OK ; + +out: +machine__exit (&m); +return ret; +} + +DEFINE_SUITE ("split kallsyms" , kallsyms_split);tools/perf/tests/tests.h +1
-1@@ -178,6 +178,7 @@ DECLARE_SUITE(event_groups);DECLARE_SUITE (symbols);DECLARE_SUITE (util);DECLARE_SUITE (subcmd_help); +DECLARE_SUITE (kallsyms_split);/* * PowerPC and S390 do not support creation of instruction breakpoints using the -- 2.52.0.158.g65b55ccf14-goog
Namhyung Kim
maintainerRe: [PATCH 5/5] perf test: Add kallsyms split test
Quoted 114 lines · Ian Rogers
Quoted 102 lines · Namhyung Kim
Add
fake_rootdirectory for/proc/{version,modules,kallsyms}. The kallsyms has a bad symbol in the module and it causes the main map splitted. The test ensures it only has two maps - kernel and the module and it finds the initial map after the module without creating the split maps like [kernel].0 and so on.$ perf test -vv "split kallsyms" 69: split kallsyms: --- start --- test child forked, pid 921678 try to find fake root directory maps__set_modules_path_dir: cannot open tests/fake_root/lib/modules/X.Y.Z dir Problems setting modules path maps, continuing anyway... Failed to open tests/fake_root/proc/kcore. Note /proc/kcore requires CAP_SYS_RAWIO capability to access. Using tests/fake_root/proc/kallsyms for symbols kernel map loaded - check symbol and map ---- end(0) ---- 69: split kallsyms : OkSigned-off-by Namhyung Kim <[email protected]>--- tools/perf/tests/Build | 1 + tools/perf/tests/builtin-test.c | 1 + tools/perf/tests/fake_root/proc/kallsyms | 10 ++++ tools/perf/tests/fake_root/proc/modules | 1 + tools/perf/tests/fake_root/proc/version | 1 + tools/perf/tests/kallsyms-split.c | 72 ++++++++++++++++++++++++ tools/perf/tests/tests.h | 1 + 7 files changed, 87 insertions(+) create mode 100644 tools/perf/tests/fake_root/proc/kallsyms create mode 100644 tools/perf/tests/fake_root/proc/modules create mode 100644 tools/perf/tests/fake_root/proc/version create mode 100644 tools/perf/tests/kallsyms-split.ctools/perf/tests/Build +1
-0@@ -69,6 +69,7 @@ perf-test-y += util.o perf-test-y += hwmon_pmu.o perf-test-y += tool_pmu.o perf-test-y += subcmd-help.o +perf-test-y += kallsyms-split.o ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc)) perf-test-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.otools/perf/tests/builtin-test.c +1
-0@@ -140,6 +140,7 @@ static struct test_suite *generic_tests[] = { &suite__symbols, &suite__util, &suite__subcmd_help, + &suite__kallsyms_split, NULL, };tools/perf/tests/fake_root/proc/kallsyms new file +10
-0@@ -0,0 +1,10 @@ +ffffffffab200000 T _stext +ffffffffab200010 T good_symbol +ffffffffab200020 t bad_symbol +ffffffffab200030 t main_symbol1 +ffffffffab200040 t main_symbol2 +ffffffffab200050 t main_symbol3 +ffffffffab200060 T _etext +ffffffffcd000000 T start_module [module] +ffffffffab200020 u bad_symbol [module] +ffffffffcd000040 T end_module [module]tools/perf/tests/fake_root/proc/modules new file +1
-0@@ -0,0 +1 @@ +module 4096 1 - Live 0xffffffffcd000000tools/perf/tests/fake_root/proc/version new file +1
-0@@ -0,0 +1 @@ +Linux version X.Y.Z (just for perf test)tools/perf/tests/kallsyms-split.c new file +7
-0@@ -0,0 +1,72 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/compiler.h> +#include <unistd.h> +#include "util/dso.h" +#include "util/map.h" +#include "util/symbol.h" +#include "util/debug.h" tools/perf/tests/kallsyms-split.c line 17
Quoted 10 lines
tools/perf/tests/kallsyms-split.c new file +10
-0+#include "util/machine.h" +#include "tests.h" + +static int test__kallsyms_split (struct test_suite *test__maybe_unused , +int subtest__maybe_unused ) +{ +struct machine m; +struct map *map =NULL ; +int ret =TEST_FAIL ; +const char *root_dirs[] = {"tests/fake_root" ,"tools/perf/tests/fake_root" ,"fake_root" };
Quoted 7 lines
I'm a little concerned about what will happen with the
fake_rootand installation. I think it'd be easier to just create the kallsyms file on the fly. We do similar for PMU testing in:
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/tests/pmu.c?h=perf-tools-next#n41
that'd avoid the need to search paths looking for the file. It'd also mean that creating a kallsyms file could be done for multiple different contexts for greater kallsyms testing.
That's also possible. But then we need to create a temporary directory and remove the contents when it's terminated. I thought it'd be easier to use the static files and just skip if not found.
Thanks,
Namhyung
Quoted 70 lines
Quoted 70 lines
tools/perf/tests/kallsyms-split.c new file +55
-0+unsigned int root_idx; + +/* force to use /proc/kallsyms */ + symbol_conf.ignore_vmlinux = true; + symbol_conf.ignore_vmlinux_buildid = true; + +pr_debug ("try to find fake root directory\n" ); +for (root_idx =0 ; root_idx <ARRAY_SIZE (root_dirs); root_idx++) { +char buf[128 ]; + +scnprintf (buf,sizeof (buf),"%s/proc/kallsyms" , root_dirs[root_idx]); +if (!access (buf,F_OK )) +break ; + } + +if (root_idx ==ARRAY_SIZE (root_dirs)) { +pr_debug ("SKIP: cannot find the fake root directory and files\n" ); +return TEST_SKIP ; + } + +machine__init (&m, root_dirs[root_idx],HOST_KERNEL_ID ); +if (machine__create_kernel_maps (&m) <0 ) { +pr_debug ("FAIL: failed to create kernel maps\n" ); + goto out; + } + +if (map__load (machine__kernel_map (&m)) <0 ) { +pr_debug ("SKIP: failed to load kallsyms\n" ); + goto out; + } + +pr_debug ("kernel map loaded - check symbol and map\n" ); +if (maps__nr_maps (machine__kernel_maps (&m)) !=2 ) { +pr_debug ("FAIL: it should have the kernel and a module, but has %u maps\n" , +maps__nr_maps (machine__kernel_maps (&m))); + goto out; + } + +if (machine__find_kernel_symbol_by_name (&m,"main_symbol3" , &map) ==NULL ) { +pr_debug ("FAIL: failed to find a symbol\n" ); + goto out; + } + +if (!RC_CHK_EQUAL (map,machine__kernel_map (&m))) { +pr_debug ("FAIL: the symbol is not in the kernel map\n" ); + goto out; + } + ret =TEST_OK ; + +out: +machine__exit (&m); +return ret; +} + +DEFINE_SUITE ("split kallsyms" , kallsyms_split);tools/perf/tests/tests.h +1
-1@@ -178,6 +178,7 @@ DECLARE_SUITE(event_groups);DECLARE_SUITE (symbols);DECLARE_SUITE (util);DECLARE_SUITE (subcmd_help); +DECLARE_SUITE (kallsyms_split);/* * PowerPC and S390 do not support creation of instruction breakpoints using the -- 2.52.0.158.g65b55ccf14-goog