perf tools: Add kallsyms__get_symbol_start()
Namhyung Kim
maintainerPATCH v2 1/2 perf tools: Add kallsyms__get_symbol_start()
The kallsyms__get_symbol_start() to get any symbol address from kallsyms. The existing kallsyms__get_function_start() only allows text symbols so create this to allow data symbols too.
--- tools/perf/util/event.c | 30 +++++++++++++++++++++++++++--- tools/perf/util/event.h | 2 ++ 2 files changed, 29 insertions(+), 3 deletions(-)
tools/perf/util/event.c +27 -3
@@ -93,8 +93,8 @@ struct process_symbol_args {u64 start; }; -static int find_symbol_cb (void *arg,const char *name,char type, -u64 start) +static int find_func_symbol_cb (void *arg,const char *name,char type, +u64 start) {struct process_symbol_args *args = arg;
@@ -110,12 +110,36 @@ static int find_symbol_cb(void *arg, const char *name, char type,return 1 ; } +static int find_any_symbol_cb (void *arg,const char *name, +char type__maybe_unused ,u64 start) +{ +struct process_symbol_args *args = arg; + +if (strcmp (name, args->name)) +return 0 ; + + args->start = start; +return 1 ; +} +int kallsyms__get_function_start (const char *kallsyms_filename,const char *symbol_name,u64 *addr) {struct process_symbol_args args = { .name = symbol_name, }; -if (kallsyms__parse (kallsyms_filename, &args, find_symbol_cb) <=0 ) +if (kallsyms__parse (kallsyms_filename, &args, find_func_symbol_cb) <=0 ) +return -1 ; + + *addr = args.start; +return 0 ; +} + +int kallsyms__get_symbol_start (const char *kallsyms_filename, +const char *symbol_name,u64 *addr) +{ +struct process_symbol_args args = { .name = symbol_name, }; + +if (kallsyms__parse (kallsyms_filename, &args, find_any_symbol_cb) <=0 )return -1 ; *addr = args.start;
tools/perf/util/event.h +2 -0
@@ -360,6 +360,8 @@ size_t perf_event__fprintf(union perf_event *event, struct machine *machine, FILint kallsyms__get_function_start (const char *kallsyms_filename,const char *symbol_name,u64 *addr); +int kallsyms__get_symbol_start (const char *kallsyms_filename, +const char *symbol_name,u64 *addr);void event_attr_init (struct perf_event_attr *attr);
Signature · 1 line
2.41.0.487.g6d72f3e995-goog
Namhyung Kim
maintainerPATCH v2 2/2 perf machine: Include data symbols in the kernel map
When perf record -d is used, it needs data mmaps to symbolize global data. But it missed to collect kernel data maps so it cannot symbolize them. Instead of having a separate map, just increase the kernel map size to include the data section.
Probably we can have a separate kernel map for data, but the current code assumes a single kernel map. So it'd require more changes in other places and looks error-prone. I decided not to go that way for now.
Also it seems the kernel module size already includes the data section.
For example, my system has the following.
$ grep -e _stext -e _etext -e _edata /proc/kallsyms ffffffff99800000 T _stext ffffffff9a601ac8 T _etext ffffffff9b446a00 D _edata
Size of the text section is (0x9a601ac8 - 0x99800000 = 0xe01ac8) and size including data section is (0x9b446a00 - 0x99800000 = 0x1c46a00).
Before:
$ perf record -d true
$ perf report -D | grep MMAP | head -1
0 0 0x460 [0x60]: PERF_RECORD_MMAP -1/0: [0xffffffff99800000(0xe01ac8) @ 0xffffffff99800000]: x [kernel.kallsyms]_text
^^^^^^^^
here
After:
$ perf report -D | grep MMAP | head -1
0 0 0x460 [0x60]: PERF_RECORD_MMAP -1/0: [0xffffffff99800000(0x1c46a00) @ 0xffffffff99800000]: x [kernel.kallsyms]_text
^^^^^^^^^Instead of just replacing it to _edata, try _edata first and then fall back to _etext just in case.
--- tools/perf/util/machine.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/machine.c +3 -1
@@ -1216,7 +1216,9 @@ static int machine__get_running_kernel_start(struct machine *machine, *start = addr; - err =kallsyms__get_function_start (filename,"_etext" , &addr); + err =kallsyms__get_symbol_start (filename,"_edata" , &addr); +if (err) + err =kallsyms__get_function_start (filename,"_etext" , &addr);if (!err) *end = addr;
Signature · 1 line
2.41.0.487.g6d72f3e995-goog
Re: [PATCH v2 2/2] perf machine: Include data symbols in the kernel map
Quoted 33 lines · Namhyung Kim
When perf record -d is used, it needs data mmaps to symbolize global data. But it missed to collect kernel data maps so it cannot symbolize them. Instead of having a separate map, just increase the kernel map size to include the data section.
Probably we can have a separate kernel map for data, but the current code assumes a single kernel map. So it'd require more changes in other places and looks error-prone. I decided not to go that way for now.
Also it seems the kernel module size already includes the data section.
For example, my system has the following.
$ grep -e _stext -e _etext -e _edata /proc/kallsyms ffffffff99800000 T _stext ffffffff9a601ac8 T _etext ffffffff9b446a00 D _edataSize of the text section is (
0x9a601ac8-0x99800000=0xe01ac8) and size including data section is (0x9b446a00-0x99800000=0x1c46a00).Before:
$ perf record -d true$ perf report -D | grep MMAP | head -1 0 0 0x460 [0x60]: PERF_RECORD_MMAP -1/0: [0xffffffff99800000(0xe01ac8) @ 0xffffffff99800000]: x [kernel.kallsyms]_text ^^^^^^^^ here After: $ perf report -D | grep MMAP | head -1 0 0 0x460 [0x60]: PERF_RECORD_MMAP -1/0: [0xffffffff99800000(0x1c46a00) @ 0xffffffff99800000]: x [kernel.kallsyms]_text ^^^^^^^^^
Quoted 4 lines
Instead of just replacing it to
_edata, try_edatafirst and then fall back to_etextjust in case.Signed-off-by Namhyung Kim <[email protected]>
Quoted 19 lines
--- tools/perf/util/machine.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tools/perf/util/machine.c +3
-1@@ -1216,7 +1216,9 @@ static int machine__get_running_kernel_start(struct machine *machine, *start = addr; - err =kallsyms__get_function_start (filename,"_etext" , &addr); + err =kallsyms__get_symbol_start (filename,"_edata" , &addr); +if (err) + err =kallsyms__get_function_start (filename,"_etext" , &addr);if (!err) *end = addr;
Quoted 6 lines · Namhyung Kim
The
kallsyms__get_symbol_start()to get any symbol address from kallsyms. The existingkallsyms__get_function_start()only allows text symbols so create this to allow data symbols too.Acked-by Ian Rogers <[email protected]>Signed-off-by Namhyung Kim <[email protected]>
Quoted 71 lines
--- tools/perf/util/event.c | 30 +++++++++++++++++++++++++++--- tools/perf/util/event.h | 2 ++ 2 files changed, 29 insertions(+), 3 deletions(-)tools/perf/util/event.c +27
-3@@ -93,8 +93,8 @@ struct process_symbol_args {u64 start; }; -static int find_symbol_cb (void *arg,const char *name,char type, -u64 start) +static int find_func_symbol_cb (void *arg,const char *name,char type, +u64 start) {struct process_symbol_args *args = arg;@@ -110,12 +110,36 @@ static int find_symbol_cb(void *arg, const char *name, char type,return 1 ; } +static int find_any_symbol_cb (void *arg,const char *name, +char type__maybe_unused ,u64 start) +{ +struct process_symbol_args *args = arg; + +if (strcmp (name, args->name)) +return 0 ; + + args->start = start; +return 1 ; +} +int kallsyms__get_function_start (const char *kallsyms_filename,const char *symbol_name,u64 *addr) {struct process_symbol_args args = { .name = symbol_name, }; -if (kallsyms__parse (kallsyms_filename, &args, find_symbol_cb) <=0 ) +if (kallsyms__parse (kallsyms_filename, &args, find_func_symbol_cb) <=0 ) +return -1 ; + + *addr = args.start; +return 0 ; +} + +int kallsyms__get_symbol_start (const char *kallsyms_filename, +const char *symbol_name,u64 *addr) +{ +struct process_symbol_args args = { .name = symbol_name, }; + +if (kallsyms__parse (kallsyms_filename, &args, find_any_symbol_cb) <=0 )return -1 ; *addr = args.start;tools/perf/util/event.h +2
-0@@ -360,6 +360,8 @@ size_t perf_event__fprintf(union perf_event *event, struct machine *machine, FILint kallsyms__get_function_start (const char *kallsyms_filename,const char *symbol_name,u64 *addr); +int kallsyms__get_symbol_start (const char *kallsyms_filename, +const char *symbol_name,u64 *addr);void event_attr_init (struct perf_event_attr *attr);
Em Tue, Jul 25, 2023 at 05:07:40PM +0300, Adrian Hunter escreveu:
Quoted 9 lines · Namhyung Kim
Quoted 6 lines
The
kallsyms__get_symbol_start()to get any symbol address from kallsyms. The existingkallsyms__get_function_start()only allows text symbols so create this to allow data symbols too.Acked-by Ian Rogers <[email protected]>Signed-off-by Namhyung Kim <[email protected]>Acked-by Adrian Hunter <[email protected]>
Thanks, applied both patches.
- Arnaldo
Quoted 72 lines
Quoted 71 lines
--- tools/perf/util/event.c | 30 +++++++++++++++++++++++++++--- tools/perf/util/event.h | 2 ++ 2 files changed, 29 insertions(+), 3 deletions(-)tools/perf/util/event.c +27
-3@@ -93,8 +93,8 @@ struct process_symbol_args {u64 start; }; -static int find_symbol_cb (void *arg,const char *name,char type, -u64 start) +static int find_func_symbol_cb (void *arg,const char *name,char type, +u64 start) {struct process_symbol_args *args = arg;@@ -110,12 +110,36 @@ static int find_symbol_cb(void *arg, const char *name, char type,return 1 ; } +static int find_any_symbol_cb (void *arg,const char *name, +char type__maybe_unused ,u64 start) +{ +struct process_symbol_args *args = arg; + +if (strcmp (name, args->name)) +return 0 ; + + args->start = start; +return 1 ; +} +int kallsyms__get_function_start (const char *kallsyms_filename,const char *symbol_name,u64 *addr) {struct process_symbol_args args = { .name = symbol_name, }; -if (kallsyms__parse (kallsyms_filename, &args, find_symbol_cb) <=0 ) +if (kallsyms__parse (kallsyms_filename, &args, find_func_symbol_cb) <=0 ) +return -1 ; + + *addr = args.start; +return 0 ; +} + +int kallsyms__get_symbol_start (const char *kallsyms_filename, +const char *symbol_name,u64 *addr) +{ +struct process_symbol_args args = { .name = symbol_name, }; + +if (kallsyms__parse (kallsyms_filename, &args, find_any_symbol_cb) <=0 )return -1 ; *addr = args.start;tools/perf/util/event.h +2
-0@@ -360,6 +360,8 @@ size_t perf_event__fprintf(union perf_event *event, struct machine *machine, FILint kallsyms__get_function_start (const char *kallsyms_filename,const char *symbol_name,u64 *addr); +int kallsyms__get_symbol_start (const char *kallsyms_filename, +const char *symbol_name,u64 *addr);void event_attr_init (struct perf_event_attr *attr);
Signature · 1 line
- Arnaldo