Improvements to memory use
Subsystems (2)
Ian Rogers
reviewerv4 cover Improvements to memory use
Fix memory leaks detected by address/leak sanitizer affecting LBR call-graphs, perf mem and BPF offcpu.
Make branch_type_stat in callchain_list optional as it is large and not always necessary - in particular it isn't used by perf top.
Make the allocations of zstd streams, kernel symbols and event copies lazier in order to save memory in cases like perf record.
Handle the thread exit event and have it remove the thread from the threads set in machine. Don't do this for perf report as it causes a regression for task lists, which assume threads are never removed from the machine's set, and offcpu events, that may sythensize samples for threads that have exited.
Avoid using 8kb buffers for filename__read_str which is excessive for reading CPU maps. Add io_dir as an allocation free readdir replacement, opendir allocating 32kb by default and the code uses it recursively.
Shrink perf map using a two value byte to replace two function pointers. Modify the implementation of maps to not use an rbtree as the container for maps, instead use a sorted array. Improve locking and reference counting issues.
Similar to maps separate out and reimplement threads to use a hashmap for lower memory consumption and faster look up. The fixes a regression in memory usage where reference count checking switched to using non-invasive tree nodes. Reduce its default size by 32 times and improve locking discipline. Also, fix regressions where tids had become unordered to make perf report --tasks andperf trace --summary output easier to read.
Better encapsulate the dsos abstraction. Remove the linked list and rbtree used for faster iteration and log(n) lookup to a sorted array for similar performance but half the memory usage per dso. Improve reference counting and locking discipline, adding reference count checking to dso. Experimented with, but abandoned, a hashmap implementation due to the need for extra storage and the keys not being stable.
The overall effect is to reduce memory consumption significantly for perf top - with call graphs enabled running longer before 1GB of memory is consumed. For a perf record of 'true', the memory consumption goes from 39912kb max resident to 20096kb max resident - nearly halved. perf inject with -b of a system wide perf record of 'true' reduces the max resident by roughly 4.5% (3.4% in v4 due to branch_type_stat changes being merged). This is while improving correctness with locking discipline and reference count checking.
Patch organization (v4):
- 53 patches is a lot, the patches aren't divided as they merge conflict and later patches, for example in dsos, rely on the changes and fixes to maps.
- the dso reference count checking patch is larger due to switch use of dso to be by accessors, to encapsulate the reference count checker macros. The reference count checking changes within this largely mechanical change amount to a few lines and so weren't separated.
- the first patch contains a build fix if the rwsem error checking is enabled missed from v3.
- the next patches are an assortment of memory size fixes.
- the next patches are the refactoring of maps.
- the next patches are the refactoring of threads.
- the next patches are the refactoring of dsos.
- finally reference count checking is added to dso and some lock/reference count issues are resolved. This is done after changing the data structures, for example, as the single pointer on an array is easier to add reference count checking to compared to the 5 previous pointers.
v4: Rebased as 11 changes moved to perf-tools-next. Address comments
from v3 such as error checking on zstd streams. Improve the dsos/dso in ways similar to threads and maps, with the addition of reference count checking on dso.
v3: Additional memory/speed improvements, in particular for maps and
threads. Address review comments from [email protected] and [email protected].
v2: Add additional memory fixes on top of initial LBR and rc check
fixes.
Ian Rogers (53):
perf comm: Use regular mutex
perf record: Lazy load kernel symbols
libperf: Lazily allocate mmap event copy
perf mmap: Lazily initialize zstd streams
perf machine thread: Remove exited threads by default tools api fs: Switch filename__read_str to use io.h
tools api fs: Avoid reading whole file for a 1 byte bool tools lib api: Add io_dir an allocation free readdir alternative perf maps: Switch modules tree walk to io_dir__readdir perf record: Be lazier in allocating lost samples buffer perf pmu: Switch to io_dir__readdir
perf bpf: Don't synthesize BPF events when disabled
perf header: Switch mem topology to io_dir__readdir
perf events: Remove scandir in thread synthesis
perf map: Simplify map_ip/unmap_ip and make map size smaller perf maps: Move symbol maps functions to maps.c
perf thread: Add missing RC_CHK_EQUAL
perf maps: Add maps__for_each_map to call a function on each entry perf maps: Add remove maps function to remove a map based on callback perf debug: Expose debug file
perf maps: Refactor maps__fixup_overlappings
perf maps: Do simple merge if given map doesn't overlap perf maps: Rename clone to copy from
perf maps: Add maps__load_first
perf maps: Add find next entry to give entry after the given map perf maps: Reduce scope of map_rb_node and maps internals perf maps: Fix up overlaps during fixup_end
perf maps: Switch from rbtree to lazily sorted array for addresses perf maps: Get map before returning in maps__find
perf maps: Get map before returning in maps__find_by_name perf maps: Get map before returning in maps__find_next_entry perf maps: Hide maps internals
perf maps: Locking tidy up of nr_maps
perf dso: Reorder variables to save space in struct dso perf report: Sort child tasks by tid
perf trace: Ignore thread hashing in summary
perf machine: Move fprintf to for_each loop and a callback perf threads: Move threads to its own files
perf threads: Switch from rbtree to hashmap
perf threads: Reduce table size from 256 to 8
perf dsos: Attempt to better abstract dsos internals
perf dsos: Tidy reference counting and locking
perf dsos: Add dsos__for_each_dso
perf dso: Move dso functions out of dsos
perf dsos: Switch more loops to dsos__for_each_dso
perf dsos: Switch backing storage to array from rbtree/list perf dsos: Remove __dsos__addnew
perf dsos: Remove __dsos__findnew_link_by_longname_id
perf dsos: Switch hand code to bsearch
perf dso: Add reference count checking and accessor functions perf dso: Reference counting related fixes
perf dso: Use container_of to avoid a pointer in dso_data perf env: Avoid recursively taking env->bpf_progs.lock
tools/lib/api/Makefile | 2 +- tools/lib/api/fs/fs.c | 74 +- tools/lib/api/io.h | 9 +- tools/lib/api/io_dir.h | 75 + tools/lib/perf/include/internal/mmap.h | 2 +- tools/lib/perf/mmap.c | 9 + tools/perf/arch/x86/tests/dwarf-unwind.c | 1 + tools/perf/arch/x86/util/event.c | 103 +- tools/perf/builtin-annotate.c | 6 +- tools/perf/builtin-buildid-cache.c | 2 +- tools/perf/builtin-buildid-list.c | 18 +- tools/perf/builtin-inject.c | 102 +- tools/perf/builtin-kallsyms.c | 2 +- tools/perf/builtin-mem.c | 4 +- tools/perf/builtin-record.c | 59 +- tools/perf/builtin-report.c | 250 ++-- tools/perf/builtin-script.c | 8 +- tools/perf/builtin-top.c | 4 +- tools/perf/builtin-trace.c | 41 +- tools/perf/tests/code-reading.c | 8 +- tools/perf/tests/dso-data.c | 63 +- tools/perf/tests/hists_common.c | 6 +- tools/perf/tests/hists_cumulate.c | 4 +- tools/perf/tests/hists_output.c | 2 +- tools/perf/tests/maps.c | 64 +- tools/perf/tests/symbols.c | 2 +- tools/perf/tests/thread-maps-share.c | 8 +- tools/perf/tests/vmlinux-kallsyms.c | 181 +-- tools/perf/ui/browsers/annotate.c | 6 +- tools/perf/ui/browsers/hists.c | 8 +- tools/perf/ui/browsers/map.c | 4 +- tools/perf/util/Build | 1 + tools/perf/util/annotate.c | 44 +- tools/perf/util/auxtrace.c | 2 +- tools/perf/util/block-info.c | 2 +- tools/perf/util/bpf-event.c | 20 +- tools/perf/util/bpf-event.h | 12 +- tools/perf/util/bpf_lock_contention.c | 10 +- tools/perf/util/build-id.c | 136 +- tools/perf/util/build-id.h | 2 - tools/perf/util/callchain.c | 4 +- tools/perf/util/comm.c | 10 +- tools/perf/util/compress.h | 6 +- tools/perf/util/data-convert-json.c | 2 +- tools/perf/util/db-export.c | 6 +- tools/perf/util/debug.c | 22 +- tools/perf/util/debug.h | 1 + tools/perf/util/dlfilter.c | 12 +- tools/perf/util/dso.c | 468 ++++--- tools/perf/util/dso.h | 544 ++++++-- tools/perf/util/dsos.c | 529 ++++--- tools/perf/util/dsos.h | 40 +- tools/perf/util/env.c | 53 +- tools/perf/util/env.h | 4 + tools/perf/util/event.c | 16 +- tools/perf/util/header.c | 47 +- tools/perf/util/hist.c | 4 +- tools/perf/util/intel-pt.c | 22 +- tools/perf/util/machine.c | 662 +++------ tools/perf/util/machine.h | 32 +- tools/perf/util/map.c | 93 +- tools/perf/util/map.h | 83 +- tools/perf/util/maps.c | 1239 +++++++++++++---- tools/perf/util/maps.h | 95 +- tools/perf/util/mmap.c | 5 +- tools/perf/util/mmap.h | 1 - tools/perf/util/pmu.c | 48 +- tools/perf/util/pmus.c | 30 +- tools/perf/util/probe-event.c | 62 +- tools/perf/util/rb_resort.h | 5 - .../scripting-engines/trace-event-python.c | 21 +- tools/perf/util/session.c | 26 + tools/perf/util/session.h | 2 + tools/perf/util/sort.c | 19 +- tools/perf/util/srcline.c | 65 +- tools/perf/util/symbol-elf.c | 138 +- tools/perf/util/symbol.c | 521 ++----- tools/perf/util/symbol.h | 1 - tools/perf/util/symbol_conf.h | 4 +- tools/perf/util/symbol_fprintf.c | 4 +- tools/perf/util/synthetic-events.c | 156 ++- tools/perf/util/thread.c | 48 +- tools/perf/util/thread.h | 20 +- tools/perf/util/threads.c | 186 +++ tools/perf/util/threads.h | 35 + tools/perf/util/unwind-libunwind-local.c | 50 +- tools/perf/util/unwind-libunwind.c | 9 +- tools/perf/util/vdso.c | 89 +- tools/perf/util/zstd.c | 63 +- 89 files changed, 4129 insertions(+), 2829 deletions(-) create mode 100644 tools/lib/api/io_dir.h create mode 100644 tools/perf/util/threads.c create mode 100644 tools/perf/util/threads.h
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 1/53 perf comm: Use regular mutex
The rwsem is only after used for writing so switch to a mutex that has better error checking.
--- tools/perf/util/comm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tools/perf/util/comm.c +5 -5
@@ -17,7 +17,7 @@ struct comm_str {/* Should perhaps be moved to struct machine */ static struct rb_root comm_str_root; -static struct rw_semaphore comm_str_lock = {.lock =PTHREAD_RWLOCK_INITIALIZER ,}; +static struct mutex comm_str_lock = {.lock =PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP ,};static struct comm_str *comm_str__get (struct comm_str *cs) {
@@ -30,9 +30,9 @@ static struct comm_str *comm_str__get(struct comm_str *cs)static void comm_str__put (struct comm_str *cs) {if (cs &&refcount_dec_and_test (&cs->refcnt)) { -down_write (&comm_str_lock); +mutex_lock (&comm_str_lock);rb_erase (&cs->rb_node, &comm_str_root); -up_write (&comm_str_lock); +mutex_unlock (&comm_str_lock);zfree (&cs->str);free (cs); }
@@ -98,9 +98,9 @@ static struct comm_str *comm_str__findnew(const char *str, struct rb_root *root) {struct comm_str *cs; -down_write (&comm_str_lock); +mutex_lock (&comm_str_lock); cs =__comm_str__findnew (str, root); -up_write (&comm_str_lock); +mutex_unlock (&comm_str_lock);return cs; }
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Re: [PATCH v4 01/53] perf comm: Use regular mutex
Hi Ian,
Quoted 3 lines · Ian Rogers
The rwsem is only after used for writing so switch to a mutex that has better error checking.
Hmm.. ok. It doesn't make sense to use rwsem without readers.
Quoted 2 lines
Fixes 7a8f349e9d14 ("perf rwsem: Add debug mode that uses a mutex")
But I'm not sure this is a fix. Other than that,
Quoted 1 line
Signed-off-by Ian Rogers <[email protected]>
Thanks,
Namhyung
Quoted 44 lines
--- tools/perf/util/comm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)tools/perf/util/comm.c +5
-6@@ -17,7 +17,7 @@ struct comm_str {/* Should perhaps be moved to struct machine */ static struct rb_root comm_str_root; -static struct rw_semaphore comm_str_lock = {.lock =PTHREAD_RWLOCK_INITIALIZER ,}; +static struct mutex comm_str_lock = {.lock =PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP ,};static struct comm_str *comm_str__get (struct comm_str *cs) {@@ -30,9 +30,9 @@ static struct comm_str *comm_str__get(struct comm_str *cs)static void comm_str__put (struct comm_str *cs) {if (cs &&refcount_dec_and_test (&cs->refcnt)) { -down_write (&comm_str_lock); +mutex_lock (&comm_str_lock);rb_erase (&cs->rb_node, &comm_str_root); -up_write (&comm_str_lock); +mutex_unlock (&comm_str_lock);zfree (&cs->str);free (cs); }@@ -98,9 +98,9 @@ static struct comm_str *comm_str__findnew(const char *str, struct rb_root *root) {struct comm_str *cs; -down_write (&comm_str_lock); +mutex_lock (&comm_str_lock); cs =__comm_str__findnew (str, root); -up_write (&comm_str_lock); +mutex_unlock (&comm_str_lock);return cs; } --2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerRe: [PATCH v4 01/53] perf comm: Use regular mutex
Quoted 8 lines · Namhyung Kim
Hi Ian,
Quoted 3 lines · Ian Rogers
The rwsem is only after used for writing so switch to a mutex that has better error checking.
Quoted 6 lines
Hmm.. ok. It doesn't make sense to use rwsem without readers.
Quoted 2 lines
Fixes 7a8f349e9d14 ("perf rwsem: Add debug mode that uses a mutex")But I'm not sure this is a fix. Other than that,
Thanks Namhyung, it fixes the case that you enable RWS_ERRORCHECK in rwsem.h as the rwsem static initialization is wrong for a mutex.
Ian
Quoted 52 lines
Quoted 1 line
Signed-off-by Ian Rogers <[email protected]>Acked-by Namhyung Kim <[email protected]>Thanks,
NamhyungQuoted 44 lines
--- tools/perf/util/comm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)tools/perf/util/comm.c +5
-6@@ -17,7 +17,7 @@ struct comm_str {/* Should perhaps be moved to struct machine */ static struct rb_root comm_str_root; -static struct rw_semaphore comm_str_lock = {.lock =PTHREAD_RWLOCK_INITIALIZER ,}; +static struct mutex comm_str_lock = {.lock =PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP ,};static struct comm_str *comm_str__get (struct comm_str *cs) {@@ -30,9 +30,9 @@ static struct comm_str *comm_str__get(struct comm_str *cs)static void comm_str__put (struct comm_str *cs) {if (cs &&refcount_dec_and_test (&cs->refcnt)) { -down_write (&comm_str_lock); +mutex_lock (&comm_str_lock);rb_erase (&cs->rb_node, &comm_str_root); -up_write (&comm_str_lock); +mutex_unlock (&comm_str_lock);zfree (&cs->str);free (cs); }@@ -98,9 +98,9 @@ static struct comm_str *comm_str__findnew(const char *str, struct rb_root *root) {struct comm_str *cs; -down_write (&comm_str_lock); +mutex_lock (&comm_str_lock); cs =__comm_str__findnew (str, root); -up_write (&comm_str_lock); +mutex_unlock (&comm_str_lock);return cs; } --2.42.0.869.gea05f2083d-goog
Namhyung Kim
maintainerRe: [PATCH v4 01/53] perf comm: Use regular mutex
Quoted 13 lines · Ian Rogers
Quoted 11 lines · Namhyung Kim
Hi Ian,
Quoted 3 lines · Ian Rogers
The rwsem is only after used for writing so switch to a mutex that has better error checking.
Hmm.. ok. It doesn't make sense to use rwsem without readers.
Quoted 1 line
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Fixes 7a8f349e9d14 ("perf rwsem: Add debug mode that uses a mutex")But I'm not sure this is a fix. Other than that,
Thanks Namhyung, it fixes the case that you enable
RWS_ERRORCHECKinrwsem.has the rwsem static initialization is wrong for a mutex.
Sounds like we need a separate fix. Maybe you need to add a static initializer macro depending on the config.
Thanks,
Namhyung
Ian Rogers
reviewerRe: [PATCH v4 01/53] perf comm: Use regular mutex
Quoted 17 lines · Namhyung Kim
Quoted 15 lines · Ian Rogers
Quoted 13 lines · Namhyung Kim
Hi Ian,
Quoted 3 lines · Ian Rogers
The rwsem is only after used for writing so switch to a mutex that has better error checking.
Hmm.. ok. It doesn't make sense to use rwsem without readers.
Quoted 2 lines
Fixes 7a8f349e9d14 ("perf rwsem: Add debug mode that uses a mutex")
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
But I'm not sure this is a fix. Other than that,
Thanks Namhyung, it fixes the case that you enable
RWS_ERRORCHECKinrwsem.has the rwsem static initialization is wrong for a mutex.Sounds like we need a separate fix. Maybe you need to add a static initializer macro depending on the config.
Agreed, but the only use would be here and switching this case to a mutex gives extra error checking such as the mutex being taken recursively. Given that, I prefer the existing change and the static initializer for rwsem can be a follow up when needed.
Thanks,
Ian
Quoted 2 lines
Thanks,
Namhyung
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v4 01/53] perf comm: Use regular mutex
In reply to Namhyung KimEm Sun, Nov 05, 2023 at 09:31:47AM -0800, Namhyung Kim escreveu:
Quoted 8 lines
Hi Ian,
Quoted 3 lines · Ian Rogers
The rwsem is only after used for writing so switch to a mutex that has better error checking.
Hmm.. ok. It doesn't make sense to use rwsem without readers.
Well, the only reader is a findnew method, that will primarily read, but possibly write if it doesn't find it there, so converting to a regular mutex seems sensible.
- Arnaldo
Quoted 3 lines
Quoted 1 line
Fixes 7a8f349e9d14 ("perf rwsem: Add debug mode that uses a mutex")But I'm not sure this is a fix. Other than that,
Yeah, agreed, will remove the fixes.
Quoted 3 lines
Quoted 1 line
Signed-off-by Ian Rogers <[email protected]>Acked-by Namhyung Kim <[email protected]>
Thanks,
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v4 01/53] perf comm: Use regular mutex
Em Mon, Nov 27, 2023 at 06:53:19PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 5 lines
Em Sun, Nov 05, 2023 at 09:31:47AM -0800, Namhyung Kim escreveu:
Quoted 4 lines
Hi Ian,
Quoted 1 line · Ian Rogers
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
The rwsem is only after used for writing so switch to a mutex that has better error checking.
Hmm.. ok. It doesn't make sense to use rwsem without readers.
Well, the only reader is a findnew method, that will primarily read, but possibly write if it doesn't find it there, so converting to a regular mutex seems sensible.
To be fixed tomorrow:
3 32.71 alpine:3.15 : FAIL gcc version 10.3.1 20211027 (Alpine 10.3.1_git20211027)
util/comm.c:20:46: error: 'PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP' undeclared here (not in a function)
20 | static struct mutex comm_str_lock = {.lock = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP,};
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[3]: *** [/git/perf-6.6.0-rc1/tools/build/Makefile.build:158: util] Error 2
4 32.17 alpine:3.16 : FAIL gcc version 11.2.1 20220219 (Alpine 11.2.1_git20220219)
util/comm.c:20:46: error: 'PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP' undeclared here (not in a function)
20 | static struct mutex comm_str_lock = {.lock = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP,};
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[3]: *** [/git/perf-6.6.0-rc1/tools/build/Makefile.build:158: util] Error 2
5 25.82 alpine:3.17 : FAIL gcc version 12.2.1 20220924 (Alpine 12.2.1_git20220924-r4)
util/comm.c:20:46: error: 'PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP' undeclared here (not in a function)
20 | static struct mutex comm_str_lock = {.lock = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP,};
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[3]: *** [/git/perf-6.6.0-rc1/tools/build/Makefile.build:158: util] Error 2
6 26.64 alpine:3.18 : FAIL gcc version 12.2.1 20220924 (Alpine 12.2.1_git20220924-r10)
util/comm.c:20:46: error: 'PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP' undeclared here (not in a function)
20 | static struct mutex comm_str_lock = {.lock = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP,};
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[3]: *** [/git/perf-6.6.0-rc1/tools/build/Makefile.build:158: util] Error 2
7 29.66 alpine:edge : FAIL gcc version 13.1.1 20230722 (Alpine 13.1.1_git20230722)
util/comm.c:20:46: error: 'PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP' undeclared here (not in a function)
20 | static struct mutex comm_str_lock = {.lock = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP,};
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[3]: *** [/git/perf-6.6.0-rc1/tools/build/Makefile.build:158: util] Error 2I.e. doesn't play well with musl libc.
- Arnaldo
Ian Rogers
reviewerPATCH v4 2/53 perf record: Lazy load kernel symbols
In reply to Ian RogersCommit 5b7ba82a7591 ("perf symbols: Load kernel maps before using") changed it so that loading a kernel dso would cause the symbols for the dso to be eagerly loaded. For perf record this is overhead as the symbols won't be used. Add a symbol_conf to control the behavior and disable it for perf record and perf inject.
--- tools/perf/builtin-inject.c | 6 ++++++ tools/perf/builtin-record.c | 2 ++ tools/perf/util/event.c | 4 ++-- tools/perf/util/symbol_conf.h | 3 ++- 4 files changed, 12 insertions(+), 3 deletions(-)
tools/perf/builtin-inject.c +6 -0
@@ -2265,6 +2265,12 @@ int cmd_inject(int argc, const char **argv)"perf inject [<options>]" , NULL }; + +if (!inject.itrace_synth_opts.set) { +/* Disable eager loading of kernel symbols that adds overhead to perf inject. */ + symbol_conf.lazy_load_kernel_maps = true; + } +#ifndef HAVE_JITDUMP set_option_nobuild (options,'j' ,"jit" ,"NO_LIBELF=1" , true);#endif
tools/perf/builtin-record.c +2 -0
@@ -3989,6 +3989,8 @@ int cmd_record(int argc, const char **argv)# undef set_nobuild#endif +/* Disable eager loading of kernel symbols that adds overhead to perf record. */ + symbol_conf.lazy_load_kernel_maps = true; rec->opts.affinity =PERF_AFFINITY_SYS ; rec->evlist =evlist__new ();
tools/perf/util/event.c +2 -2
@@ -617,13 +617,13 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr,if (cpumode ==PERF_RECORD_MISC_KERNEL && perf_host) { al->level ='k' ; maps =machine__kernel_maps (machine); - load_map = true; + load_map = !symbol_conf.lazy_load_kernel_maps; }else if (cpumode ==PERF_RECORD_MISC_USER && perf_host) { al->level ='.' ; }else if (cpumode ==PERF_RECORD_MISC_GUEST_KERNEL && perf_guest) { al->level ='g' ; maps =machine__kernel_maps (machine); - load_map = true; + load_map = !symbol_conf.lazy_load_kernel_maps; }else if (cpumode ==PERF_RECORD_MISC_GUEST_USER && perf_guest) { al->level ='u' ; }else {
tools/perf/util/symbol_conf.h +2 -1
@@ -42,7 +42,8 @@ struct symbol_conf { inline_name, disable_add2line_warn, buildid_mmap2, - guest_code; + guest_code, + lazy_load_kernel_maps;const char *vmlinux_name, *kallsyms_name, *source_prefix,
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Re: [PATCH v4 02/53] perf record: Lazy load kernel symbols
Quoted 8 lines · Ian Rogers
Commit
5b7ba82a7591("perf symbols: Load kernel maps before using") changed it so that loading a kernel dso would cause the symbols for the dso to be eagerly loaded. For perf record this is overhead as the symbols won't be used. Add asymbol_confto control the behavior and disable it for perf record and perf inject.Signed-off-by Ian Rogers <[email protected]>
Thanks,
Namhyung
Quoted 74 lines
--- tools/perf/builtin-inject.c | 6 ++++++ tools/perf/builtin-record.c | 2 ++ tools/perf/util/event.c | 4 ++-- tools/perf/util/symbol_conf.h | 3 ++- 4 files changed, 12 insertions(+), 3 deletions(-)tools/perf/builtin-inject.c +6
-0@@ -2265,6 +2265,12 @@ int cmd_inject(int argc, const char **argv)"perf inject [<options>]" , NULL }; + +if (!inject.itrace_synth_opts.set) { +/* Disable eager loading of kernel symbols that adds overhead to perf inject. */ + symbol_conf.lazy_load_kernel_maps = true; + } +#ifndef HAVE_JITDUMP set_option_nobuild (options,'j' ,"jit" ,"NO_LIBELF=1" , true);#endif tools/perf/builtin-record.c +2
-0@@ -3989,6 +3989,8 @@ int cmd_record(int argc, const char **argv)# undef set_nobuild#endif +/* Disable eager loading of kernel symbols that adds overhead to perf record. */ + symbol_conf.lazy_load_kernel_maps = true; rec->opts.affinity =PERF_AFFINITY_SYS ; rec->evlist =evlist__new ();tools/perf/util/event.c +2
-2@@ -617,13 +617,13 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr,if (cpumode ==PERF_RECORD_MISC_KERNEL && perf_host) { al->level ='k' ; maps =machine__kernel_maps (machine); - load_map = true; + load_map = !symbol_conf.lazy_load_kernel_maps; }else if (cpumode ==PERF_RECORD_MISC_USER && perf_host) { al->level ='.' ; }else if (cpumode ==PERF_RECORD_MISC_GUEST_KERNEL && perf_guest) { al->level ='g' ; maps =machine__kernel_maps (machine); - load_map = true; + load_map = !symbol_conf.lazy_load_kernel_maps; }else if (cpumode ==PERF_RECORD_MISC_GUEST_USER && perf_guest) { al->level ='u' ; }else {tools/perf/util/symbol_conf.h +2
-2@@ -42,7 +42,8 @@ struct symbol_conf { inline_name, disable_add2line_warn, buildid_mmap2, - guest_code; + guest_code, + lazy_load_kernel_maps;const char *vmlinux_name, *kallsyms_name, *source_prefix, --2.42.0.869.gea05f2083d-goog
Re: [PATCH v4 02/53] perf record: Lazy load kernel symbols
In reply to Ian RogersQuoted 7 lines · Ian Rogers
Commit
5b7ba82a7591("perf symbols: Load kernel maps before using") changed it so that loading a kernel dso would cause the symbols for the dso to be eagerly loaded. For perf record this is overhead as the symbols won't be used. Add asymbol_confto control the behavior and disable it for perf record and perf inject.Signed-off-by Ian Rogers <[email protected]>
Quoted 71 lines
--- tools/perf/builtin-inject.c | 6 ++++++ tools/perf/builtin-record.c | 2 ++ tools/perf/util/event.c | 4 ++-- tools/perf/util/symbol_conf.h | 3 ++- 4 files changed, 12 insertions(+), 3 deletions(-)tools/perf/builtin-inject.c +6
-0@@ -2265,6 +2265,12 @@ int cmd_inject(int argc, const char **argv)"perf inject [<options>]" , NULL }; + +if (!inject.itrace_synth_opts.set) { +/* Disable eager loading of kernel symbols that adds overhead to perf inject. */ + symbol_conf.lazy_load_kernel_maps = true; + } +#ifndef HAVE_JITDUMP set_option_nobuild (options,'j' ,"jit" ,"NO_LIBELF=1" , true);#endif tools/perf/builtin-record.c +2
-0@@ -3989,6 +3989,8 @@ int cmd_record(int argc, const char **argv)# undef set_nobuild#endif +/* Disable eager loading of kernel symbols that adds overhead to perf record. */ + symbol_conf.lazy_load_kernel_maps = true; rec->opts.affinity =PERF_AFFINITY_SYS ; rec->evlist =evlist__new ();tools/perf/util/event.c +2
-2@@ -617,13 +617,13 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr,if (cpumode ==PERF_RECORD_MISC_KERNEL && perf_host) { al->level ='k' ; maps =machine__kernel_maps (machine); - load_map = true; + load_map = !symbol_conf.lazy_load_kernel_maps; }else if (cpumode ==PERF_RECORD_MISC_USER && perf_host) { al->level ='.' ; }else if (cpumode ==PERF_RECORD_MISC_GUEST_KERNEL && perf_guest) { al->level ='g' ; maps =machine__kernel_maps (machine); - load_map = true; + load_map = !symbol_conf.lazy_load_kernel_maps; }else if (cpumode ==PERF_RECORD_MISC_GUEST_USER && perf_guest) { al->level ='u' ; }else {tools/perf/util/symbol_conf.h +2
-1@@ -42,7 +42,8 @@ struct symbol_conf { inline_name, disable_add2line_warn, buildid_mmap2, - guest_code; + guest_code, + lazy_load_kernel_maps;const char *vmlinux_name, *kallsyms_name, *source_prefix,
Re: [PATCH v4 02/53] perf record: Lazy load kernel symbols
Em Mon, Nov 06, 2023 at 01:00:14PM +0200, Adrian Hunter escreveu:
Quoted 10 lines · Ian Rogers
Quoted 7 lines
Commit
5b7ba82a7591("perf symbols: Load kernel maps before using") changed it so that loading a kernel dso would cause the symbols for the dso to be eagerly loaded. For perf record this is overhead as the symbols won't be used. Add asymbol_confto control the behavior and disable it for perf record and perf inject.Signed-off-by Ian Rogers <[email protected]>Reviewed-by Adrian Hunter <[email protected]>
Thanks, applied to perf-tools-next.
- Arnaldo
Ian Rogers
reviewerPATCH v4 3/53 libperf: Lazily allocate mmap event copy
In reply to Ian RogersThe event copy in the mmap is used to have storage to a read event. Not all users of mmaps read the events, such as perf record, so switch the allocation to being on first read rather than being embedded within the perf_mmap.
--- tools/lib/perf/include/internal/mmap.h | 2 +- tools/lib/perf/mmap.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)
tools/lib/perf/include/internal/mmap.h +1 -1
@@ -33,7 +33,7 @@ struct perf_mmap {bool overwrite;u64 flush;libperf_unmap_cb_t unmap_cb; -char event_copy[PERF_SAMPLE_MAX_SIZE ]__aligned(8) ; +void *event_copy;struct perf_mmap *next; };
tools/lib/perf/mmap.c +9 -0
@@ -51,6 +51,8 @@ int perf_mmap__mmap(struct perf_mmap *map, struct perf_mmap_param *mp,void perf_mmap__munmap (struct perf_mmap *map) { +free (map->event_copy); + map->event_copy =NULL ;if (map && map->base !=NULL ) {munmap (map->base,perf_mmap__mmap_len (map)); map->base =NULL ;
@@ -226,6 +228,13 @@ static union perf_event *perf_mmap__read(struct perf_mmap *map,unsigned int len =min (sizeof (*event), size), cpy;void *dst = map->event_copy; +if (!dst) { + dst =malloc (PERF_SAMPLE_MAX_SIZE ); +if (!dst) +return NULL ; + map->event_copy = dst; + } + do { cpy = min(map->mask + 1 - (offset & map->mask), len); memcpy(dst, &data[offset & map->mask], cpy);
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Re: [PATCH v4 03/53] libperf: Lazily allocate mmap event copy
Hi,
Quoted 29 lines · Ian Rogers
The event copy in the mmap is used to have storage to a read event. Not all users of mmaps read the events, such as perf record, so switch the allocation to being on first read rather than being embedded within the
perf_mmap.Signed-off-by Ian Rogers <[email protected]>--- tools/lib/perf/include/internal/mmap.h | 2 +- tools/lib/perf/mmap.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)tools/lib/perf/include/internal/mmap.h +1
-1@@ -33,7 +33,7 @@ struct perf_mmap {bool overwrite;u64 flush;libperf_unmap_cb_t unmap_cb; -char event_copy[PERF_SAMPLE_MAX_SIZE ]__aligned(8) ; +void *event_copy;struct perf_mmap *next; };tools/lib/perf/mmap.c +0
-0
tools/lib/perf/mmap.c int perf_mmap__mmap(struct perf_mmap *map, struct perf_mmap_param *mp, · line 56
Quoted 6 lines
tools/lib/perf/mmap.c +2
-0@@ -51,6 +51,8 @@ int perf_mmap__mmap(struct perf_mmap *map, struct perf_mmap_param *mp,void perf_mmap__munmap (struct perf_mmap *map) { +free (map->event_copy); + map->event_copy =NULL ;if (map && map->base !=NULL ) {
If map can be NULL as the if statement above suggests, then there is a potential a null pointer dereference bug here. Suggestion:
if (!map)
return;
free(map->event_copy);
map->event_copy = NULL;
if (map->base != NULL) {
...Cheers,
-Guilherme
Quoted 20 lines
tools/lib/perf/mmap.c +7
-0munmap (map->base,perf_mmap__mmap_len (map)); map->base =NULL ;@@ -226,6 +228,13 @@ static union perf_event *perf_mmap__read(struct perf_mmap *map,unsigned int len =min (sizeof (*event), size), cpy;void *dst = map->event_copy; +if (!dst) { + dst =malloc (PERF_SAMPLE_MAX_SIZE ); +if (!dst) +return NULL ; + map->event_copy = dst; + } + do { cpy = min(map->mask + 1 - (offset & map->mask), len); memcpy(dst, &data[offset & map->mask], cpy);Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerRe: [PATCH v4 03/53] libperf: Lazily allocate mmap event copy
Quoted 43 lines · Guilherme Amadio
Hi,
Quoted 29 lines · Ian Rogers
The event copy in the mmap is used to have storage to a read event. Not all users of mmaps read the events, such as perf record, so switch the allocation to being on first read rather than being embedded within the
perf_mmap.Signed-off-by Ian Rogers <[email protected]>--- tools/lib/perf/include/internal/mmap.h | 2 +- tools/lib/perf/mmap.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)tools/lib/perf/include/internal/mmap.h +1
-1@@ -33,7 +33,7 @@ struct perf_mmap {bool overwrite;u64 flush;libperf_unmap_cb_t unmap_cb; -char event_copy[PERF_SAMPLE_MAX_SIZE ]__aligned(8) ; +void *event_copy;struct perf_mmap *next; };tools/lib/perf/mmap.c +0
-0tools/lib/perf/mmap.c int perf_mmap__mmap(struct perf_mmap *map, struct perf_mmap_param *mp, · line 56
Quoted 6 lines
tools/lib/perf/mmap.c +2
-0@@ -51,6 +51,8 @@ int perf_mmap__mmap(struct perf_mmap *map, struct perf_mmap_param *mp,void perf_mmap__munmap (struct perf_mmap *map) { +free (map->event_copy); + map->event_copy =NULL ;if (map && map->base !=NULL ) {If map can be NULL as the if statement above suggests, then there is a potential a null pointer dereference bug here. Suggestion:
Quoted 8 lines
if (!map)
return;
free(map->event_copy);
map->event_copy = NULL;
if (map->base != NULL) {
...Makes sense, will fix in v5. Waiting to get additional feedback to avoid too much email.
Thanks,
Ian
Quoted 23 lines
Cheers,
-GuilhermeQuoted 20 lines
tools/lib/perf/mmap.c +7
-1munmap (map->base,perf_mmap__mmap_len (map)); map->base =NULL ;@@ -226,6 +228,13 @@ static union perf_event *perf_mmap__read(struct perf_mmap *map,unsigned int len =min (sizeof (*event), size), cpy;void *dst = map->event_copy; +if (!dst) { + dst =malloc (PERF_SAMPLE_MAX_SIZE ); +if (!dst) +return NULL ; + map->event_copy = dst; + } + do { cpy = min(map->mask + 1 - (offset & map->mask), len); memcpy(dst, &data[offset & map->mask], cpy); --2.42.0.869.gea05f2083d-goog
Re: [PATCH v4 03/53] libperf: Lazily allocate mmap event copy
Quoted 48 lines · Ian Rogers
Quoted 46 lines · Guilherme Amadio
Hi,
Quoted 29 lines · Ian Rogers
The event copy in the mmap is used to have storage to a read event. Not all users of mmaps read the events, such as perf record, so switch the allocation to being on first read rather than being embedded within the
perf_mmap.Signed-off-by Ian Rogers <[email protected]>--- tools/lib/perf/include/internal/mmap.h | 2 +- tools/lib/perf/mmap.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)tools/lib/perf/include/internal/mmap.h +1
-1@@ -33,7 +33,7 @@ struct perf_mmap {bool overwrite;u64 flush;libperf_unmap_cb_t unmap_cb; -char event_copy[PERF_SAMPLE_MAX_SIZE ]__aligned(8) ; +void *event_copy;struct perf_mmap *next; };tools/lib/perf/mmap.c +0
-0tools/lib/perf/mmap.c int perf_mmap__mmap(struct perf_mmap *map, struct perf_mmap_param *mp, · line 56
Quoted 6 lines
tools/lib/perf/mmap.c +2
-0@@ -51,6 +51,8 @@ int perf_mmap__mmap(struct perf_mmap *map, struct perf_mmap_param *mp,void perf_mmap__munmap (struct perf_mmap *map) { +free (map->event_copy); + map->event_copy =NULL ;if (map && map->base !=NULL ) {If map can be NULL as the if statement above suggests, then there is a potential a null pointer dereference bug here. Suggestion:
if (!map) return;
Quoted 8 lines
Quoted 5 lines
free(map->event_copy); map->event_copy = NULL; if (map->base != NULL) { ...Makes sense, will fix in v5. Waiting to get additional feedback to avoid too much email.
But I have another concern (not related to this change).
Quoted 5 lines
Quoted 5 lines
tools/lib/perf/mmap.c static union perf_event *perf_mmap__read(struct perf_mmap *map, · line 228
Quoted 5 lines
tools/lib/perf/mmap.c +0
-0munmap (map->base,perf_mmap__mmap_len (map)); map->base =NULL ;@@ -226,6 +228,13 @@ static union perf_event *perf_mmap__read(struct perf_mmap *map,unsigned int len =min (sizeof (*event), size), cpy;
I'm not sure if it's ok to read less than the actual size, IOW it seems to assume 'size' is smaller than sizeof(*event). I guess it's true for most cases as union perf_event has perf_record_mmap2 (among others) which contains a filename array of size PATH_MAX.
But the SAMPLE record can be larger than that when it has PERF_SAMPLE_AUX IIRC. It'd happen only if it crossed the mmap boundary and I'm afraid it'd corrupt the data.
Thanks,
Namhyung
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
tools/lib/perf/mmap.c +7
-1void *dst = map->event_copy; +if (!dst) { + dst =malloc (PERF_SAMPLE_MAX_SIZE ); +if (!dst) +return NULL ; + map->event_copy = dst; + } + do { cpy = min(map->mask + 1 - (offset & map->mask), len); memcpy(dst, &data[offset & map->mask], cpy); --2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerRe: [PATCH v4 03/53] libperf: Lazily allocate mmap event copy
Quoted 76 lines · Namhyung Kim
Quoted 48 lines · Ian Rogers
Quoted 46 lines · Guilherme Amadio
Hi,
Quoted 29 lines · Ian Rogers
The event copy in the mmap is used to have storage to a read event. Not all users of mmaps read the events, such as perf record, so switch the allocation to being on first read rather than being embedded within the
perf_mmap.Signed-off-by Ian Rogers <[email protected]>--- tools/lib/perf/include/internal/mmap.h | 2 +- tools/lib/perf/mmap.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)tools/lib/perf/include/internal/mmap.h +1
-1@@ -33,7 +33,7 @@ struct perf_mmap {bool overwrite;u64 flush;libperf_unmap_cb_t unmap_cb; -char event_copy[PERF_SAMPLE_MAX_SIZE ]__aligned(8) ; +void *event_copy;struct perf_mmap *next; };tools/lib/perf/mmap.c +0
-0tools/lib/perf/mmap.c int perf_mmap__mmap(struct perf_mmap *map, struct perf_mmap_param *mp, · line 56
Quoted 6 lines
tools/lib/perf/mmap.c +2
-0@@ -51,6 +51,8 @@ int perf_mmap__mmap(struct perf_mmap *map, struct perf_mmap_param *mp,void perf_mmap__munmap (struct perf_mmap *map) { +free (map->event_copy); + map->event_copy =NULL ;if (map && map->base !=NULL ) {If map can be NULL as the if statement above suggests, then there is a potential a null pointer dereference bug here. Suggestion:
if (!map) return;Quoted 8 lines
Quoted 5 lines
free(map->event_copy); map->event_copy = NULL; if (map->base != NULL) { ...Makes sense, will fix in v5. Waiting to get additional feedback to avoid too much email.
Acked-by Namhyung Kim <[email protected]>But I have another concern (not related to this change).
Quoted 5 lines
Quoted 5 lines
tools/lib/perf/mmap.c static union perf_event *perf_mmap__read(struct perf_mmap *map, · line 228
Quoted 5 lines
tools/lib/perf/mmap.c +0
-0munmap (map->base,perf_mmap__mmap_len (map)); map->base =NULL ;@@ -226,6 +228,13 @@ static union perf_event *perf_mmap__read(struct perf_mmap *map,unsigned int len =min (sizeof (*event), size), cpy;I'm not sure if it's ok to read less than the actual size, IOW it seems to assume 'size' is smaller than
sizeof(*event). I guess it's true for most cases as unionperf_eventhasperf_record_mmap2(among others) which contains a filename array of sizePATH_MAX.
Quoted 3 lines
But the SAMPLE record can be larger than that when it has
PERF_SAMPLE_AUXIIRC. It'd happen only if it crossed the mmap boundary and I'm afraid it'd corrupt the data.
Thanks, I was thinking this would just be a drop in change but I think given this feedback it would be better to switch from allocating once a PERF_SAMPLE_MAX_SIZE buffer to allocating or reallocating one based on size. This potentially saves memory when size is less than PERF_SAMPLE_MAX_SIZE and by removing the min calculation for the amount copied (len) we can potentially exceed it and fix a potential bug. I'll add this in v5.
Thanks,
Ian
Quoted 20 lines
Thanks,
NamhyungQuoted 16 lines
Quoted 16 lines
Quoted 16 lines
tools/lib/perf/mmap.c +7
-1void *dst = map->event_copy; +if (!dst) { + dst =malloc (PERF_SAMPLE_MAX_SIZE ); +if (!dst) +return NULL ; + map->event_copy = dst; + } + do { cpy = min(map->mask + 1 - (offset & map->mask), len); memcpy(dst, &data[offset & map->mask], cpy); --2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 4/53 perf mmap: Lazily initialize zstd streams
In reply to Ian RogersZstd streams create dictionaries that can require significant RAM, especially when there is one per-CPU. Tools like perf record won't use the streams without the -z option, and so the creation of the streams is pure overhead. Switch to creating the streams on first use.
--- tools/perf/builtin-record.c | 26 ++++++++++----- tools/perf/util/compress.h | 6 ++-- tools/perf/util/mmap.c | 5 ++- tools/perf/util/mmap.h | 1 - tools/perf/util/zstd.c | 63 +++++++++++++++++++------------------ 5 files changed, 58 insertions(+), 43 deletions(-)
tools/perf/builtin-record.c +19 -7
@@ -270,7 +270,7 @@ static int record__write(struct record *rec, struct mmap *map __maybe_unused,static int record__aio_enabled (struct record *rec);static int record__comp_enabled (struct record *rec); -static size_t zstd_compress (struct perf_session *session,struct mmap *map, +static ssize_t zstd_compress (struct perf_session *session,struct mmap *map,void *dst,size_t dst_size,void *src,size_t src_size);#ifdef HAVE_AIO_SUPPORT
@@ -405,9 +405,13 @@ static int record__aio_pushfn(struct mmap *map, void *to, void *buf, size_t size*/ if (record__comp_enabled (aio->rec)) { - size =zstd_compress (aio->rec->session,NULL , aio->data + aio->size, -mmap__mmap_len (map) - aio->size, - buf, size); +ssize_t compressed =zstd_compress (aio->rec->session,NULL , aio->data + aio->size, +mmap__mmap_len (map) - aio->size, + buf, size); +if (compressed <0 ) +return (int )compressed; + + size = compressed; }else {memcpy (aio->data + aio->size, buf, size); }
@@ -633,7 +637,13 @@ static int record__pushfn(struct mmap *map, void *to, void *bf, size_t size)struct record *rec = to;if (record__comp_enabled (rec)) { - size =zstd_compress (rec->session, map, map->data,mmap__mmap_len (map), bf, size); +ssize_t compressed =zstd_compress (rec->session, map, map->data, +mmap__mmap_len (map), bf, size); + +if (compressed <0 ) +return (int )compressed; + + size = compressed; bf = map->data; }
@@ -1527,10 +1537,10 @@ static size_t process_comp_header(void *record, size_t increment)return size; } -static size_t zstd_compress (struct perf_session *session,struct mmap *map, +static ssize_t zstd_compress (struct perf_session *session,struct mmap *map,void *dst,size_t dst_size,void *src,size_t src_size) { -size_t compressed; +ssize_t compressed;size_t max_record_size =PERF_SAMPLE_MAX_SIZE -sizeof (struct perf_record_compressed ) -1 ;struct zstd_data *zstd_data = &session->zstd_data;
@@ -1539,6 +1549,8 @@ static size_t zstd_compress(struct perf_session *session, struct mmap *map, compressed =zstd_compress_stream_to_records (zstd_data, dst, dst_size, src, src_size, max_record_size, process_comp_header); +if (compressed <0 ) +return compressed;if (map && map->file) { thread->bytes_transferred += src_size;
tools/perf/util/compress.h +4 -2
@@ -3,6 +3,7 @@#define PERF_COMPRESS_H #include <stdbool.h> +#include <stdlib.h> #ifdef HAVE_ZSTD_SUPPORT #include <zstd.h> #endif
@@ -21,6 +22,7 @@ struct zstd_data {#ifdef HAVE_ZSTD_SUPPORT ZSTD_CStream *cstream;ZSTD_DStream *dstream; +int comp_level;#endif };
@@ -29,7 +31,7 @@ struct zstd_data {int zstd_init (struct zstd_data *data,int level);int zstd_fini (struct zstd_data *data); -size_t zstd_compress_stream_to_records (struct zstd_data *data,void *dst,size_t dst_size, +ssize_t zstd_compress_stream_to_records (struct zstd_data *data,void *dst,size_t dst_size,void *src,size_t src_size,size_t max_record_size,size_t process_header (void *record,size_t increment));
@@ -48,7 +50,7 @@ static inline int zstd_fini(struct zstd_data *data __maybe_unused) } static inline -size_t zstd_compress_stream_to_records(struct zstd_data *data __maybe_unused, +ssize_t zstd_compress_stream_to_records(struct zstd_data *data __maybe_unused, void *dst __maybe_unused, size_t dst_size __maybe_unused, void *src __maybe_unused, size_t src_size __maybe_unused, size_t max_record_size __maybe_unused,
tools/perf/util/mmap.c +2 -3
@@ -295,15 +295,14 @@ int mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, struct perf_cpu map->core.flush = mp->flush; - map->comp_level = mp->comp_level;#ifndef PYTHON_PERF -if (zstd_init (&map->zstd_data, map->comp_level)) { +if (zstd_init (&map->zstd_data, mp->comp_level)) {pr_debug2 ("failed to init mmap compressor, error %d\n" , errno);return -1 ; }#endif -if (map->comp_level && !perf_mmap__aio_enabled (map)) { +if (mp->comp_level && !perf_mmap__aio_enabled (map)) { map->data =mmap (NULL ,mmap__mmap_len (map),PROT_READ |PROT_WRITE ,MAP_PRIVATE |MAP_ANONYMOUS ,0 ,0 );if (map->data ==MAP_FAILED ) {
tools/perf/util/mmap.h +0 -1
@@ -39,7 +39,6 @@ struct mmap {#endif struct mmap_cpu_mask affinity_mask;void *data; -int comp_level;struct perf_data_file *file;struct zstd_data zstd_data; };
tools/perf/util/zstd.c +33 -30
87 lines not on this page · raw message
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Re: [PATCH v4 04/53] perf mmap: Lazily initialize zstd streams
Em Thu, Nov 02, 2023 at 10:56:46AM -0700, Ian Rogers escreveu:
Quoted 6 lines
Zstd streams create dictionaries that can require significant RAM, especially when there is one per-CPU. Tools like perf record won't use the streams without the -z option, and so the creation of the streams is pure overhead. Switch to creating the streams on first use.
Signed-off-by Ian Rogers <[email protected]>
Thanks, applied to perf-tools-next.
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v4 04/53] perf mmap: Lazily initialize zstd streams
Em Mon, Nov 27, 2023 at 07:00:06PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 9 lines
Em Thu, Nov 02, 2023 at 10:56:46AM -0700, Ian Rogers escreveu:
Quoted 6 lines
Zstd streams create dictionaries that can require significant RAM, especially when there is one per-CPU. Tools like perf record won't use the streams without the -z option, and so the creation of the streams is pure overhead. Switch to creating the streams on first use.
Signed-off-by Ian Rogers <[email protected]>Thanks, applied to perf-tools-next.
Trying to fix this now:
6 20.59 alpine:3.18 : FAIL gcc version 12.2.1 20220924 (Alpine 12.2.1_git20220924-r10)
In file included from util/zstd.c:5:
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~
| size_t
util/zstd.c:31:9: error: conflicting types for 'zstd_compress_stream_to_records'; have 'ssize_t(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'long int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
31 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:9: note: previous declaration of 'zstd_compress_stream_to_records' with type 'int(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[3]: *** [/git/perf-6.6.0-rc1/tools/build/Makefile.build:158: util] Error 2
CC /tmp/build/perf/util/zstd.o
CC /tmp/build/perf/util/cap.o
CXX /tmp/build/perf/util/demangle-cxx.o
CC /tmp/build/perf/util/demangle-ocaml.o
In file included from util/zstd.c:5:
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~
| size_t
CC /tmp/build/perf/util/demangle-java.o
util/zstd.c:31:9: error: conflicting types for 'zstd_compress_stream_to_records'; have 'ssize_t(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'long int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
31 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:9: note: previous declaration of 'zstd_compress_stream_to_records' with type 'int(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
7 21.14 alpine:edge : FAIL gcc version 13.1.1 20230722 (Alpine 13.1.1_git20230722)
In file included from util/zstd.c:5:
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~
| size_t
util/zstd.c:31:9: error: conflicting types for 'zstd_compress_stream_to_records'; have 'ssize_t(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'long int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
31 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:9: note: previous declaration of 'zstd_compress_stream_to_records' with type 'int(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[3]: *** [/git/perf-6.6.0-rc1/tools/build/Makefile.build:158: util] Error 2
CC /tmp/build/perf/util/cap.o
CXX /tmp/build/perf/util/demangle-cxx.o
CC /tmp/build/perf/util/demangle-ocaml.o
CC /tmp/build/perf/util/demangle-java.o
In file included from util/zstd.c:5:
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~
| size_t
util/zstd.c:31:9: error: conflicting types for 'zstd_compress_stream_to_records'; have 'ssize_t(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'long int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
31 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:9: note: previous declaration of 'zstd_compress_stream_to_records' with type 'int(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Arnaldo Carvalho de Melo
maintainerRe: [PATCH v4 04/53] perf mmap: Lazily initialize zstd streams
Em Tue, Nov 28, 2023 at 02:14:33PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 9 lines
Em Mon, Nov 27, 2023 at 07:00:06PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 7 lines
Em Thu, Nov 02, 2023 at 10:56:46AM -0700, Ian Rogers escreveu:
Quoted 6 lines
Zstd streams create dictionaries that can require significant RAM, especially when there is one per-CPU. Tools like perf record won't use the streams without the -z option, and so the creation of the streams is pure overhead. Switch to creating the streams on first use.
Signed-off-by Ian Rogers <[email protected]>
Quoted 7 lines
Quoted 1 line
Thanks, applied to perf-tools-next.
Trying to fix this now:
6 20.59 alpine:3.18 : FAIL gcc version 12.2.1 20220924 (Alpine 12.2.1_git20220924-r10)
In file included fromutil/zstd.c:5:
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
So the problem was really the one above, that got fixed with the patch below, that is what 'man size_t' documents on my fedora:38 system.
- Arnaldo
tools/perf/util/compress.h +2 -1
@@ -3,7 +3,8 @@#define PERF_COMPRESS_H #include <stdbool.h> -#include <stdlib.h> +#include <stddef.h> +#include <sys/types.h> #ifdef HAVE_ZSTD_SUPPORT #include <zstd.h> #endif
Quoted 54 lines
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~
| size_t
util/zstd.c:31:9: error: conflicting types for 'zstd_compress_stream_to_records'; have 'ssize_t(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'long int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
31 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:9: note: previous declaration of 'zstd_compress_stream_to_records' with type 'int(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[3]: *** [/git/perf-6.6.0-rc1/tools/build/Makefile.build:158: util] Error 2
CC /tmp/build/perf/util/zstd.o
CC /tmp/build/perf/util/cap.o
CXX /tmp/build/perf/util/demangle-cxx.o
CC /tmp/build/perf/util/demangle-ocaml.o
In file included from util/zstd.c:5:
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~
| size_t
CC /tmp/build/perf/util/demangle-java.o
util/zstd.c:31:9: error: conflicting types for 'zstd_compress_stream_to_records'; have 'ssize_t(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'long int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
31 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:9: note: previous declaration of 'zstd_compress_stream_to_records' with type 'int(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
7 21.14 alpine:edge : FAIL gcc version 13.1.1 20230722 (Alpine 13.1.1_git20230722)
In file included from util/zstd.c:5:
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~
| size_t
util/zstd.c:31:9: error: conflicting types for 'zstd_compress_stream_to_records'; have 'ssize_t(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'long int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
31 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:9: note: previous declaration of 'zstd_compress_stream_to_records' with type 'int(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[3]: *** [/git/perf-6.6.0-rc1/tools/build/Makefile.build:158: util] Error 2
CC /tmp/build/perf/util/cap.o
CXX /tmp/build/perf/util/demangle-cxx.o
CC /tmp/build/perf/util/demangle-ocaml.o
CC /tmp/build/perf/util/demangle-java.o
In file included from util/zstd.c:5:
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~
| size_t
util/zstd.c:31:9: error: conflicting types for 'zstd_compress_stream_to_records'; have 'ssize_t(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'long int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
31 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:9: note: previous declaration of 'zstd_compress_stream_to_records' with type 'int(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'}
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Ian Rogers
reviewerRe: [PATCH v4 04/53] perf mmap: Lazily initialize zstd streams
Quoted 13 lines · Arnaldo Carvalho de Melo
Em Tue, Nov 28, 2023 at 02:14:33PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 10 lines
Em Mon, Nov 27, 2023 at 07:00:06PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 9 lines
Em Thu, Nov 02, 2023 at 10:56:46AM -0700, Ian Rogers escreveu:
Quoted 6 lines
Zstd streams create dictionaries that can require significant RAM, especially when there is one per-CPU. Tools like perf record won't use the streams without the -z option, and so the creation of the streams is pure overhead. Switch to creating the streams on first use.
Signed-off-by Ian Rogers <[email protected]>Thanks, applied to perf-tools-next.
Quoted 8 lines
Quoted 5 lines
Trying to fix this now:
6 20.59 alpine:3.18 : FAIL gcc version 12.2.1 20220924 (Alpine 12.2.1_git20220924-r10)
In file included fromutil/zstd.c:5:
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?So the problem was really the one above, that got fixed with the patch below, that is what 'man
size_t' documents on my fedora:38 system.
Thanks, perhaps this is something clang-tidy, clang-format or similar could help with in the future. There was event IWYU discussion at LPC:
https://lpc.events/event/17/contributions/1620/attachments/1228/2520/Linux%20Kernel%20Header%20Optimization.pdf
Thanks,
Ian
Quoted 73 lines
- Arnaldo
tools/perf/util/compress.h +2
-1@@ -3,7 +3,8 @@#define PERF_COMPRESS_H #include <stdbool.h> -#include <stdlib.h> +#include <stddef.h> +#include <sys/types.h> #ifdef HAVE_ZSTD_SUPPORT #include <zstd.h> #endif Quoted 46 lines
34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size, | ^~~~~~~ | size_t util/zstd.c:31:9: error: conflicting types for 'zstd_compress_stream_to_records'; have 'ssize_t(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'long int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'} 31 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:9: note: previous declaration of 'zstd_compress_stream_to_records' with type 'int(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'} 34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ make[3]: *** [/git/perf-6.6.0-rc1/tools/build/Makefile.build:158: util] Error 2 CC /tmp/build/perf/util/zstd.o CC /tmp/build/perf/util/cap.o CXX /tmp/build/perf/util/demangle-cxx.o CC /tmp/build/perf/util/demangle-ocaml.o In file included from util/zstd.c:5: /git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? 34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size, | ^~~~~~~ | size_t CC /tmp/build/perf/util/demangle-java.o util/zstd.c:31:9: error: conflicting types for 'zstd_compress_stream_to_records'; have 'ssize_t(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'long int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'} 31 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:9: note: previous declaration of 'zstd_compress_stream_to_records' with type 'int(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'} 34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size, 7 21.14 alpine:edge : FAIL gcc version 13.1.1 20230722 (Alpine 13.1.1_git20230722) In file included from util/zstd.c:5: /git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? 34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size, | ^~~~~~~ | size_t util/zstd.c:31:9: error: conflicting types for 'zstd_compress_stream_to_records'; have 'ssize_t(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'long int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'} 31 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:9: note: previous declaration of 'zstd_compress_stream_to_records' with type 'int(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'} 34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ make[3]: *** [/git/perf-6.6.0-rc1/tools/build/Makefile.build:158: util] Error 2 CC /tmp/build/perf/util/cap.o CXX /tmp/build/perf/util/demangle-cxx.o CC /tmp/build/perf/util/demangle-ocaml.o CC /tmp/build/perf/util/demangle-java.o In file included from util/zstd.c:5: /git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:1: error: unknown type name 'ssize_t'; did you mean 'size_t'? 34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size,Quoted 9 lines
| ^~~~~~~ | size_t util/zstd.c:31:9: error: conflicting types for 'zstd_compress_stream_to_records'; have 'ssize_t(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'long int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'} 31 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:9: note: previous declaration of 'zstd_compress_stream_to_records' with type 'int(struct zstd_data *, void *, size_t, void *, size_t, size_t, size_t (*)(void *, size_t))' {aka 'int(struct zstd_data *, void *, long unsigned int, void *, long unsigned int, long unsigned int, long unsigned int (*)(void *, long unsigned int))'} 34 | ssize_t zstd_compress_stream_to_records(struct zstd_data *data, void *dst, size_t dst_size, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v4 04/53] perf mmap: Lazily initialize zstd streams
Em Tue, Nov 28, 2023 at 09:55:22AM -0800, Ian Rogers escreveu:
Quoted 8 lines · Arnaldo Carvalho de Melo
Quoted 6 lines
Em Tue, Nov 28, 2023 at 02:14:33PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 5 lines
Trying to fix this now:
6 20.59 alpine:3.18 : FAIL gcc version 12.2.1 20220924 (Alpine 12.2.1_git20220924-r10)
In file included fromutil/zstd.c:5:
/git/perf-6.6.0-rc1/tools/perf/util/compress.h:34:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
Quoted 6 lines
Quoted 2 lines
So the problem was really the one above, that got fixed with the patch below, that is what 'man
size_t' documents on my fedora:38 system.Thanks, perhaps this is something clang-tidy, clang-format or similar could help with in the future. There was event IWYU discussion at LPC:
https://lpc.events/event/17/contributions/1620/attachments/1228/2520/Linux%20Kernel%20Header%20Optimization.pdf
Yeah, that is interesting, I took a quick look and it looks promising.
I did this manually in various areas of the kernel and in tools/perf from time to time, to speed up the building process, etc.
- Arnaldo
Ian Rogers
reviewerPATCH v4 5/53 perf machine thread: Remove exited threads by default
In reply to Ian Rogersstruct thread values hold onto references to mmaps, dsos, etc. When a thread exits it is necessary to clean all of this memory up by removing the thread from the machine's threads. Some tools require this doesn't happen, such as auxtrace events, perf report if offcpu events exist or if a task list is being generated, so add a symbol_conf value to make the behavior optional. When an exited thread is left in the machine's threads, mark it as exited.
This change relates to commit 40826c45eb0b ("perf thread: Remove notion of dead threads"). Dead threads were removed as they had a reference count of 0 and were difficult to reason about with the reference count checker. Here a thread is removed from threads when it exits, unless via symbol_conf the exited thread isn't remove and is marked as exited. Reference counting behaves as it normally does.
--- tools/perf/builtin-report.c | 7 +++++++ tools/perf/util/machine.c | 10 +++++++--- tools/perf/util/session.c | 5 +++++ tools/perf/util/symbol_conf.h | 3 ++- tools/perf/util/thread.h | 14 ++++++++++++++ 5 files changed, 35 insertions(+), 4 deletions(-)
tools/perf/builtin-report.c +7 -0
@@ -1426,6 +1426,13 @@ int cmd_report(int argc, const char **argv)if (ret <0 ) goto exit; +/* +* tasks_mode require access to exited threads to list those that are in +* the data file. Off-cpu events are synthesized after other events and +* reference exited threads. +*/ + symbol_conf.keep_exited_threads = true; +annotation_options__init (&report.annotation_opts); ret =perf_config (report__config, &report);
tools/perf/util/machine.c +7 -3
@@ -2157,9 +2157,13 @@ int machine__process_exit_event(struct machine *machine, union perf_event *eventif (dump_trace)perf_event__fprintf_task (event, stdout); -if (thread !=NULL ) -thread__put (thread); - +if (thread !=NULL ) { +if (symbol_conf.keep_exited_threads) +thread__set_exited (thread,/*exited=*/ true); +else +machine__remove_thread (machine, thread); + } +thread__put (thread);return 0 ; }
tools/perf/util/session.c +5 -0
@@ -115,6 +115,11 @@ static int perf_session__open(struct perf_session *session, int repipe_fd)return -1 ; } +if (perf_header__has_feat (&session->header,HEADER_AUXTRACE )) { +/* Auxiliary events may reference exited threads, hold onto dead ones. */ + symbol_conf.keep_exited_threads = true; + } +if (perf_data__is_pipe (data))return 0 ;
tools/perf/util/symbol_conf.h +2 -1
@@ -43,7 +43,8 @@ struct symbol_conf { disable_add2line_warn, buildid_mmap2, guest_code, - lazy_load_kernel_maps; + lazy_load_kernel_maps, + keep_exited_threads;const char *vmlinux_name, *kallsyms_name, *source_prefix,
tools/perf/util/thread.h +14 -0
@@ -36,13 +36,22 @@ struct thread_rb_node { };DECLARE_RC_STRUCT (thread) { +/** @maps: mmaps associated with this thread. */ struct maps *maps;pid_t pid_;/* Not all tools update this */ +/** @tid: thread ID number unique to a machine. */ pid_t tid; +/** @ppid: parent process of the process this thread belongs to. */ pid_t ppid;int cpu;int guest_cpu;/* For QEMU thread */ refcount_t refcnt; +/** +* @exited: Has the thread had an exit event. Such threads are usually +* removed from the machine's threads but some events/tools require +* access to dead threads. +*/ +bool exited;bool comm_set;int comm_len;struct list_head namespaces_list;
@@ -189,6 +198,11 @@ static inline refcount_t *thread__refcnt(struct thread *thread)return &RC_CHK_ACCESS (thread)->refcnt; } +static inline void thread__set_exited (struct thread *thread,bool exited) +{ +RC_CHK_ACCESS (thread)->exited = exited; +} +static inline bool thread__comm_set (const struct thread *thread) {return RC_CHK_ACCESS (thread)->comm_set;
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Re: [PATCH v4 05/53] perf machine thread: Remove exited threads by default
Quoted 8 lines · Ian Rogers
struct thread values hold onto references to mmaps, dsos, etc. When a thread exits it is necessary to clean all of this memory up by removing the thread from the machine's threads. Some tools require this doesn't happen, such as auxtrace events, perf report if offcpu events exist or if a task list is being generated, so add a
symbol_confvalue to make the behavior optional. When an exited thread is left in the machine's threads, mark it as exited.
Quoted 8 lines
This change relates to commit
40826c45eb0b("perf thread: Remove notion of dead threads"). Dead threads were removed as they had a reference count of 0 and were difficult to reason about with the reference count checker. Here a thread is removed from threads when it exits, unless viasymbol_confthe exited thread isn't remove and is marked as exited. Reference counting behaves as it normally does.Signed-off-by Ian Rogers <[email protected]>
For auxtrace:
Quoted 116 lines
--- tools/perf/builtin-report.c | 7 +++++++ tools/perf/util/machine.c | 10 +++++++--- tools/perf/util/session.c | 5 +++++ tools/perf/util/symbol_conf.h | 3 ++- tools/perf/util/thread.h | 14 ++++++++++++++ 5 files changed, 35 insertions(+), 4 deletions(-)tools/perf/builtin-report.c +7
-0@@ -1426,6 +1426,13 @@ int cmd_report(int argc, const char **argv)if (ret <0 ) goto exit; +/* +* tasks_mode require access to exited threads to list those that are in +* the data file. Off-cpu events are synthesized after other events and +* reference exited threads. +*/ + symbol_conf.keep_exited_threads = true; +annotation_options__init (&report.annotation_opts); ret =perf_config (report__config, &report);tools/perf/util/machine.c +7
-3@@ -2157,9 +2157,13 @@ int machine__process_exit_event(struct machine *machine, union perf_event *eventif (dump_trace)perf_event__fprintf_task (event, stdout); -if (thread !=NULL ) -thread__put (thread); - +if (thread !=NULL ) { +if (symbol_conf.keep_exited_threads) +thread__set_exited (thread,/*exited=*/ true); +else +machine__remove_thread (machine, thread); + } +thread__put (thread);return 0 ; }tools/perf/util/session.c +5
-0@@ -115,6 +115,11 @@ static int perf_session__open(struct perf_session *session, int repipe_fd)return -1 ; } +if (perf_header__has_feat (&session->header,HEADER_AUXTRACE )) { +/* Auxiliary events may reference exited threads, hold onto dead ones. */ + symbol_conf.keep_exited_threads = true; + } +if (perf_data__is_pipe (data))return 0 ;tools/perf/util/symbol_conf.h +2
-1@@ -43,7 +43,8 @@ struct symbol_conf { disable_add2line_warn, buildid_mmap2, guest_code, - lazy_load_kernel_maps; + lazy_load_kernel_maps, + keep_exited_threads;const char *vmlinux_name, *kallsyms_name, *source_prefix,tools/perf/util/thread.h +14
-0@@ -36,13 +36,22 @@ struct thread_rb_node { };DECLARE_RC_STRUCT (thread) { +/** @maps: mmaps associated with this thread. */ struct maps *maps;pid_t pid_;/* Not all tools update this */ +/** @tid: thread ID number unique to a machine. */ pid_t tid; +/** @ppid: parent process of the process this thread belongs to. */ pid_t ppid;int cpu;int guest_cpu;/* For QEMU thread */ refcount_t refcnt; +/** +* @exited: Has the thread had an exit event. Such threads are usually +* removed from the machine's threads but some events/tools require +* access to dead threads. +*/ +bool exited;bool comm_set;int comm_len;struct list_head namespaces_list;@@ -189,6 +198,11 @@ static inline refcount_t *thread__refcnt(struct thread *thread)return &RC_CHK_ACCESS (thread)->refcnt; } +static inline void thread__set_exited (struct thread *thread,bool exited) +{ +RC_CHK_ACCESS (thread)->exited = exited; +} +static inline bool thread__comm_set (const struct thread *thread) {return RC_CHK_ACCESS (thread)->comm_set;
Re: [PATCH v4 05/53] perf machine thread: Remove exited threads by default
Em Mon, Nov 06, 2023 at 01:28:43PM +0200, Adrian Hunter escreveu:
Quoted 16 lines · Ian Rogers
Quoted 15 lines
struct thread values hold onto references to mmaps, dsos, etc. When a thread exits it is necessary to clean all of this memory up by removing the thread from the machine's threads. Some tools require this doesn't happen, such as auxtrace events, perf report if offcpu events exist or if a task list is being generated, so add a
symbol_confvalue to make the behavior optional. When an exited thread is left in the machine's threads, mark it as exited.This change relates to commit
40826c45eb0b("perf thread: Remove notion of dead threads"). Dead threads were removed as they had a reference count of 0 and were difficult to reason about with the reference count checker. Here a thread is removed from threads when it exits, unless viasymbol_confthe exited thread isn't remove and is marked as exited. Reference counting behaves as it normally does.
Quoted 5 lines
Quoted 1 line
Signed-off-by Ian Rogers <[email protected]>For auxtrace:
Reviewed-by Adrian Hunter <[email protected]>
Thanks, applied to perf-tools-next.
- Arnaldo
Ian Rogers
reviewerPATCH v4 6/53 tools api fs: Switch filename__read_str to use io.h
In reply to Ian Rogersfilename__read_str has its own string reading code that allocates memory before reading into it. The memory allocated is sized at BUFSIZ that is 8kb. Most strings are short and so most of this 8kb is wasted.
Refactor io__getline so that the newline character can be configurable and ignored in the case of filename__read_str.
Code like build_caches_for_cpu in perf's header.c will read many strings and hold them in a data structure, in this case multiple strings per cache level per CPU. Using io.h's io__getline avoids the wasted memory as strings are temporarily read into a buffer on the stack before being copied to a buffer that grows 128 bytes at a time and is never sized larger than the string.
For a 16 hyperthread system the memory consumption of "perf record true" is reduced by 180kb, primarily through saving memory when reading the cache information.
--- tools/lib/api/fs/fs.c | 56 +++++++++++-------------------------------- tools/lib/api/io.h | 9 +++++-- 2 files changed, 21 insertions(+), 44 deletions(-)
tools/lib/api/fs/fs.c +14 -42
@@ -16,6 +16,7 @@#include <sys/mount.h> #include "fs.h" +#include "../io.h" #include "debug-internal.h" #define _STR (x) #x
@@ -344,53 +345,24 @@ int filename__read_ull(const char *filename, unsigned long long *value)return filename__read_ull_base (filename, value,0 ); } -#define STRERR_BUFSIZE 128/* For the buffer size of strerror_r */ -int filename__read_str (const char *filename,char **buf,size_t *sizep) { -size_t size =0 , alloc_size =0 ; -void *bf =NULL , *nbf; -int fd, n, err =0 ; -char sbuf[STRERR_BUFSIZE ]; +struct io io; +char bf[128 ]; +int err; - fd =open (filename,O_RDONLY ); -if (fd <0 ) + io.fd =open (filename,O_RDONLY ); +if (io.fd <0 )return -errno; - -do { -if (size == alloc_size) { - alloc_size +=BUFSIZ ; - nbf =realloc (bf, alloc_size); -if (!nbf) { - err = -ENOMEM ; -break ; - } - - bf = nbf; - } - - n =read (fd, bf + size, alloc_size - size); -if (n <0 ) { -if (size) { -pr_warn ("read failed %d: %s\n" , errno, -strerror_r (errno, sbuf,sizeof (sbuf))); - err =0 ; - }else - err = -errno; - -break ; - } - - size += n; - }while (n >0 ); - -if (!err) { - *sizep = size; - *buf = bf; +io__init (&io, io.fd, bf,sizeof (bf)); + *buf =NULL ; + err =io__getline_nl (&io, buf, sizep,/*nl=*/ -1 ); +if (err <0 ) { +free (*buf); + *buf =NULL ; }else -free (bf); - -close (fd); + err =0 ; +close (io.fd);return err; }
tools/lib/api/io.h +7 -2
@@ -141,7 +141,7 @@ static inline int io__get_dec(struct io *io, __u64 *dec) }/* Read up to and including the first newline following the pattern of getline. */ -static inline ssize_t io__getline (struct io *io,char **line_out,size_t *line_len_out) +static inline ssize_t io__getline_nl (struct io *io,char **line_out,size_t *line_len_out,int nl) {char buf[128 ];int buf_pos =0 ;
@@ -151,7 +151,7 @@ static inline ssize_t io__getline(struct io *io, char **line_out, size_t *line_l/* TODO: reuse previously allocated memory. */ free (*line_out); -while (ch !='\n' ) { +while (ch != nl) { ch =io__get_char (io);if (ch <0 )
@@ -184,4 +184,9 @@ static inline ssize_t io__getline(struct io *io, char **line_out, size_t *line_l return -ENOMEM; } +static inline ssize_t io__getline (struct io *io,char **line_out,size_t *line_len_out) +{ +return io__getline_nl (io, line_out, line_len_out,/*nl=*/ '\n' ); +} +#endif /* __API_IO__ */
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Namhyung Kim
maintainerRe: [PATCH v4 06/53] tools api fs: Switch filename__read_str to use io.h
Quoted 22 lines · Ian Rogers
filename__read_strhas its own string reading code that allocates memory before reading into it. The memory allocated is sized at BUFSIZ that is 8kb. Most strings are short and so most of this 8kb is wasted.Refactor
io__getlineso that the newline character can be configurable and ignored in the case offilename__read_str.Code like
build_caches_for_cpuin perf'sheader.cwill read many strings and hold them in a data structure, in this case multiple strings per cache level per CPU. Using io.h'sio__getlineavoids the wasted memory as strings are temporarily read into a buffer on the stack before being copied to a buffer that grows 128 bytes at a time and is never sized larger than the string.For a 16 hyperthread system the memory consumption of "perf record true" is reduced by 180kb, primarily through saving memory when reading the cache information.
Signed-off-by Ian Rogers <[email protected]>---
[SNIP]
tools/lib/api/io.h static inline int io__get_dec(struct io *io, __u64 *dec) · line 143
Quoted 8 lines
tools/lib/api/io.h +0
-0@@ -141,7 +141,7 @@ static inline int io__get_dec(struct io *io, __u64 *dec) }/* Read up to and including the first newline following the pattern of getline. */
You may want to update the comment as well.
tools/lib/api/io.h static inline int io__get_dec(struct io *io, __u64 *dec) · line 144
Quoted 2 lines
tools/lib/api/io.h +1
-1-static inline ssize_t io__getline (struct io *io,char **line_out,size_t *line_len_out) +static inline ssize_t io__getline_nl (struct io *io,char **line_out,size_t *line_len_out,int nl)
How about io__getdelim() similar to POSIX?
Thanks,
Namhyung
Quoted 25 lines
tools/lib/api/io.h +6
-2{char buf[128 ];int buf_pos =0 ;@@ -151,7 +151,7 @@ static inline ssize_t io__getline(struct io *io, char **line_out, size_t *line_l/* TODO: reuse previously allocated memory. */ free (*line_out); -while (ch !='\n' ) { +while (ch != nl) { ch =io__get_char (io);if (ch <0 )@@ -184,4 +184,9 @@ static inline ssize_t io__getline(struct io *io, char **line_out, size_t *line_l return -ENOMEM; } +static inline ssize_t io__getline (struct io *io,char **line_out,size_t *line_len_out) +{ +return io__getline_nl (io, line_out, line_len_out,/*nl=*/ '\n' ); +} +#endif /* __API_IO__ */ --2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerRe: [PATCH v4 06/53] tools api fs: Switch filename__read_str to use io.h
Quoted 33 lines · Namhyung Kim
Quoted 22 lines · Ian Rogers
filename__read_strhas its own string reading code that allocates memory before reading into it. The memory allocated is sized at BUFSIZ that is 8kb. Most strings are short and so most of this 8kb is wasted.Refactor
io__getlineso that the newline character can be configurable and ignored in the case offilename__read_str.Code like
build_caches_for_cpuin perf'sheader.cwill read many strings and hold them in a data structure, in this case multiple strings per cache level per CPU. Using io.h'sio__getlineavoids the wasted memory as strings are temporarily read into a buffer on the stack before being copied to a buffer that grows 128 bytes at a time and is never sized larger than the string.For a 16 hyperthread system the memory consumption of "perf record true" is reduced by 180kb, primarily through saving memory when reading the cache information.
Signed-off-by Ian Rogers <[email protected]>---
[SNIP]
Quoted 7 lines
tools/lib/api/io.h +0
-0@@ -141,7 +141,7 @@ static inline int io__get_dec(struct io *io, __u64 *dec) }
Quoted 8 lines
tools/lib/api/io.h static inline int io__get_dec(struct io *io, __u64 *dec) · line 143
Quoted 1 line
tools/lib/api/io.h +0
-0/* Read up to and including the first newline following the pattern of getline. */ You may want to update the comment as well.
tools/lib/api/io.h static inline int io__get_dec(struct io *io, __u64 *dec) · line 144
Quoted 2 lines
tools/lib/api/io.h +1
-1-static inline ssize_t io__getline (struct io *io,char **line_out,size_t *line_len_out) +static inline ssize_t io__getline_nl (struct io *io,char **line_out,size_t *line_len_out,int nl)How about
io__getdelim()similar to POSIX?
Thanks done for v5.
Ian
Quoted 30 lines
Thanks,
NamhyungQuoted 25 lines
tools/lib/api/io.h +6
-2{char buf[128 ];int buf_pos =0 ;@@ -151,7 +151,7 @@ static inline ssize_t io__getline(struct io *io, char **line_out, size_t *line_l/* TODO: reuse previously allocated memory. */ free (*line_out); -while (ch !='\n' ) { +while (ch != nl) { ch =io__get_char (io);if (ch <0 )@@ -184,4 +184,9 @@ static inline ssize_t io__getline(struct io *io, char **line_out, size_t *line_l return -ENOMEM; } +static inline ssize_t io__getline (struct io *io,char **line_out,size_t *line_len_out) +{ +return io__getline_nl (io, line_out, line_len_out,/*nl=*/ '\n' ); +} +#endif /* __API_IO__ */ --2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 7/53 tools api fs: Avoid reading whole file for a 1 byte bool
In reply to Ian Rogerssysfs__read_bool used the first byte from a fully read file into a string. It then looked at the first byte's value. Avoid doing this and just read the first byte.
--- tools/lib/api/fs/fs.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
tools/lib/api/fs/fs.c +9 -9
@@ -447,15 +447,16 @@ int sysfs__read_str(const char *entry, char **buf, size_t *sizep)int sysfs__read_bool (const char *entry,bool *value) { -char *buf; -size_t size; -int ret; +struct io io; +char bf[16 ]; +int ret =0 ; - ret =sysfs__read_str (entry, &buf, &size); -if (ret <0 ) -return ret; + io.fd =open (entry,O_RDONLY ); +if (io.fd <0 ) +return -errno; -switch (buf[0 ]) { +io__init (&io, io.fd, bf,sizeof (bf)); +switch (io__get_char (&io)) {case '1' :case 'y' :case 'Y' :
@@ -469,8 +470,7 @@ int sysfs__read_bool(const char *entry, bool *value)default : ret =-1 ; } - -free (buf); +close (io.fd);return ret; }
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Namhyung Kim
maintainerRe: [PATCH v4 07/53] tools api fs: Avoid reading whole file for a 1 byte bool
Quoted 19 lines · Ian Rogers
sysfs__read_boolused the first byte from a fully read file into a string. It then looked at the first byte's value. Avoid doing this and just read the first byte.Signed-off-by Ian Rogers <[email protected]>--- tools/lib/api/fs/fs.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)tools/lib/api/fs/fs.c +0
-1@@ -447,15 +447,16 @@ int sysfs__read_str(const char *entry, char **buf, size_t *sizep)int sysfs__read_bool (const char *entry,bool *value) { -char *buf;
tools/lib/api/fs/fs.c int sysfs__read_str(const char *entry, char **buf, size_t *sizep) · line 454
Quoted 10 lines
tools/lib/api/fs/fs.c +4
-5-size_t size; -int ret; +struct io io; +char bf[16 ]; +int ret =0 ; - ret =sysfs__read_str (entry, &buf, &size); -if (ret <0 ) -return ret; + io.fd =open (entry,O_RDONLY );
The entry is a name in sysfs, so you need to get the full name.
Thanks,
Namhyung
Quoted 22 lines
tools/lib/api/fs/fs.c +5
-4+if (io.fd <0 ) +return -errno; -switch (buf[0 ]) { +io__init (&io, io.fd, bf,sizeof (bf)); +switch (io__get_char (&io)) {case '1' :case 'y' :case 'Y' :@@ -469,8 +470,7 @@ int sysfs__read_bool(const char *entry, bool *value)default : ret =-1 ; } - -free (buf); +close (io.fd);return ret; } --2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerRe: [PATCH v4 07/53] tools api fs: Avoid reading whole file for a 1 byte bool
Quoted 34 lines · Namhyung Kim
Quoted 19 lines · Ian Rogers
sysfs__read_boolused the first byte from a fully read file into a string. It then looked at the first byte's value. Avoid doing this and just read the first byte.Signed-off-by Ian Rogers <[email protected]>--- tools/lib/api/fs/fs.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)tools/lib/api/fs/fs.c +0
-1@@ -447,15 +447,16 @@ int sysfs__read_str(const char *entry, char **buf, size_t *sizep)int sysfs__read_bool (const char *entry,bool *value) { -char *buf;tools/lib/api/fs/fs.c int sysfs__read_str(const char *entry, char **buf, size_t *sizep) · line 454
Quoted 10 lines
tools/lib/api/fs/fs.c +4
-5-size_t size; -int ret; +struct io io; +char bf[16 ]; +int ret =0 ; - ret =sysfs__read_str (entry, &buf, &size); -if (ret <0 ) -return ret; + io.fd =open (entry,O_RDONLY );The entry is a name in sysfs, so you need to get the full name.
Quoted 2 lines
Thanks,
Namhyung
Thanks, added in v5.
Ian
Quoted 23 lines
Quoted 23 lines
tools/lib/api/fs/fs.c +5
-4+if (io.fd <0 ) +return -errno; -switch (buf[0 ]) { +io__init (&io, io.fd, bf,sizeof (bf)); +switch (io__get_char (&io)) {case '1' :case 'y' :case 'Y' :@@ -469,8 +470,7 @@ int sysfs__read_bool(const char *entry, bool *value)default : ret =-1 ; } - -free (buf); +close (io.fd);return ret; } --2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 8/53 tools lib api: Add io_dir an allocation free readdir alternative
In reply to Ian Rogersglibc's opendir allocates a minimum of 32kb, when called recursively for a directory tree the memory consumption can add up - nearly 300kb during perf start-up when processing modules. Add a stack allocated variant of readdir sized a little more than 1kb.
--- tools/lib/api/Makefile | 2 +- tools/lib/api/io_dir.h | 75 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 tools/lib/api/io_dir.h
tools/lib/api/Makefile +1 -1
@@ -99,7 +99,7 @@ install_lib: $(LIBFILE) $(call do_install_mkdir,$(libdir_SQ)); \ cp -fpR $(LIBFILE) $(DESTDIR)$(libdir_SQ) -HDRS := cpu.h debug.h io.h +HDRS := cpu.h debug.h io.h io_dir.h FD_HDRS := fd/array.h FS_HDRS := fs/fs.h fs/tracing_path.h INSTALL_HDRS_PFX := $(DESTDIR)$(prefix)/include/api
tools/lib/api/io_dir.h new file +75 -0
75 lines not on this page · raw message
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 9/53 perf maps: Switch modules tree walk to io_dir__readdir
In reply to Ian RogersCompared to glibc's opendir/readdir this lowers the max RSS of perf record by 1.8MB on a Debian machine.
--- tools/perf/util/machine.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
tools/perf/util/machine.c +8 -11
@@ -36,6 +36,7 @@#include <internal/lib.h> // page_size #include "cgroup.h" #include "arm64-frame-pointer-unwind-support.h" +#include <api/io_dir.h> #include <linux/ctype.h> #include <symbol/kallsyms.h>
@@ -1552,25 +1553,21 @@ static int maps__set_module_path(struct maps *maps, const char *path, struct kmostatic int maps__set_modules_path_dir (struct maps *maps,const char *dir_name,int depth) { -struct dirent *dent; -DIR *dir =opendir (dir_name); +struct io_dirent64 *dent; +struct io_dir iod;int ret =0 ; -if (!dir) { +io_dir__init (&iod,open (dir_name,O_CLOEXEC |O_DIRECTORY |O_RDONLY )); +if (iod.dirfd <0 ) {pr_debug ("%s: cannot open %s dir\n" , __func__, dir_name);return -1 ; } -while ((dent =readdir (dir)) !=NULL ) { +while ((dent =io_dir__readdir (&iod)) !=NULL ) {char path[PATH_MAX ]; -struct stat st; -/*sshfs might return bad dent->d_type, so we have to stat*/ path__join (path,sizeof (path), dir_name, dent->d_name); -if (stat (path, &st)) -continue ; - -if (S_ISDIR (st.st_mode)) { +if (io_dir__is_dir (&iod, dent)) {if (!strcmp (dent->d_name,"." ) || !strcmp (dent->d_name,".." ))continue ;
@@ -1603,7 +1600,7 @@ static int maps__set_modules_path_dir(struct maps *maps, const char *dir_name, i } out: -closedir (dir); +close (iod.dirfd);return ret; }
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 10/53 perf record: Be lazier in allocating lost samples buffer
In reply to Ian RogersWait until a lost sample occurs to allocate the lost samples buffer, often the buffer isn't necessary. This saves a 64kb allocation and 5.3kb of peak memory consumption.
--- tools/perf/builtin-record.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)
tools/perf/builtin-record.c +19 -10
@@ -1924,21 +1924,13 @@ static void __record__save_lost_samples(struct record *rec, struct evsel *evsel,static void record__read_lost_samples (struct record *rec) {struct perf_session *session = rec->session; -struct perf_record_lost_samples *lost; +struct perf_record_lost_samples *lost =NULL ;struct evsel *evsel;/* there was an error during record__open */ if (session->evlist ==NULL )return ; - lost =zalloc (PERF_SAMPLE_MAX_SIZE ); -if (lost ==NULL ) { -pr_debug ("Memory allocation failed\n" ); -return ; - } - - lost->header.type =PERF_RECORD_LOST_SAMPLES ; -evlist__for_each_entry (session->evlist, evsel) {struct xyarray *xy = evsel->core.sample_id;u64 lost_count;
@@ -1961,6 +1953,14 @@ static void record__read_lost_samples(struct record *rec) }if (count.lost) { +if (!lost) { + lost =zalloc (PERF_SAMPLE_MAX_SIZE ); +if (!lost) { +pr_debug ("Memory allocation failed\n" ); +return ; + } + lost->header.type =PERF_RECORD_LOST_SAMPLES ; + }__record__save_lost_samples (rec, evsel, lost, x, y, count.lost,0 ); }
@@ -1968,9 +1968,18 @@ static void record__read_lost_samples(struct record *rec) } lost_count =perf_bpf_filter__lost_count (evsel); -if (lost_count) +if (lost_count) { +if (!lost) { + lost =zalloc (PERF_SAMPLE_MAX_SIZE ); +if (!lost) { +pr_debug ("Memory allocation failed\n" ); +return ; + } + lost->header.type =PERF_RECORD_LOST_SAMPLES ; + }__record__save_lost_samples (rec, evsel, lost,0 ,0 , lost_count,PERF_RECORD_MISC_LOST_SAMPLES_BPF ); + } } out:free (lost);
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v4 10/53] perf record: Be lazier in allocating lost samples buffer
Em Thu, Nov 02, 2023 at 10:56:52AM -0700, Ian Rogers escreveu:
Quoted 20 lines
Wait until a lost sample occurs to allocate the lost samples buffer, often the buffer isn't necessary. This saves a 64kb allocation and 5.3kb of peak memory consumption.
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/builtin-record.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)tools/perf/builtin-record.c +1
-1@@ -1924,21 +1924,13 @@ static void __record__save_lost_samples(struct record *rec, struct evsel *evsel,static void record__read_lost_samples (struct record *rec) {struct perf_session *session = rec->session; -struct perf_record_lost_samples *lost; +struct perf_record_lost_samples *lost =NULL ;struct evsel *evsel;
tools/perf/builtin-record.c static void __record__save_lost_samples(struct record *rec, struct evsel *evsel, · line 1938
Quoted 10 lines
tools/perf/builtin-record.c +0
-5/* there was an error during record__open */ if (session->evlist ==NULL )return ; - lost =zalloc (PERF_SAMPLE_MAX_SIZE ); -if (lost ==NULL ) { -pr_debug ("Memory allocation failed\n" ); -return ; - }
Shouldn't we take the time here and instead improve this error message and then propagate the error?
For instance, we may want to still get some perf.data file without these records but inform the user at this point how many records were lost (count.lost)?
- Arnaldo
Quoted 44 lines
tools/perf/builtin-record.c +18
-4- - lost->header.type =PERF_RECORD_LOST_SAMPLES ; -evlist__for_each_entry (session->evlist, evsel) {struct xyarray *xy = evsel->core.sample_id;u64 lost_count;@@ -1961,6 +1953,14 @@ static void record__read_lost_samples(struct record *rec) }if (count.lost) { +if (!lost) { + lost =zalloc (PERF_SAMPLE_MAX_SIZE ); +if (!lost) { +pr_debug ("Memory allocation failed\n" ); +return ; + } + lost->header.type =PERF_RECORD_LOST_SAMPLES ; + }__record__save_lost_samples (rec, evsel, lost, x, y, count.lost,0 ); }@@ -1968,9 +1968,18 @@ static void record__read_lost_samples(struct record *rec) } lost_count =perf_bpf_filter__lost_count (evsel); -if (lost_count) +if (lost_count) { +if (!lost) { + lost =zalloc (PERF_SAMPLE_MAX_SIZE ); +if (!lost) { +pr_debug ("Memory allocation failed\n" ); +return ; + } + lost->header.type =PERF_RECORD_LOST_SAMPLES ; + }__record__save_lost_samples (rec, evsel, lost,0 ,0 , lost_count,PERF_RECORD_MISC_LOST_SAMPLES_BPF ); + } } out:free (lost);Signature · 1 line
2.42.0.869.gea05f2083d-goog
Signature · 1 line
- Arnaldo
Ian Rogers
reviewerRe: [PATCH v4 10/53] perf record: Be lazier in allocating lost samples buffer
Quoted 36 lines · Arnaldo Carvalho de Melo
Em Thu, Nov 02, 2023 at 10:56:52AM -0700, Ian Rogers escreveu:
Quoted 20 lines
Wait until a lost sample occurs to allocate the lost samples buffer, often the buffer isn't necessary. This saves a 64kb allocation and 5.3kb of peak memory consumption.
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/builtin-record.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)tools/perf/builtin-record.c +1
-1@@ -1924,21 +1924,13 @@ static void __record__save_lost_samples(struct record *rec, struct evsel *evsel,static void record__read_lost_samples (struct record *rec) {struct perf_session *session = rec->session; -struct perf_record_lost_samples *lost; +struct perf_record_lost_samples *lost =NULL ;struct evsel *evsel;tools/perf/builtin-record.c static void __record__save_lost_samples(struct record *rec, struct evsel *evsel, · line 1938
Quoted 10 lines
tools/perf/builtin-record.c +0
-5/* there was an error during record__open */ if (session->evlist ==NULL )return ; - lost =zalloc (PERF_SAMPLE_MAX_SIZE ); -if (lost ==NULL ) { -pr_debug ("Memory allocation failed\n" ); -return ; - }Shouldn't we take the time here and instead improve this error message and then propagate the error?
Quoted 3 lines
For instance, we may want to still get some perf.data file without these records but inform the user at this point how many records were lost (count.lost)?
Sounds like a follow-up, the messages here are just moving the existing message and the point of the patch is to postpone/avoid a memory allocation when possible.
Thanks,
Ian
Quoted 50 lines
- Arnaldo
Quoted 42 lines
tools/perf/builtin-record.c +18
-5- - lost->header.type =PERF_RECORD_LOST_SAMPLES ; -evlist__for_each_entry (session->evlist, evsel) {struct xyarray *xy = evsel->core.sample_id;u64 lost_count;@@ -1961,6 +1953,14 @@ static void record__read_lost_samples(struct record *rec) }if (count.lost) { +if (!lost) { + lost =zalloc (PERF_SAMPLE_MAX_SIZE ); +if (!lost) { +pr_debug ("Memory allocation failed\n" ); +return ; + } + lost->header.type =PERF_RECORD_LOST_SAMPLES ; + }__record__save_lost_samples (rec, evsel, lost, x, y, count.lost,0 ); }@@ -1968,9 +1968,18 @@ static void record__read_lost_samples(struct record *rec) } lost_count =perf_bpf_filter__lost_count (evsel); -if (lost_count) +if (lost_count) { +if (!lost) { + lost =zalloc (PERF_SAMPLE_MAX_SIZE ); +if (!lost) { +pr_debug ("Memory allocation failed\n" ); +return ; + } + lost->header.type =PERF_RECORD_LOST_SAMPLES ; + }__record__save_lost_samples (rec, evsel, lost,0 ,0 , lost_count,PERF_RECORD_MISC_LOST_SAMPLES_BPF ); + } } out:free (lost); --Quoted 2 lines
2.42.0.869.gea05f2083d-goog
--
- Arnaldo
Ian Rogers
reviewerPATCH v4 11/53 perf pmu: Switch to io_dir__readdir
In reply to Ian RogersAvoid DIR allocations when scanning sysfs by using io_dir for the readdir implementation, that allocates about 1kb on the stack.
--- tools/perf/util/pmu.c | 48 +++++++++++++++++------------------------- tools/perf/util/pmus.c | 30 ++++++++++---------------- 2 files changed, 30 insertions(+), 48 deletions(-)
tools/perf/util/pmu.c +19 -29
@@ -12,6 +12,7 @@#include <stdbool.h> #include <dirent.h> #include <api/fs/fs.h> +#include <api/io_dir.h> #include <locale.h> #include <fnmatch.h> #include <math.h>
@@ -184,19 +185,17 @@ static void perf_pmu_format__load(const struct perf_pmu *pmu, struct perf_pmu_fo*/ int perf_pmu__format_parse (struct perf_pmu *pmu,int dirfd,bool eager_load) { -struct dirent *evt_ent; -DIR *format_dir; +struct io_dirent64 *evt_ent; +struct io_dir format_dir;int ret =0 ; - format_dir =fdopendir (dirfd); -if (!format_dir) -return -EINVAL ; +io_dir__init (&format_dir, dirfd); -while ((evt_ent =readdir (format_dir)) !=NULL ) { +while ((evt_ent =io_dir__readdir (&format_dir)) !=NULL ) {struct perf_pmu_format *format;char *name = evt_ent->d_name; -if (!strcmp (name,"." ) || !strcmp (name,".." )) +if (io_dir__is_dir (&format_dir, evt_ent))continue ; format =perf_pmu__new_format (&pmu->format, name);
@@ -223,7 +222,7 @@ int perf_pmu__format_parse(struct perf_pmu *pmu, int dirfd, bool eager_load) } } -closedir (format_dir); +close (format_dir.dirfd);return ret; }
@@ -599,8 +598,8 @@ static inline bool pmu_alias_info_file(const char *name)static int pmu_aliases_parse (struct perf_pmu *pmu) {char path[PATH_MAX ]; -struct dirent *evt_ent; -DIR *event_dir; +struct io_dirent64 *evt_ent; +struct io_dir event_dir;size_t len;int fd, dir_fd;
@@ -615,13 +614,9 @@ static int pmu_aliases_parse(struct perf_pmu *pmu)return 0 ; } - event_dir =fdopendir (dir_fd); -if (!event_dir){ -close (dir_fd); -return -EINVAL ; - } +io_dir__init (&event_dir, dir_fd); -while ((evt_ent =readdir (event_dir))) { +while ((evt_ent =io_dir__readdir (&event_dir))) {char *name = evt_ent->d_name;FILE *file;
@@ -651,7 +646,6 @@ static int pmu_aliases_parse(struct perf_pmu *pmu)fclose (file); } -closedir (event_dir);close (dir_fd); pmu->sysfs_aliases_loaded = true;return 0 ;
@@ -1879,10 +1873,9 @@ static void perf_pmu__del_caps(struct perf_pmu *pmu)*/ int perf_pmu__caps_parse (struct perf_pmu *pmu) { -struct stat st;char caps_path[PATH_MAX ]; -DIR *caps_dir; -struct dirent *evt_ent; +struct io_dir caps_dir; +struct io_dirent64 *evt_ent;int caps_fd;if (pmu->caps_initialized)
@@ -1893,24 +1886,21 @@ int perf_pmu__caps_parse(struct perf_pmu *pmu)if (!perf_pmu__pathname_scnprintf (caps_path,sizeof (caps_path), pmu->name,"caps" ))return -1 ; -if (stat (caps_path, &st) <0 ) { + caps_fd =open (caps_path,O_CLOEXEC |O_DIRECTORY |O_RDONLY ); +if (caps_fd ==-1 ) { pmu->caps_initialized = true;return 0 ;/* no error if caps does not exist */ } - caps_dir =opendir (caps_path); -if (!caps_dir) -return -EINVAL ; - - caps_fd =dirfd (caps_dir); +io_dir__init (&caps_dir, caps_fd); -while ((evt_ent =readdir (caps_dir)) !=NULL ) { +while ((evt_ent =io_dir__readdir (&caps_dir)) !=NULL ) {char *name = evt_ent->d_name;char value[128 ];FILE *file;int fd; -if (!strcmp (name,"." ) || !strcmp (name,".." )) +if (io_dir__is_dir (&caps_dir, evt_ent))continue ; fd =openat (caps_fd, name,O_RDONLY );
@@ -1932,7 +1922,7 @@ int perf_pmu__caps_parse(struct perf_pmu *pmu)fclose (file); } -closedir (caps_dir); +close (caps_fd); pmu->caps_initialized = true;return pmu->nr_caps;
tools/perf/util/pmus.c +11 -19
@@ -3,10 +3,10 @@#include <linux/list_sort.h> #include <linux/string.h> #include <linux/zalloc.h> +#include <api/io_dir.h> #include <subcmd/pager.h> #include <sys/types.h> #include <ctype.h> -#include <dirent.h> #include <pthread.h> #include <string.h> #include <unistd.h>
@@ -184,8 +184,8 @@ static int pmus_cmp(void *priv __maybe_unused,static void pmu_read_sysfs (bool core_only) {int fd; -DIR *dir; -struct dirent *dent; +struct io_dir dir; +struct io_dirent64 *dent;if (read_sysfs_all_pmus || (core_only && read_sysfs_core_pmus))return ;
@@ -194,13 +194,9 @@ static void pmu_read_sysfs(bool core_only)if (fd <0 )return ; - dir =fdopendir (fd); -if (!dir) { -close (fd); -return ; - } +io_dir__init (&dir, fd); -while ((dent =readdir (dir))) { +while ((dent =io_dir__readdir (&dir)) !=NULL ) {if (!strcmp (dent->d_name,"." ) || !strcmp (dent->d_name,".." ))continue ;if (core_only && !is_pmu_core (dent->d_name))
@@ -209,7 +205,7 @@ static void pmu_read_sysfs(bool core_only)perf_pmu__find2 (fd, dent->d_name); } -closedir (dir); +close (fd);if (list_empty (&core_pmus)) {if (!perf_pmu__create_placeholder_core_pmu (&core_pmus))pr_err ("Failure to set up any core PMUs\n" );
@@ -563,8 +559,8 @@ bool perf_pmus__supports_extended_type(void)char *perf_pmus__default_pmu_name (void ) {int fd; -DIR *dir; -struct dirent *dent; +struct io_dir dir; +struct io_dirent64 *dent;char *result =NULL ;if (!list_empty (&core_pmus))
@@ -574,13 +570,9 @@ char *perf_pmus__default_pmu_name(void)if (fd <0 )return strdup ("cpu" ); - dir =fdopendir (fd); -if (!dir) { -close (fd); -return strdup ("cpu" ); - } +io_dir__init (&dir, fd); -while ((dent =readdir (dir))) { +while ((dent =io_dir__readdir (&dir)) !=NULL ) {if (!strcmp (dent->d_name,"." ) || !strcmp (dent->d_name,".." ))continue ;if (is_pmu_core (dent->d_name)) {
@@ -589,7 +581,7 @@ char *perf_pmus__default_pmu_name(void) } } -closedir (dir); +close (fd);return result ?:strdup ("cpu" ); }
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 12/53 perf bpf: Don't synthesize BPF events when disabled
In reply to Ian RogersIf BPF sideband events are disabled on the command line, don't synthesize BPF events too.
--- tools/perf/util/bpf-event.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/util/bpf-event.c +3 -0
@@ -386,6 +386,9 @@ int perf_event__synthesize_bpf_events(struct perf_session *session,int err;int fd; +if (opts->no_bpf_event) +return 0 ; + event =malloc (sizeof (event->bpf) +KSYM_NAME_LEN + machine->id_hdr_size);if (!event)return -1 ;
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v4 12/53] perf bpf: Don't synthesize BPF events when disabled
Em Thu, Nov 02, 2023 at 10:56:54AM -0700, Ian Rogers escreveu:
Quoted 2 lines
If BPF sideband events are disabled on the command line, don't synthesize BPF events too.
Interesting, in 71184c6ab7e60fd5 ("perf record: Replace option --bpf-event with --no-bpf-event") we checked that, but only down at perf_event__synthesize_one_bpf_prog(), where we have:
if (!opts->no_bpf_event) {
/* Synthesize PERF_RECORD_BPF_EVENT */
*bpf_event = (struct perf_record_bpf_event)So we better remove that, now redundant check? I'll apply your patch as is and then we can remove that other check.
Song, can I have your Acked-by or Reviewed-by, please?
- Arnaldo
Quoted 22 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/bpf-event.c | 3 +++ 1 file changed, 3 insertions(+)tools/perf/util/bpf-event.c +3
-0@@ -386,6 +386,9 @@ int perf_event__synthesize_bpf_events(struct perf_session *session,int err;int fd; +if (opts->no_bpf_event) +return 0 ; + event =malloc (sizeof (event->bpf) +KSYM_NAME_LEN + machine->id_hdr_size);if (!event)return -1 ;Signature · 1 line
2.42.0.869.gea05f2083d-goog
Signature · 1 line
- Arnaldo
Song Liu
Acked-byRe: [PATCH v4 12/53] perf bpf: Don't synthesize BPF events when disabled
Quoted 15 lines · Arnaldo Carvalho de Melo
Em Thu, Nov 02, 2023 at 10:56:54AM -0700, Ian Rogers escreveu:
Quoted 2 lines
If BPF sideband events are disabled on the command line, don't synthesize BPF events too.
Interesting, in
71184c6ab7e60fd5("perf record: Replace option --bpf-event with --no-bpf-event") we checked that, but only down atperf_event__synthesize_one_bpf_prog(), where we have:if (!opts->no_bpf_event) { /* Synthesize PERF_RECORD_BPF_EVENT */ *bpf_event = (struct perf_record_bpf_event)
Quoted 8 lines
So we better remove that, now redundant check? I'll apply your patch as is and then we can remove that other check.
Song, can I have your Acked-by or Reviewed-by, please?
- Arnaldo
Quoted 1 line
Signed-off-by Ian Rogers <[email protected]>
Good catch!
Re: [PATCH v4 12/53] perf bpf: Don't synthesize BPF events when disabled
Em Wed, Nov 08, 2023 at 03:03:15PM -0800, Song Liu escreveu:
Quoted 21 lines · Arnaldo Carvalho de Melo
Quoted 20 lines
Em Thu, Nov 02, 2023 at 10:56:54AM -0700, Ian Rogers escreveu:
Quoted 2 lines
If BPF sideband events are disabled on the command line, don't synthesize BPF events too.
Interesting, in
71184c6ab7e60fd5("perf record: Replace option --bpf-event with --no-bpf-event") we checked that, but only down atperf_event__synthesize_one_bpf_prog(), where we have:if (!opts->no_bpf_event) { /* Synthesize PERF_RECORD_BPF_EVENT */ *bpf_event = (struct perf_record_bpf_event)So we better remove that, now redundant check? I'll apply your patch as is and then we can remove that other check.
Song, can I have your Acked-by or Reviewed-by, please?
Quoted 7 lines
Quoted 3 lines
- Arnaldo
Quoted 1 line
Signed-off-by Ian Rogers <[email protected]>Good catch!
Acked-by Song Liu <[email protected]>
Thanks, applied the patch with your Acked-by, will revisit this after this gets published.
- Arnaldo
Ian Rogers
reviewerPATCH v4 13/53 perf header: Switch mem topology to io_dir__readdir
In reply to Ian RogersSwitch memory_node__read and build_mem_topology from opendir/readdir to io_dir__readdir, with smaller stack allocations. Reduces peak memory consumption of perf record by 10kb.
--- tools/perf/util/header.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
tools/perf/util/header.c +16 -15
@@ -44,6 +44,7 @@#include "build-id.h" #include "data.h" #include <api/fs/fs.h> +#include <api/io_dir.h> #include "asm/bug.h" #include "tool.h" #include "time-utils.h"
@@ -1341,11 +1342,11 @@ static int memory_node__read(struct memory_node *n, unsigned long idx) {unsigned int phys, size =0 ;char path[PATH_MAX ]; -struct dirent *ent; -DIR *dir; +struct io_dirent64 *ent; +struct io_dir dir;#define for_each_memory (mem, dir) \ - while ((ent = readdir(dir))) \ + while ((ent = io_dir__readdir(&dir)) != NULL) \ if (strcmp(ent->d_name, ".") && \ strcmp(ent->d_name, "..") && \ sscanf(ent->d_name, "memory%u", &mem) == 1)
@@ -1354,9 +1355,9 @@ static int memory_node__read(struct memory_node *n, unsigned long idx)"%s/devices/system/node/node%lu" , sysfs__mountpoint(), idx); - dir =opendir (path); -if (!dir) { -pr_warning ("failed: can't open memory sysfs data\n" ); +io_dir__init (&dir,open (path,O_CLOEXEC |O_DIRECTORY |O_RDONLY )); +if (dir.dirfd <0 ) { +pr_warning ("failed: can't open memory sysfs data '%s'\n" , path);return -1 ; }
@@ -1368,20 +1369,20 @@ static int memory_node__read(struct memory_node *n, unsigned long idx) n->set =bitmap_zalloc (size);if (!n->set) { -closedir (dir); +close (dir.dirfd);return -ENOMEM ; } n->node = idx; n->size = size; -rewinddir (dir); +io_dir__rewinddir (&dir);for_each_memory (phys, dir) {__set_bit (phys, n->set); } -closedir (dir); +close (dir.dirfd);return 0 ; }
@@ -1404,8 +1405,8 @@ static int memory_node__sort(const void *a, const void *b)static int build_mem_topology (struct memory_node **nodesp,u64 *cntp) {char path[PATH_MAX ]; -struct dirent *ent; -DIR *dir; +struct io_dirent64 *ent; +struct io_dir dir;int ret =0 ;size_t cnt =0 , size =0 ;struct memory_node *nodes =NULL ;
@@ -1413,14 +1414,14 @@ static int build_mem_topology(struct memory_node **nodesp, u64 *cntp)scnprintf (path,PATH_MAX ,"%s/devices/system/node/" ,sysfs__mountpoint ()); - dir =opendir (path); -if (!dir) { +io_dir__init (&dir,open (path,O_CLOEXEC |O_DIRECTORY |O_RDONLY )); +if (dir.dirfd <0 ) {pr_debug2 ("%s: couldn't read %s, does this arch have topology information?\n" , __func__, path);return -1 ; } -while (!ret && (ent =readdir (dir))) { +while (!ret && (ent =io_dir__readdir (&dir))) {unsigned int idx;int r;
@@ -1447,7 +1448,7 @@ static int build_mem_topology(struct memory_node **nodesp, u64 *cntp) ret =memory_node__read (&nodes[cnt++], idx); } out: -closedir (dir); +close (dir.dirfd);if (!ret) { *cntp = cnt; *nodesp = nodes;
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 14/53 perf events: Remove scandir in thread synthesis
In reply to Ian RogersThis avoids scanddir reading the directory into memory that's allocated and instead allocates on the stack.
--- tools/perf/util/synthetic-events.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
tools/perf/util/synthetic-events.c +12 -10
@@ -38,6 +38,7 @@#include <uapi/linux/mman.h> /* To get things like MAP_HUGETLB even on older libc headers */ #include <api/fs/fs.h> #include <api/io.h> +#include <api/io_dir.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h>
@@ -751,10 +752,10 @@ static int __event__synthesize_thread(union perf_event *comm_event, bool needs_mmap, bool mmap_data) { char filename[PATH_MAX]; -struct dirent **dirent; +struct io_dir iod; +struct io_dirent64 *dent;pid_t tgid, ppid;int rc =0 ; -int i, n;/* special case: only send one comm event using passed in pid */ if (!full) {
@@ -786,16 +787,19 @@ static int __event__synthesize_thread(union perf_event *comm_event,snprintf (filename,sizeof (filename),"%s/proc/%d/task" , machine->root_dir, pid); - n =scandir (filename, &dirent, filter_task,NULL ); -if (n <0 ) -return n; +io_dir__init (&iod,open (filename,O_CLOEXEC |O_DIRECTORY |O_RDONLY )); +if (iod.dirfd <0 ) +return -1 ; -for (i =0 ; i < n; i++) { +while ((dent =io_dir__readdir (&iod)) !=NULL ) {char *end;pid_t _pid;bool kernel_thread = false; - _pid =strtol (dirent[i]->d_name, &end,10 ); +if (!isdigit (dent->d_name[0 ])) +continue ; + + _pid =strtol (dent->d_name, &end,10 );if (*end)continue ;
@@ -829,9 +833,7 @@ static int __event__synthesize_thread(union perf_event *comm_event, } } -for (i =0 ; i < n; i++) -zfree (&dirent[i]); -free (dirent); +close (iod.dirfd);return rc; }
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 15/53 perf map: Simplify map_ip/unmap_ip and make map size smaller
In reply to Ian RogersWhen mapping an IP it is either an identity mapping or a DSO relative mapping, so a single bit is required in the struct to identify this. The current code uses function pointers, adding 2 pointers per map and also pushing the size of a map beyond 1 cache line. Switch to using a byte to identify the mapping type (as well as priv and erange_warned), to avoid any masking. Change struct maps's layout to avoid holes.
Before:
```
struct map {
u64 start; /* 0 8 */
u64 end; /* 8 8 */
_Bool erange_warned:1; /* 16: 0 1 */
_Bool priv:1; /* 16: 1 1 */
/* XXX 6 bits hole, try to pack */
/* XXX 3 bytes hole, try to pack */
u32 prot; /* 20 4 */
u64 pgoff; /* 24 8 */
u64 reloc; /* 32 8 */
u64 (*map_ip)(const struct map *, u64); /* 40 8 */
u64 (*unmap_ip)(const struct map *, u64); /* 48 8 */
struct dso * dso; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
refcount_t refcnt; /* 64 4 */
u32 flags; /* 68 4 */
/* size: 72, cachelines: 2, members: 12 */
/* sum members: 68, holes: 1, sum holes: 3 */
/* sum bitfield members: 2 bits, bit holes: 1, sum bit holes: 6 bits */
/* last cacheline: 8 bytes */
};
```After:
```
struct map {
u64 start; /* 0 8 */
u64 end; /* 8 8 */
u64 pgoff; /* 16 8 */
u64 reloc; /* 24 8 */
struct dso * dso; /* 32 8 */
refcount_t refcnt; /* 40 4 */
u32 prot; /* 44 4 */
u32 flags; /* 48 4 */
enum mapping_type mapping_type:8; /* 52: 0 4 */
/* Bitfield combined with next fields */
_Bool erange_warned; /* 53 1 */
_Bool priv; /* 54 1 */
/* size: 56, cachelines: 1, members: 11 */
/* padding: 1 */
/* last cacheline: 56 bytes */
};
```--- tools/perf/util/machine.c | 3 +- tools/perf/util/map.c | 20 +-------- tools/perf/util/map.h | 83 +++++++++++++++++++----------------- tools/perf/util/symbol-elf.c | 6 +-- tools/perf/util/symbol.c | 6 +-- 5 files changed, 50 insertions(+), 68 deletions(-)
tools/perf/util/machine.c +1 -2
@@ -1360,8 +1360,7 @@ __machine__create_kernel_maps(struct machine *machine, struct dso *kernel)if (machine->vmlinux_map ==NULL )return -ENOMEM ; -map__set_map_ip (machine->vmlinux_map, identity__map_ip); -map__set_unmap_ip (machine->vmlinux_map, identity__map_ip); +map__set_mapping_type (machine->vmlinux_map,MAPPING_TYPE__IDENTITY );return maps__insert (machine__kernel_maps (machine), machine->vmlinux_map); }
tools/perf/util/map.c +2 -18
@@ -109,8 +109,7 @@ void map__init(struct map *map, u64 start, u64 end, u64 pgoff, struct dso *dso)map__set_pgoff (map, pgoff);map__set_reloc (map,0 );map__set_dso (map,dso__get (dso)); -map__set_map_ip (map, map__dso_map_ip); -map__set_unmap_ip (map, map__dso_unmap_ip); +map__set_mapping_type (map,MAPPING_TYPE__DSO );map__set_erange_warned (map, false);refcount_set (map__refcnt (map),1 ); }
@@ -172,7 +171,7 @@ struct map *map__new(struct machine *machine, u64 start, u64 len,map__init (result, start, start + len, pgoff, dso);if (anon || no_dso) { - map->map_ip = map->unmap_ip = identity__map_ip; + map->mapping_type =MAPPING_TYPE__IDENTITY ;/* * Set memory without DSO as loaded. All map__find_*
@@ -630,18 +629,3 @@ struct maps *map__kmaps(struct map *map) }return kmap->kmaps; } - -u64 map__dso_map_ip (const struct map *map,u64 ip) -{ -return ip -map__start (map) +map__pgoff (map); -} - -u64 map__dso_unmap_ip (const struct map *map,u64 ip) -{ -return ip +map__start (map) -map__pgoff (map); -} - -u64 identity__map_ip (const struct map *map__maybe_unused ,u64 ip) -{ -return ip; -}
tools/perf/util/map.h +43 -40
123 lines not on this page · raw message
tools/perf/util/symbol-elf.c +2 -4
@@ -1392,8 +1392,7 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map,map__set_start (map, shdr->sh_addr +ref_reloc (kmap));map__set_end (map,map__start (map) + shdr->sh_size);map__set_pgoff (map, shdr->sh_offset); -map__set_map_ip (map, map__dso_map_ip); -map__set_unmap_ip (map, map__dso_unmap_ip); +map__set_mapping_type (map,MAPPING_TYPE__DSO );/* Ensure maps are correctly ordered */ if (kmaps) {int err;
@@ -1455,8 +1454,7 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map,map__set_end (curr_map,map__start (curr_map) + shdr->sh_size);map__set_pgoff (curr_map, shdr->sh_offset); }else { -map__set_map_ip (curr_map, identity__map_ip); -map__set_unmap_ip (curr_map, identity__map_ip); +map__set_mapping_type (curr_map,MAPPING_TYPE__IDENTITY ); } curr_dso->symtab_type = dso->symtab_type;if (maps__insert (kmaps, curr_map))
tools/perf/util/symbol.c +2 -4
@@ -956,8 +956,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,return -1 ; } -map__set_map_ip (curr_map, identity__map_ip); -map__set_unmap_ip (curr_map, identity__map_ip); +map__set_mapping_type (curr_map,MAPPING_TYPE__IDENTITY );if (maps__insert (kmaps, curr_map)) {dso__put (ndso);return -1 ;
@@ -1475,8 +1474,7 @@ static int dso__load_kcore(struct dso *dso, struct map *map,map__set_start (map,map__start (new_map));map__set_end (map,map__end (new_map));map__set_pgoff (map,map__pgoff (new_map)); -map__set_map_ip (map,map__map_ip_ptr (new_map)); -map__set_unmap_ip (map,map__unmap_ip_ptr (new_map)); +map__set_mapping_type (map,map__mapping_type (new_map));/* Ensure maps are correctly ordered */ map_ref =map__get (map);maps__remove (kmaps, map_ref);
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 16/53 perf maps: Move symbol maps functions to maps.c
In reply to Ian RogersMove the find and certain other symbol maps__* functions to maps.c for better abstraction.
--- tools/perf/util/maps.c | 238 +++++++++++++++++++++++++++++++++++++ tools/perf/util/maps.h | 12 ++ tools/perf/util/symbol.c | 248 --------------------------------------- tools/perf/util/symbol.h | 1 - 4 files changed, 250 insertions(+), 249 deletions(-)
tools/perf/util/maps.c +238 -0
@@ -475,3 +475,241 @@ struct map_rb_node *map_rb_node__next(struct map_rb_node *node) return rb_entry(next, struct map_rb_node, rb_node); } + +static int map__strcmp (const void *a,const void *b) +{ +const struct map *map_a = *(const struct map **)a; +const struct map *map_b = *(const struct map **)b; +const struct dso *dso_a =map__dso (map_a); +const struct dso *dso_b =map__dso (map_b); +int ret =strcmp (dso_a->short_name, dso_b->short_name); + +if (ret ==0 && map_a != map_b) { +/* +* Ensure distinct but name equal maps have an order in part to +* aid reference counting. +*/ + ret = (int )map__start (map_a) - (int )map__start (map_b); +if (ret ==0 ) + ret = (int )((intptr_t )map_a - (intptr_t )map_b); + } + +return ret; +} + +static int map__strcmp_name (const void *name,const void *b) +{ +const struct dso *dso =map__dso (*(const struct map **)b); + +return strcmp (name, dso->short_name); +} + +void __maps__sort_by_name (struct maps *maps) +{ +qsort (maps__maps_by_name (maps),maps__nr_maps (maps),sizeof (struct map *), map__strcmp); +} + +static int map__groups__sort_by_name_from_rbtree (struct maps *maps) +{ +struct map_rb_node *rb_node; +struct map **maps_by_name =realloc (maps__maps_by_name (maps), +maps__nr_maps (maps) *sizeof (struct map *)); +int i =0 ; + +if (maps_by_name ==NULL ) +return -1 ; + +up_read (maps__lock (maps)); +down_write (maps__lock (maps)); + +RC_CHK_ACCESS (maps)->maps_by_name = maps_by_name; +RC_CHK_ACCESS (maps)->nr_maps_allocated =maps__nr_maps (maps); + +maps__for_each_entry (maps, rb_node) + maps_by_name[i++] =map__get (rb_node->map); + +__maps__sort_by_name (maps); + +up_write (maps__lock (maps)); +down_read (maps__lock (maps)); + +return 0 ; +} + +static struct map *__maps__find_by_name (struct maps *maps,const char *name) +{ +struct map **mapp; + +if (maps__maps_by_name (maps) ==NULL && +map__groups__sort_by_name_from_rbtree (maps)) +return NULL ; + + mapp =bsearch (name,maps__maps_by_name (maps),maps__nr_maps (maps), +sizeof (*mapp), map__strcmp_name); +if (mapp) +return *mapp; +return NULL ; +} + +struct map *maps__find_by_name (struct maps *maps,const char *name) +{ +struct map_rb_node *rb_node; +struct map *map; + +down_read (maps__lock (maps)); + + +if (RC_CHK_ACCESS (maps)->last_search_by_name) { +const struct dso *dso =map__dso (RC_CHK_ACCESS (maps)->last_search_by_name); + +if (strcmp (dso->short_name, name) ==0 ) { + map =RC_CHK_ACCESS (maps)->last_search_by_name; + goto out_unlock; + } + } +/* +* If we have maps->maps_by_name, then the name isn't in the rbtree, +* as maps->maps_by_name mirrors the rbtree when lookups by name are +* made. +*/ + map =__maps__find_by_name (maps, name); +if (map ||maps__maps_by_name (maps) !=NULL ) + goto out_unlock; + +/* Fallback to traversing the rbtree... */ +maps__for_each_entry (maps, rb_node) { +struct dso *dso; + + map = rb_node->map; + dso =map__dso (map); +if (strcmp (dso->short_name, name) ==0 ) { +RC_CHK_ACCESS (maps)->last_search_by_name = map; + goto out_unlock; + } + } + map =NULL ; + +out_unlock: +up_read (maps__lock (maps)); +return map; +} + +void maps__fixup_end (struct maps *maps) +{ +struct map_rb_node *prev =NULL , *curr; + +down_write (maps__lock (maps)); + +maps__for_each_entry (maps, curr) { +if (prev !=NULL && !map__end (prev->map)) +map__set_end (prev->map,map__start (curr->map)); + + prev = curr; + } + +/* +* We still haven't the actual symbols, so guess the +* last map final address. +*/ +if (curr && !map__end (curr->map)) +map__set_end (curr->map, ~0ULL ); + +up_write (maps__lock (maps)); +} + +/* +* Merges map into maps by splitting the new map within the existing map +* regions. +*/ +int maps__merge_in (struct maps *kmaps,struct map *new_map) +{ +struct map_rb_node *rb_node; +LIST_HEAD (merged); +int err =0 ; + +maps__for_each_entry (kmaps, rb_node) { +struct map *old_map = rb_node->map; + +/* no overload with this one */ +if (map__end (new_map) <map__start (old_map) || +map__start (new_map) >=map__end (old_map)) +continue ; + +if (map__start (new_map) <map__start (old_map)) { +/* +* |new...... +* |old.... +*/ +if (map__end (new_map) <map__end (old_map)) { +/* +* |new......| -> |new..| +* |old....| -> |old....| +*/ +map__set_end (new_map,map__start (old_map)); + }else { +/* +* |new.............| -> |new..| |new..| +* |old....| -> |old....| +*/ +struct map_list_node *m =map_list_node__new (); + +if (!m) { + err = -ENOMEM ; + goto out; + } + + m->map =map__clone (new_map); +if (!m->map) { +free (m); + err = -ENOMEM ; + goto out; + } + +map__set_end (m->map,map__start (old_map)); +list_add_tail (&m->node, &merged); +map__add_pgoff (new_map,map__end (old_map) -map__start (new_map)); +map__set_start (new_map,map__end (old_map)); + } + }else { +/* +* |new...... +* |old.... +*/ +if (map__end (new_map) <map__end (old_map)) { +/* +* |new..| -> x +* |old.........| -> |old.........| +*/ +map__put (new_map); + new_map =NULL ; +break ; + }else { +/* +* |new......| -> |new...| +* |old....| -> |old....| +*/ +map__add_pgoff (new_map,map__end (old_map) -map__start (new_map)); +map__set_start (new_map,map__end (old_map)); + } + } + } + +out: +while (!list_empty (&merged)) { +struct map_list_node *old_node; + + old_node = list_entry(merged.next, struct map_list_node, node); +list_del_init (&old_node->node); +if (!err) + err =maps__insert (kmaps, old_node->map); +map__put (old_node->map); +free (old_node); + } + +if (new_map) { +if (!err) + err =maps__insert (kmaps, new_map); +map__put (new_map); + } +return err; +}
tools/perf/util/maps.h +12 -0
@@ -21,6 +21,16 @@ struct map_rb_node {struct map *map; }; +struct map_list_node { +struct list_head node; +struct map *map; +}; + +static inline struct map_list_node *map_list_node__new (void ) +{ +return malloc (sizeof (struct map_list_node )); +} +struct map_rb_node *maps__first (struct maps *maps);struct map_rb_node *map_rb_node__next (struct map_rb_node *node);struct map_rb_node *maps__find_node (struct maps *maps,struct map *map);
@@ -133,4 +143,6 @@ int maps__merge_in(struct maps *kmaps, struct map *new_map);void __maps__sort_by_name (struct maps *maps); +void maps__fixup_end (struct maps *maps); +#endif // __PERF_MAPS_H
tools/perf/util/symbol.c +0 -248
278 lines not on this page · raw message
tools/perf/util/symbol.h +0 -1
@@ -189,7 +189,6 @@ void __symbols__insert(struct rb_root_cached *symbols, struct symbol *sym,void symbols__insert (struct rb_root_cached *symbols,struct symbol *sym);void symbols__fixup_duplicate (struct rb_root_cached *symbols);void symbols__fixup_end (struct rb_root_cached *symbols,bool is_kallsyms); -void maps__fixup_end (struct maps *maps);typedef int (*mapfn_t )(u64 start,u64 len,u64 pgoff,void *data); int file__read_maps(int fd, bool exe, mapfn_t mapfn, void *data,
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 17/53 perf thread: Add missing RC_CHK_EQUAL
In reply to Ian RogersComparing pointers without RC_CHK_ACCESS means the indirect object will be compared rather than the underlying maps when REFCNT_CHECKING is enabled. Fix by adding missing RC_CHK_EQUAL.
--- tools/perf/util/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/thread.c +1 -1
@@ -385,7 +385,7 @@ static int thread__clone_maps(struct thread *thread, struct thread *parent, boolif (thread__pid (thread) ==thread__pid (parent))return thread__prepare_access (thread); -if (thread__maps (thread) ==thread__maps (parent)) { +if (RC_CHK_EQUAL (thread__maps (thread),thread__maps (parent))) {pr_debug ("broken map groups on thread %d/%d parent %d/%d\n" ,thread__pid (thread),thread__tid (thread),thread__pid (parent),thread__tid (parent));
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 18/53 perf maps: Add maps__for_each_map to call a function on each entry
In reply to Ian RogersMost current uses of maps don't take the rwsem introducing a risk that the maps will change during iteration. Introduce maps__for_each_map that iterates the entries under the read lock of the rwsem. This replaces the maps__for_each_entry macro that is moved into maps.c. maps__for_each_entry_safe will be replaced in a later change.
--- tools/perf/arch/x86/util/event.c | 103 +++++++------ tools/perf/builtin-report.c | 54 ++++--- tools/perf/tests/maps.c | 61 +++++--- tools/perf/tests/vmlinux-kallsyms.c | 181 ++++++++++++----------- tools/perf/util/machine.c | 53 ++++--- tools/perf/util/maps.c | 102 ++++++++----- tools/perf/util/maps.h | 6 +- tools/perf/util/probe-event.c | 40 +++-- tools/perf/util/symbol.c | 36 ++--- tools/perf/util/synthetic-events.c | 118 ++++++++------- tools/perf/util/thread.c | 35 +++-- tools/perf/util/unwind-libunwind-local.c | 34 +++-- tools/perf/util/vdso.c | 35 +++-- 13 files changed, 508 insertions(+), 350 deletions(-)
tools/perf/arch/x86/util/event.c +58 -45
@@ -14,66 +14,79 @@#if defined(__x86_64__) -int perf_event__synthesize_extra_kmaps (struct perf_tool *tool, -perf_event__handler_t process, -struct machine *machine) +struct perf_event__synthesize_extra_kmaps_cb_args { +struct perf_tool *tool; +perf_event__handler_t process; +struct machine *machine; +union perf_event *event; +}; + +static int perf_event__synthesize_extra_kmaps_cb (struct map *map,void *data) { -int rc =0 ; -struct map_rb_node *pos; -struct maps *kmaps =machine__kernel_maps (machine); -union perf_event *event =zalloc (sizeof (event->mmap) + - machine->id_hdr_size); +struct perf_event__synthesize_extra_kmaps_cb_args *args = data; +union perf_event *event = args->event; +struct kmap *kmap; +size_t size; -if (!event) { -pr_debug ("Not enough memory synthesizing mmap event " -"for extra kernel maps\n" ); -return -1 ; - } +if (!__map__is_extra_kernel_map (map)) +return 0 ; -maps__for_each_entry (kmaps, pos) { -struct kmap *kmap; -size_t size; -struct map *map = pos->map; + kmap =map__kmap (map); -if (!__map__is_extra_kernel_map (map)) -continue ; + size =sizeof (event->mmap) -sizeof (event->mmap.filename) + +PERF_ALIGN (strlen (kmap->name) +1 ,sizeof (u64)) + + args->machine->id_hdr_size; - kmap =map__kmap (map); +memset (event,0 , size); - size =sizeof (event->mmap) -sizeof (event->mmap.filename) + -PERF_ALIGN (strlen (kmap->name) +1 ,sizeof (u64)) + - machine->id_hdr_size; + event->mmap.header.type =PERF_RECORD_MMAP ; -memset (event,0 , size); +/* +* kernel uses 0 for user space maps, see kernel/perf_event.c +* __perf_event_mmap +*/ +if (machine__is_host (args->machine)) + event->header.misc =PERF_RECORD_MISC_KERNEL ; +else + event->header.misc =PERF_RECORD_MISC_GUEST_KERNEL ; - event->mmap.header.type =PERF_RECORD_MMAP ; + event->mmap.header.size = size; -/* -* kernel uses 0 for user space maps, see kernel/perf_event.c -* __perf_event_mmap -*/ -if (machine__is_host (machine)) - event->header.misc =PERF_RECORD_MISC_KERNEL ; -else - event->header.misc =PERF_RECORD_MISC_GUEST_KERNEL ; + event->mmap.start =map__start (map); + event->mmap.len =map__size (map); + event->mmap.pgoff =map__pgoff (map); + event->mmap.pid = args->machine->pid; - event->mmap.header.size = size; +strlcpy (event->mmap.filename, kmap->name,PATH_MAX ); - event->mmap.start =map__start (map); - event->mmap.len =map__size (map); - event->mmap.pgoff =map__pgoff (map); - event->mmap.pid = machine->pid; +if (perf_tool__process_synth_event (args->tool, event, args->machine, args->process) !=0 ) +return -1 ; -strlcpy (event->mmap.filename, kmap->name,PATH_MAX ); +return 0 ; +} -if (perf_tool__process_synth_event (tool, event, machine, - process) !=0 ) { - rc =-1 ; -break ; - } +int perf_event__synthesize_extra_kmaps (struct perf_tool *tool, +perf_event__handler_t process, +struct machine *machine) +{ +int rc; +struct maps *kmaps =machine__kernel_maps (machine); +struct perf_event__synthesize_extra_kmaps_cb_args args = { + .tool = tool, + .process = process, + .machine = machine, + .event =zalloc (sizeof (args.event->mmap) + machine->id_hdr_size), + }; + +if (!args.event) { +pr_debug ("Not enough memory synthesizing mmap event " +"for extra kernel maps\n" ); +return -1 ; } -free (event); + rc =maps__for_each_map (kmaps, perf_event__synthesize_extra_kmaps_cb, &args); + +free (args.event);return rc; }
tools/perf/builtin-report.c +37 -17
64 lines not on this page · raw message
tools/perf/tests/maps.c +38 -23
82 lines not on this page · raw message
tools/perf/tests/vmlinux-kallsyms.c +98 -83
260 lines not on this page · raw message
tools/perf/util/machine.c +29 -24
78 lines not on this page · raw message
tools/perf/util/maps.c +69 -33
137 lines not on this page · raw message
tools/perf/util/maps.h +3 -3
@@ -36,9 +36,6 @@ struct map_rb_node *map_rb_node__next(struct map_rb_node *node);struct map_rb_node *maps__find_node (struct maps *maps,struct map *map);struct map *maps__find (struct maps *maps,u64 addr); -#define maps__for_each_entry (maps, map) \ - for (map = maps__first(maps); map; map = map_rb_node__next(map)) -#define maps__for_each_entry_safe (maps, map, next) \ for (map = maps__first(maps), next = map_rb_node__next(map); map; \ map = next, next = map_rb_node__next(map))
@@ -81,6 +78,9 @@ static inline void __maps__zput(struct maps **map)#define maps__zput (map) __maps__zput(&map) +/* Iterate over map calling cb for each entry. */ +int maps__for_each_map (struct maps *maps,int (*cb)(struct map *map,void *data),void *data); +static inline struct rb_root *maps__entries (struct maps *maps) {return &RC_CHK_ACCESS (maps)->entries;
tools/perf/util/probe-event.c +26 -14
@@ -149,10 +149,32 @@ static int kernel_get_symbol_address_by_name(const char *name, u64 *addr,return 0 ; } +struct kernel_get_module_map_cb_args { +const char *module; +struct map *result; +}; + +static int kernel_get_module_map_cb (struct map *map,void *data) +{ +struct kernel_get_module_map_cb_args *args = data; +struct dso *dso =map__dso (map); +const char *short_name = dso->short_name;/* short_name is "[module]" */ +u16 short_name_len = dso->short_name_len; + +if (strncmp (short_name +1 , args->module, short_name_len -2 ) ==0 && + args->module[short_name_len -2 ] =='\0' ) { + args->result =map__get (map); +return 1 ; + } +return 0 ; +} +static struct map *kernel_get_module_map (const char *module) { -struct maps *maps =machine__kernel_maps (host_machine); -struct map_rb_node *pos; +struct kernel_get_module_map_cb_args args = { + .module = module, + .result =NULL , + };/* A file path -- this is an offline module */ if (module &&strchr (module,'/' ))
@@ -164,19 +186,9 @@ static struct map *kernel_get_module_map(const char *module)return map__get (map); } -maps__for_each_entry (maps, pos) { -/* short_name is "[module]" */ -struct dso *dso =map__dso (pos->map); -const char *short_name = dso->short_name; -u16 short_name_len = dso->short_name_len; +maps__for_each_map (machine__kernel_maps (host_machine), kernel_get_module_map_cb, &args); -if (strncmp (short_name +1 , module, - short_name_len -2 ) ==0 && - module[short_name_len -2 ] =='\0' ) { -return map__get (pos->map); - } - } -return NULL ; +return args.result; }struct map *get_target_map (const char *target,struct nsinfo *nsi,bool user)
tools/perf/util/symbol.c +19 -17
@@ -1114,33 +1114,35 @@ int compare_proc_modules(const char *from, const char *to)return ret; } +static int do_validate_kcore_modules_cb (struct map *old_map,void *data) +{ +struct rb_root *modules = data; +struct module_info *mi; +struct dso *dso; + +if (!__map__is_kmodule (old_map)) +return 0 ; + + dso =map__dso (old_map); +/* Module must be in memory at the same address */ + mi =find_module (dso->short_name, modules); +if (!mi || mi->start !=map__start (old_map)) +return -EINVAL ; + +return 0 ; +} +static int do_validate_kcore_modules (const char *filename,struct maps *kmaps) {struct rb_root modules =RB_ROOT ; -struct map_rb_node *old_node;int err; err =read_proc_modules (filename, &modules);if (err)return err; -maps__for_each_entry (kmaps, old_node) { -struct map *old_map = old_node->map; -struct module_info *mi; -struct dso *dso; + err =maps__for_each_map (kmaps, do_validate_kcore_modules_cb, &modules); -if (!__map__is_kmodule (old_map)) { -continue ; - } - dso =map__dso (old_map); -/* Module must be in memory at the same address */ - mi =find_module (dso->short_name, &modules); -if (!mi || mi->start !=map__start (old_map)) { - err = -EINVAL ; - goto out; - } - } -out:delete_modules (&modules);return err; }
tools/perf/util/synthetic-events.c +67 -51
138 lines not on this page · raw message
tools/perf/util/thread.c +17 -18
@@ -349,34 +349,33 @@ int thread__insert_map(struct thread *thread, struct map *map)return maps__insert (thread__maps (thread), map); } -static int __thread__prepare_access (struct thread *thread) +struct thread__prepare_access_maps_cb_args { +int err; +struct maps *maps; +}; + +static int thread__prepare_access_maps_cb (struct map *map,void *data) {bool initialized = false; -int err =0 ; -struct maps *maps =thread__maps (thread); -struct map_rb_node *rb_node; - -down_read (maps__lock (maps)); - -maps__for_each_entry (maps, rb_node) { - err =unwind__prepare_access (thread__maps (thread), rb_node->map, &initialized); -if (err || initialized) -break ; - } +struct thread__prepare_access_maps_cb_args *args = data; -up_read (maps__lock (maps)); + args->err =unwind__prepare_access (args->maps, map, &initialized); -return err; +return (args->err || initialized) ?1 :0 ; }static int thread__prepare_access (struct thread *thread) { -int err =0 ; +struct thread__prepare_access_maps_cb_args args = { + .err =0 , + }; -if (dwarf_callchain_users) - err =__thread__prepare_access (thread); +if (dwarf_callchain_users) { + args.maps =thread__maps (thread); +maps__for_each_map (thread__maps (thread), thread__prepare_access_maps_cb, &args); + } -return err; +return args.err; }static int thread__clone_maps (struct thread *thread,struct thread *parent,bool do_maps_clone)
tools/perf/util/unwind-libunwind-local.c +24 -10
@@ -302,12 +302,31 @@ static int unwind_spec_ehframe(struct dso *dso, struct machine *machine,return 0 ; } +struct read_unwind_spec_eh_frame_maps_cb_args { +struct dso *dso; +u64 base_addr; +}; + +static int read_unwind_spec_eh_frame_maps_cb (struct map *map,void *data) +{ + +struct read_unwind_spec_eh_frame_maps_cb_args *args = data; + +if (map__dso (map) == args->dso &&map__start (map) < args->base_addr) + args->base_addr =map__start (map); + +return 0 ; +} + +static int read_unwind_spec_eh_frame (struct dso *dso,struct unwind_info *ui,u64 *table_data,u64 *segbase,u64 *fde_count) { -struct map_rb_node *map_node; -u64 base_addr =UINT64_MAX ; +struct read_unwind_spec_eh_frame_maps_cb_args args = { + .dso = dso, + .base_addr =UINT64_MAX , + };int ret, fd;if (dso->data.eh_frame_hdr_offset ==0 ) {
@@ -325,16 +344,11 @@ static int read_unwind_spec_eh_frame(struct dso *dso, struct unwind_info *ui,return -EINVAL ; } -maps__for_each_entry (thread__maps (ui->thread), map_node) { -struct map *map = map_node->map; -u64 start =map__start (map); +maps__for_each_map (thread__maps (ui->thread), read_unwind_spec_eh_frame_maps_cb, &args); -if (map__dso (map) == dso && start < base_addr) - base_addr = start; - } - base_addr -= dso->data.elf_base_addr; + args.base_addr -= dso->data.elf_base_addr;/* Address of .eh_frame_hdr */ - *segbase = base_addr + dso->data.eh_frame_hdr_addr; + *segbase = args.base_addr + dso->data.eh_frame_hdr_addr; ret =unwind_spec_ehframe (dso, ui->machine, dso->data.eh_frame_hdr_offset, table_data, fde_count);if (ret)
tools/perf/util/vdso.c +23 -12
@@ -140,23 +140,34 @@ static struct dso *__machine__addnew_vdso(struct machine *machine, const char *sreturn dso; } +struct machine__thread_dso_type_maps_cb_args { +struct machine *machine; +enum dso_type dso_type; +}; + +static int machine__thread_dso_type_maps_cb (struct map *map,void *data) +{ +struct machine__thread_dso_type_maps_cb_args *args = data; +struct dso *dso =map__dso (map); + +if (!dso || dso->long_name[0 ] !='/' ) +return 0 ; + + args->dso_type =dso__type (dso, args->machine); +return (args->dso_type !=DSO__TYPE_UNKNOWN ) ?1 :0 ; +} +static enum dso_type machine__thread_dso_type (struct machine *machine,struct thread *thread) { -enum dso_type dso_type =DSO__TYPE_UNKNOWN ; -struct map_rb_node *rb_node; - -maps__for_each_entry (thread__maps (thread), rb_node) { -struct dso *dso =map__dso (rb_node->map); +struct machine__thread_dso_type_maps_cb_args args = { + .machine = machine, + .dso_type =DSO__TYPE_UNKNOWN , + }; -if (!dso || dso->long_name[0 ] !='/' ) -continue ; - dso_type =dso__type (dso, machine); -if (dso_type !=DSO__TYPE_UNKNOWN ) -break ; - } +maps__for_each_map (thread__maps (thread), machine__thread_dso_type_maps_cb, &args); -return dso_type; +return args.dso_type; }#if BITS_PER_LONG ==64
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 19/53 perf maps: Add remove maps function to remove a map based on callback
In reply to Ian RogersRemoving maps wasn't being done under the write lock. Similar to maps__for_each_map, iterate the entries but in this case remove the entry based on the result of the callback. If an entry was removed then maps_by_name also needs updating, so add missed flush.
In dso__load_kcore, the test of map to save would always be false with REFCNT_CHECKING because of a missing RC_CHK_ACCESS.
--- tools/perf/util/maps.c | 24 ++++++++++++++++++++++++ tools/perf/util/maps.h | 6 ++---- tools/perf/util/symbol.c | 24 ++++++++++++------------ 3 files changed, 38 insertions(+), 16 deletions(-)
tools/perf/util/maps.c +24 -0
@@ -13,6 +13,10 @@#define maps__for_each_entry (maps, map) \ for (map = maps__first(maps); map; map = map_rb_node__next(map)) +#define maps__for_each_entry_safe (maps, map, next) \ + for (map = maps__first(maps), next = map_rb_node__next(map); map; \ + map = next, next = map_rb_node__next(map)) +static void maps__init (struct maps *maps,struct machine *machine) {refcount_set (maps__refcnt (maps),1 );
@@ -214,6 +218,26 @@ int maps__for_each_map(struct maps *maps, int (*cb)(struct map *map, void *data)return ret; } +void maps__remove_maps (struct maps *maps,bool (*cb)(struct map *map,void *data),void *data) +{ +struct map_rb_node *pos, *next; +unsigned int start_nr_maps; + +down_write (maps__lock (maps)); + + start_nr_maps =maps__nr_maps (maps); +maps__for_each_entry_safe (maps, pos, next) { +if (cb (pos->map, data)) { +__maps__remove (maps, pos); + --RC_CHK_ACCESS (maps)->nr_maps; + } + } +if (maps__maps_by_name (maps) && start_nr_maps !=maps__nr_maps (maps)) +__maps__free_maps_by_name (maps); + +up_write (maps__lock (maps)); +} +struct symbol *maps__find_symbol (struct maps *maps,u64 addr,struct map **mapp) {struct map *map =maps__find (maps, addr);
tools/perf/util/maps.h +2 -4
@@ -36,10 +36,6 @@ struct map_rb_node *map_rb_node__next(struct map_rb_node *node);struct map_rb_node *maps__find_node (struct maps *maps,struct map *map);struct map *maps__find (struct maps *maps,u64 addr); -#define maps__for_each_entry_safe (maps, map, next) \ - for (map = maps__first(maps), next = map_rb_node__next(map); map; \ - map = next, next = map_rb_node__next(map)) -DECLARE_RC_STRUCT (maps) {struct rb_root entries;struct rw_semaphore lock;
@@ -80,6 +76,8 @@ static inline void __maps__zput(struct maps **map)/* Iterate over map calling cb for each entry. */ int maps__for_each_map (struct maps *maps,int (*cb)(struct map *map,void *data),void *data); +/* Iterate over map removing an entry if cb returns true. */ +void maps__remove_maps (struct maps *maps,bool (*cb)(struct map *map,void *data),void *data);static inline struct rb_root *maps__entries (struct maps *maps) {
tools/perf/util/symbol.c +12 -12
@@ -1239,13 +1239,23 @@ static int kcore_mapfn(u64 start, u64 len, u64 pgoff, void *data)return 0 ; } +static bool remove_old_maps (struct map *map,void *data) +{ +const struct map *map_to_save = data; + +/* +* We need to preserve eBPF maps even if they are covered by kcore, +* because we need to access eBPF dso for source data. +*/ +return RC_CHK_ACCESS (map) !=RC_CHK_ACCESS (map_to_save) && !__map__is_bpf_prog (map); +} +static int dso__load_kcore (struct dso *dso,struct map *map,const char *kallsyms_filename) {struct maps *kmaps =map__kmaps (map);struct kcore_mapfn_data md;struct map *replacement_map =NULL ; -struct map_rb_node *old_node, *next;struct machine *machine;bool is_64_bit;int err, fd;
@@ -1292,17 +1302,7 @@ static int dso__load_kcore(struct dso *dso, struct map *map, }/* Remove old maps */ -maps__for_each_entry_safe (kmaps, old_node, next) { -struct map *old_map = old_node->map; - -/* -* We need to preserve eBPF maps even if they are -* covered by kcore, because we need to access -* eBPF dso for source data. -*/ -if (old_map != map && !__map__is_bpf_prog (old_map)) -maps__remove (kmaps, old_map); - } +maps__remove_maps (kmaps, remove_old_maps, map); machine->trampolines_mapped = false;/* Find the kernel map using the '_stext' symbol */
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 20/53 perf debug: Expose debug file
In reply to Ian RogersSome dumping call backs need to be passed a FILE*. Expose debug file via an accessor API for a consistent way to do this. Catch the unlikely failure of it not being set. Switch two cases where stderr was being used instead of debug_file.
--- tools/perf/util/debug.c | 22 +++++++++++++++------- tools/perf/util/debug.h | 1 + 2 files changed, 16 insertions(+), 7 deletions(-)
tools/perf/util/debug.c +15 -7
@@ -38,12 +38,21 @@ bool dump_trace = false, quiet = false;int debug_ordered_events;static int redirect_to_stderr;int debug_data_convert; -static FILE *debug_file; +static FILE *_debug_file;bool debug_display_time; +FILE *debug_file (void ) +{ +if (!_debug_file) { +pr_warning_once ("debug_file not set" ); +debug_set_file (stderr); + } +return _debug_file; +} +void debug_set_file (FILE *file) { - debug_file = file; + _debug_file = file; }void debug_set_display_time (bool set)
@@ -78,8 +87,8 @@ int veprintf(int level, int var, const char *fmt, va_list args)if (use_browser >=1 && !redirect_to_stderr) {ui_helpline__vshow (fmt, args); }else { - ret =fprintf_time (debug_file); - ret +=vfprintf (debug_file, fmt, args); + ret =fprintf_time (debug_file ()); + ret +=vfprintf (debug_file (), fmt, args); } }
@@ -107,9 +116,8 @@ static int veprintf_time(u64 t, const char *fmt, va_list args) nsecs -= secs *NSEC_PER_SEC ; usecs = nsecs /NSEC_PER_USEC ; - ret =fprintf (stderr,"[%13" PRIu64".%06" PRIu64"] " , - secs, usecs); - ret +=vfprintf (stderr, fmt, args); + ret =fprintf (debug_file (),"[%13" PRIu64".%06" PRIu64"] " , secs, usecs); + ret +=vfprintf (debug_file (), fmt, args);return ret; }
tools/perf/util/debug.h +1 -0
@@ -77,6 +77,7 @@ int eprintf_time(int level, int var, u64 t, const char *fmt, ...) __printf(4, 5)int veprintf (int level,int var,const char *fmt,va_list args);int perf_debug_option (const char *str); +FILE *debug_file (void );void debug_set_file (FILE *file);void debug_set_display_time (bool set);void perf_debug_setup (void );
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 21/53 perf maps: Refactor maps__fixup_overlappings
In reply to Ian RogersRename to maps__fixup_overlap_and_insert as the given mapping is always inserted. Factor out first_ending_after as a utility function. Minor variable name changes. Switch to using debug_file() rather than passing a debug FILE*.
--- tools/perf/util/maps.c | 62 ++++++++++++++++++++++++---------------- tools/perf/util/maps.h | 2 +- tools/perf/util/thread.c | 3 +- 3 files changed, 39 insertions(+), 28 deletions(-)
tools/perf/util/maps.c +37 -25
@@ -334,20 +334,16 @@ size_t maps__fprintf(struct maps *maps, FILE *fp)return args.printed; } -int maps__fixup_overlappings (struct maps *maps,struct map *map,FILE *fp) +/* +* Find first map where end > new->start. +* Same as find_vma() in kernel. +*/ +static struct rb_node *first_ending_after (struct maps *maps,const struct map *map) {struct rb_root *root;struct rb_node *next, *first; -int err =0 ; - -down_write (maps__lock (maps)); root =maps__entries (maps); - -/* -* Find first map where end > map->start. -* Same as find_vma() in kernel. -*/ next = root->rb_node; first =NULL ;while (next) {
@@ -361,8 +357,22 @@ int maps__fixup_overlappings(struct maps *maps, struct map *map, FILE *fp) }else next = next->rb_right; } +return first; +} + +/* +* Adds new to maps, if new overlaps existing entries then the existing maps are +* adjusted or removed so that new fits without overlapping any entries. +*/ +int maps__fixup_overlap_and_insert (struct maps *maps,struct map *new) +{ + +struct rb_node *next; +int err =0 ; + +down_write (maps__lock (maps)); - next = first; + next =first_ending_after (maps, new);while (next && !err) { struct map_rb_node *pos = rb_entry(next, struct map_rb_node, rb_node); next =rb_next (&pos->rb_node);
@@ -371,27 +381,27 @@ int maps__fixup_overlappings(struct maps *maps, struct map *map, FILE *fp)* Stop if current map starts after map->end. * Maps are ordered by start: next will not overlap for sure. */ -if (map__start (pos->map) >=map__end (map)) +if (map__start (pos->map) >=map__end (new))break ;if (verbose >=2 ) {if (use_browser) {pr_debug ("overlapping maps in %s (disable tui for more info)\n" , -map__dso (map)->name); +map__dso (new)->name); }else { -fputs ("overlapping maps:\n" , fp); -map__fprintf (map, fp); -map__fprintf (pos->map, fp); +pr_debug ("overlapping maps:\n" ); +map__fprintf (new,debug_file ()); +map__fprintf (pos->map,debug_file ()); } } -rb_erase_init (&pos->rb_node, root); +rb_erase_init (&pos->rb_node,maps__entries (maps));/* * Now check if we need to create new maps for areas not * overlapped by the new map: */ -if (map__start (map) >map__start (pos->map)) { +if (map__start (new) >map__start (pos->map)) {struct map *before =map__clone (pos->map);if (before ==NULL ) {
@@ -399,7 +409,7 @@ int maps__fixup_overlappings(struct maps *maps, struct map *map, FILE *fp) goto put_map; } -map__set_end (before,map__start (map)); +map__set_end (before,map__start (new)); err =__maps__insert (maps, before);if (err) {map__put (before);
@@ -407,11 +417,11 @@ int maps__fixup_overlappings(struct maps *maps, struct map *map, FILE *fp) }if (verbose >=2 && !use_browser) -map__fprintf (before, fp); +map__fprintf (before,debug_file ());map__put (before); } -if (map__end (map) <map__end (pos->map)) { +if (map__end (new) <map__end (pos->map)) {struct map *after =map__clone (pos->map);if (after ==NULL ) {
@@ -419,23 +429,25 @@ int maps__fixup_overlappings(struct maps *maps, struct map *map, FILE *fp) goto put_map; } -map__set_start (after,map__end (map)); -map__add_pgoff (after,map__end (map) -map__start (pos->map)); -assert (map__map_ip (pos->map,map__end (map)) == -map__map_ip (after,map__end (map))); +map__set_start (after,map__end (new)); +map__add_pgoff (after,map__end (new) -map__start (pos->map)); +assert (map__map_ip (pos->map,map__end (new)) == +map__map_ip (after,map__end (new))); err =__maps__insert (maps, after);if (err) {map__put (after); goto put_map; }if (verbose >=2 && !use_browser) -map__fprintf (after, fp); +map__fprintf (after,debug_file ());map__put (after); } put_map:map__put (pos->map);free (pos); } +/* Add the map. */ + err =__maps__insert (maps, new);up_write (maps__lock (maps));return err; }
tools/perf/util/maps.h +1 -1
@@ -133,7 +133,7 @@ struct addr_map_symbol;int maps__find_ams (struct maps *maps,struct addr_map_symbol *ams); -int maps__fixup_overlappings (struct maps *maps,struct map *map,FILE *fp); +int maps__fixup_overlap_and_insert (struct maps *maps,struct map *new);struct map *maps__find_by_name (struct maps *maps,const char *name);
tools/perf/util/thread.c +1 -2
@@ -345,8 +345,7 @@ int thread__insert_map(struct thread *thread, struct map *map)if (ret)return ret; -maps__fixup_overlappings (thread__maps (thread), map, stderr); -return maps__insert (thread__maps (thread), map); +return maps__fixup_overlap_and_insert (thread__maps (thread), map); }struct thread__prepare_access_maps_cb_args {
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 22/53 perf maps: Do simple merge if given map doesn't overlap
In reply to Ian RogersSimplify merge in for the simple case of a non-overlapping map.
--- tools/perf/util/maps.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
tools/perf/util/maps.c +11 -0
@@ -696,9 +696,20 @@ void maps__fixup_end(struct maps *maps)int maps__merge_in (struct maps *kmaps,struct map *new_map) {struct map_rb_node *rb_node; +struct rb_node *first; +bool overlaps;LIST_HEAD (merged);int err =0 ; +down_read (maps__lock (kmaps)); + first =first_ending_after (kmaps, new_map); + overlaps = first && + map__start(rb_entry(first, struct map_rb_node, rb_node)->map) < map__end(new_map); +up_read (maps__lock (kmaps)); + +if (!overlaps) +return maps__insert (kmaps, new_map); +maps__for_each_entry (kmaps, rb_node) {struct map *old_map = rb_node->map;
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 23/53 perf maps: Rename clone to copy from
In reply to Ian RogersRename maps__clone to maps__copy_from to be more intention revealing of its behavior. Pass the underlying maps rather than the thread.
--- tools/perf/util/machine.c | 2 +- tools/perf/util/maps.c | 6 +----- tools/perf/util/maps.h | 3 +-- tools/perf/util/thread.c | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-)
tools/perf/util/machine.c +1 -1
@@ -454,7 +454,7 @@ static struct thread *findnew_guest_code(struct machine *machine,* Guest code can be found in hypervisor process at the same address * so copy host maps. */ - err =maps__clone (thread,thread__maps (host_thread)); + err =maps__copy_from (thread__maps (thread),thread__maps (host_thread));thread__put (host_thread);if (err) goto out_err;
tools/perf/util/maps.c +1 -5
@@ -452,12 +452,8 @@ int maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)return err; } -/* -* XXX This should not really _copy_ te maps, but refcount them. -*/ -int maps__clone (struct thread *thread,struct maps *parent) +int maps__copy_from (struct maps *maps,struct maps *parent) { -struct maps *maps =thread__maps (thread);int err;struct map_rb_node *rb_node;
tools/perf/util/maps.h +1 -2
@@ -14,7 +14,6 @@ struct ref_reloc_sym;struct machine ;struct map ;struct maps ; -struct thread ;struct map_rb_node {struct rb_node rb_node;
@@ -61,7 +60,7 @@ struct kmap {struct maps *maps__new (struct machine *machine);bool maps__empty (struct maps *maps); -int maps__clone (struct thread *thread,struct maps *parent); +int maps__copy_from (struct maps *maps,struct maps *parent);struct maps *maps__get (struct maps *maps);void maps__put (struct maps *maps);
tools/perf/util/thread.c +1 -1
@@ -390,7 +390,7 @@ static int thread__clone_maps(struct thread *thread, struct thread *parent, boolreturn 0 ; }/* But this one is new process, copy maps. */ -return do_maps_clone ?maps__clone (thread,thread__maps (parent)) :0 ; +return do_maps_clone ?maps__copy_from (thread__maps (thread),thread__maps (parent)) :0 ; }int thread__fork (struct thread *thread,struct thread *parent,u64 timestamp,bool do_maps_clone)
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 24/53 perf maps: Add maps__load_first
In reply to Ian RogersAvoid bpf_lock_contention_touching the internal maps data structure by adding a helper function. As access is done directly on the map in maps, hold the read lock to stop it being removed.
--- tools/perf/util/bpf_lock_contention.c | 2 +- tools/perf/util/maps.c | 13 +++++++++++++ tools/perf/util/maps.h | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-)
tools/perf/util/bpf_lock_contention.c +1 -1
@@ -317,7 +317,7 @@ int lock_contention_read(struct lock_contention *con) }/* make sure it loads the kernel map */ -map__load (maps__first (machine->kmaps)->map); +maps__load_first (machine->kmaps); prev_key =NULL ;while (!bpf_map_get_next_key (fd, prev_key, &key)) {
tools/perf/util/maps.c +13 -0
@@ -792,3 +792,16 @@ int maps__merge_in(struct maps *kmaps, struct map *new_map) }return err; } + +void maps__load_first (struct maps *maps) +{ +struct map_rb_node *first; + +down_read (maps__lock (maps)); + + first =maps__first (maps); +if (first) +map__load (first->map); + +up_read (maps__lock (maps)); +}
tools/perf/util/maps.h +2 -0
@@ -142,4 +142,6 @@ void __maps__sort_by_name(struct maps *maps);void maps__fixup_end (struct maps *maps); +void maps__load_first (struct maps *maps); +#endif // __PERF_MAPS_H
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 25/53 perf maps: Add find next entry to give entry after the given map
In reply to Ian RogersUse to remove map_rb_node use from machine.c.
--- tools/perf/util/machine.c | 7 +++---- tools/perf/util/maps.c | 11 +++++++++++ tools/perf/util/maps.h | 2 ++ 3 files changed, 16 insertions(+), 4 deletions(-)
tools/perf/util/machine.c +3 -4
@@ -1759,12 +1759,11 @@ int machine__create_kernel_maps(struct machine *machine)if (end == ~0ULL ) {/* update end address of the kernel map using adjacent module address */ -struct map_rb_node *rb_node =maps__find_node (machine__kernel_maps (machine), -machine__kernel_map (machine)); -struct map_rb_node *next =map_rb_node__next (rb_node); +struct map *next =maps__find_next_entry (machine__kernel_maps (machine), +machine__kernel_map (machine));if (next) -machine__set_kernel_mmap (machine, start,map__start (next->map)); +machine__set_kernel_mmap (machine, start,map__start (next)); } out_put:
tools/perf/util/maps.c +11 -0
@@ -662,6 +662,17 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)return map; } +struct map *maps__find_next_entry (struct maps *maps,struct map *map) +{ +struct map_rb_node *rb_node =maps__find_node (maps, map); +struct map_rb_node *next =map_rb_node__next (rb_node); + +if (next) +return next->map; + +return NULL ; +} +void maps__fixup_end (struct maps *maps) {struct map_rb_node *prev =NULL , *curr;
tools/perf/util/maps.h +2 -0
@@ -136,6 +136,8 @@ int maps__fixup_overlap_and_insert(struct maps *maps, struct map *new);struct map *maps__find_by_name (struct maps *maps,const char *name); +struct map *maps__find_next_entry (struct maps *maps,struct map *map); +int maps__merge_in (struct maps *kmaps,struct map *new_map);void __maps__sort_by_name (struct maps *maps);
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 26/53 perf maps: Reduce scope of map_rb_node and maps internals
In reply to Ian RogersAvoid exposing the implementation of maps so that the internals can be refactored.
--- tools/perf/util/maps.c | 90 ++++++++++++++++++++++++++---------------- tools/perf/util/maps.h | 23 ----------- 2 files changed, 55 insertions(+), 58 deletions(-)
tools/perf/util/maps.c +55 -35
@@ -10,6 +10,11 @@#include "ui/ui.h" #include "unwind.h" +struct map_rb_node { +struct rb_node rb_node; +struct map *map; +}; +#define maps__for_each_entry (maps, map) \ for (map = maps__first(maps); map; map = map_rb_node__next(map))
@@ -17,6 +22,56 @@for (map =maps__first (maps), next =map_rb_node__next (map); map; \ map = next, next =map_rb_node__next (map)) +static struct rb_root *maps__entries(struct maps *maps) +{ +return &RC_CHK_ACCESS (maps)->entries; +} + +static struct rw_semaphore *maps__lock (struct maps *maps) +{ +return &RC_CHK_ACCESS (maps)->lock; +} + +static struct map **maps__maps_by_name (struct maps *maps) +{ +return RC_CHK_ACCESS (maps)->maps_by_name; +} + +static struct map_rb_node *maps__first (struct maps *maps) +{ +struct rb_node *first =rb_first (maps__entries (maps)); + +if (first) + return rb_entry(first, struct map_rb_node, rb_node); +return NULL ; +} + +static struct map_rb_node *map_rb_node__next (struct map_rb_node *node) +{ +struct rb_node *next; + +if (!node) +return NULL ; + + next =rb_next (&node->rb_node); + +if (!next) +return NULL ; + + return rb_entry(next, struct map_rb_node, rb_node); +} + +static struct map_rb_node *maps__find_node (struct maps *maps,struct map *map) +{ +struct map_rb_node *rb_node; + +maps__for_each_entry (maps, rb_node) { +if (rb_node->RC_CHK_ACCESS (map) ==RC_CHK_ACCESS (map)) +return rb_node; + } +return NULL ; +} +static void maps__init (struct maps *maps,struct machine *machine) {refcount_set (maps__refcnt (maps),1 );
@@ -484,17 +539,6 @@ int maps__copy_from(struct maps *maps, struct maps *parent)return err; } -struct map_rb_node *maps__find_node (struct maps *maps,struct map *map) -{ -struct map_rb_node *rb_node; - -maps__for_each_entry (maps, rb_node) { -if (rb_node->RC_CHK_ACCESS (map) ==RC_CHK_ACCESS (map)) -return rb_node; - } -return NULL ; -} -struct map *maps__find (struct maps *maps,u64 ip) {struct rb_node *p;
@@ -520,30 +564,6 @@ struct map *maps__find(struct maps *maps, u64 ip)return m ? m->map :NULL ; } -struct map_rb_node *maps__first (struct maps *maps) -{ -struct rb_node *first =rb_first (maps__entries (maps)); - -if (first) - return rb_entry(first, struct map_rb_node, rb_node); -return NULL ; -} - -struct map_rb_node *map_rb_node__next (struct map_rb_node *node) -{ -struct rb_node *next; - -if (!node) -return NULL ; - - next =rb_next (&node->rb_node); - -if (!next) -return NULL ; - - return rb_entry(next, struct map_rb_node, rb_node); -} -static int map__strcmp (const void *a,const void *b) {const struct map *map_a = *(const struct map **)a;
tools/perf/util/maps.h +0 -23
@@ -15,11 +15,6 @@ struct machine;struct map ;struct maps ; -struct map_rb_node { -struct rb_node rb_node; -struct map *map; -}; -struct map_list_node {struct list_head node;struct map *map;
@@ -30,9 +25,6 @@ static inline struct map_list_node *map_list_node__new(void)return malloc (sizeof (struct map_list_node )); } -struct map_rb_node *maps__first (struct maps *maps); -struct map_rb_node *map_rb_node__next (struct map_rb_node *node); -struct map_rb_node *maps__find_node (struct maps *maps,struct map *map);struct map *maps__find (struct maps *maps,u64 addr);DECLARE_RC_STRUCT (maps) {
@@ -78,26 +70,11 @@ int maps__for_each_map(struct maps *maps, int (*cb)(struct map *map, void *data)/* Iterate over map removing an entry if cb returns true. */ void maps__remove_maps (struct maps *maps,bool (*cb)(struct map *map,void *data),void *data); -static inline struct rb_root *maps__entries (struct maps *maps) -{ -return &RC_CHK_ACCESS (maps)->entries; -} -static inline struct machine *maps__machine (struct maps *maps) {return RC_CHK_ACCESS (maps)->machine; } -static inline struct rw_semaphore *maps__lock (struct maps *maps) -{ -return &RC_CHK_ACCESS (maps)->lock; -} - -static inline struct map **maps__maps_by_name (struct maps *maps) -{ -return RC_CHK_ACCESS (maps)->maps_by_name; -} -static inline unsigned int maps__nr_maps (const struct maps *maps) {return RC_CHK_ACCESS (maps)->nr_maps;
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 27/53 perf maps: Fix up overlaps during fixup_end
In reply to Ian RogersMaps are sometimes made overlapping, in particular kernel maps. If the end of a map overlaps the start of the next, shorten the overlapping map. This should remove potential non-determinism in maps__find, ie finding maps by address.
--- tools/perf/util/maps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/maps.c +1 -1
@@ -700,7 +700,7 @@ void maps__fixup_end(struct maps *maps)down_write (maps__lock (maps));maps__for_each_entry (maps, curr) { -if (prev !=NULL && !map__end (prev->map)) +if (prev && (!map__end (prev->map) ||map__end (prev->map) >map__start (curr->map)))map__set_end (prev->map,map__start (curr->map)); prev = curr;
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 28/53 perf maps: Switch from rbtree to lazily sorted array for addresses
In reply to Ian RogersMaps is a collection of maps primarily sorted by the starting address of the map. Prior to this change the maps were held in an rbtree requiring 4 pointers per node. Prior to reference count checking, the rbnode was embedded in the map so 3 pointers per node were necessary. This change switches the rbtree to an array lazily sorted by address, much as the array sorting nodes by name. 1 pointer is needed per node, but to avoid excessive resizing the backing array may be twice the number of used elements. Meaning the memory overhead is roughly half that of the rbtree. For a perf record with "--no-bpf-event -g -a" of true, the memory overhead of perf inject is reduce fom 3.3MB to 3MB, so 10% or 300KB is saved.
Map inserts always happen at the end of the array. The code tracks whether the insertion violates the sorting property. O(log n) rb-tree complexity is switched to O(1).
Remove slides the array, so O(log n) rb-tree complexity is degraded to O(n).
A find may need to sort the array using qsort which is O(n*log n), but in general the maps should be sorted and so average performance should be O(log n) as with the rbtree.
An rbtree node consumes a cache line, but with the array 4 nodes fit on a cache line. Iteration is simplified to scanning an array rather than pointer chasing.
Overall it is expected the performance after the change should be comparable to before, but with half of the memory consumed.
To avoid a list and repeated logic around splitting maps, maps__merge_in is rewritten in terms of maps__fixup_overlap_and_insert. maps_merge_in splits the given mapping inserting remaining gaps. maps__fixup_overlap_and_insert splits the existing mappings, then adds the incoming mapping. By adding the new mapping first, then re-inserting the existing mappings the splitting behavior matches.
--- tools/perf/tests/maps.c | 3 + tools/perf/util/map.c | 1 + tools/perf/util/maps.c | 1183 +++++++++++++++++++++++---------------- tools/perf/util/maps.h | 54 +- 4 files changed, 757 insertions(+), 484 deletions(-)
tools/perf/tests/maps.c +3 -0
@@ -156,6 +156,9 @@ static int test__maps__merge_in(struct test_suite *t __maybe_unused, int subtestTEST_ASSERT_VAL ("merge check failed" , !ret);maps__zput (maps); +map__zput (map_kcore1); +map__zput (map_kcore2); +map__zput (map_kcore3);return TEST_OK ; }
tools/perf/util/map.c +1 -0
@@ -168,6 +168,7 @@ struct map *map__new(struct machine *machine, u64 start, u64 len,if (dso ==NULL ) goto out_delete; +assert (!dso->kernel);map__init (result, start, start + len, pgoff, dso);if (anon || no_dso) {
tools/perf/util/maps.c +709 -474
1,446 lines not on this page · raw message
tools/perf/util/maps.h +44 -10
79 lines not on this page · raw message
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 29/53 perf maps: Get map before returning in maps__find
In reply to Ian RogersFinding a map is done under a lock, returning the map without a reference count means it can be removed without notice and causing uses after free. Grab a reference count to the map within the lock region and return this. Fix up locations that need a map__put following this.
--- tools/perf/arch/x86/tests/dwarf-unwind.c | 1 + tools/perf/tests/vmlinux-kallsyms.c | 5 ++--- tools/perf/util/bpf-event.c | 1 + tools/perf/util/event.c | 4 ++-- tools/perf/util/machine.c | 22 ++++++++-------------- tools/perf/util/maps.c | 17 ++++++++++------- tools/perf/util/symbol.c | 3 ++- 7 files changed, 26 insertions(+), 27 deletions(-)
tools/perf/arch/x86/tests/dwarf-unwind.c +1 -0
@@ -34,6 +34,7 @@ static int sample_ustack(struct perf_sample *sample, } stack_size =map__end (map) - sp; +map__put (map); stack_size = stack_size >STACK_SIZE ?STACK_SIZE : stack_size;memcpy (buf, (void *) sp, stack_size);
tools/perf/tests/vmlinux-kallsyms.c +2 -3
@@ -151,10 +151,8 @@ static int test__vmlinux_matches_kallsyms_cb2(struct map *map, void *data)u64 mem_end =map__unmap_ip (args->vmlinux_map,map__end (map)); pair =maps__find (args->kallsyms.kmaps, mem_start); -if (pair ==NULL ||map__priv (pair)) -return 0 ; -if (map__start (pair) == mem_start) { +if (pair !=NULL && !map__priv (pair) &&map__start (pair) == mem_start) {struct dso *dso =map__dso (map);if (!args->header_printed) {
@@ -170,6 +168,7 @@ static int test__vmlinux_matches_kallsyms_cb2(struct map *map, void *data)pr_info (" %s\n" , dso->name);map__set_priv (pair,1 ); } +map__put (pair);return 0 ; }
tools/perf/util/bpf-event.c +1 -0
@@ -63,6 +63,7 @@ static int machine__process_bpf_event_load(struct machine *machine, dso->bpf_prog.id = id; dso->bpf_prog.sub_id = i; dso->bpf_prog.env = env; +map__put (map); } }return 0 ;
tools/perf/util/event.c +2 -2
@@ -511,7 +511,7 @@ size_t perf_event__fprintf_text_poke(union perf_event *event, struct machine *mastruct addr_location al;addr_location__init (&al); - al.map =map__get (maps__find (machine__kernel_maps (machine), tp->addr)); + al.map =maps__find (machine__kernel_maps (machine), tp->addr);if (al.map &&map__load (al.map) >=0 ) { al.addr =map__map_ip (al.map, tp->addr); al.sym =map__find_symbol (al.map, al.addr);
@@ -641,7 +641,7 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr,return NULL ; } al->maps =maps__get (maps); - al->map =map__get (maps__find (maps, al->addr)); + al->map =maps__find (maps, al->addr);if (al->map !=NULL ) {/* * Kernel maps might be changed when loading symbols so loading
tools/perf/util/machine.c +8 -14
@@ -897,7 +897,6 @@ static int machine__process_ksymbol_register(struct machine *machine,struct symbol *sym;struct dso *dso;struct map *map =maps__find (machine__kernel_maps (machine), event->ksymbol.addr); -bool put_map = false;int err =0 ;if (!map) {
@@ -914,12 +913,6 @@ static int machine__process_ksymbol_register(struct machine *machine, err = -ENOMEM ; goto out; } -/* -* The inserted map has a get on it, we need to put to release -* the reference count here, but do it after all accesses are -* done. -*/ - put_map = true;if (event->ksymbol.ksym_type ==PERF_RECORD_KSYMBOL_TYPE_OOL ) { dso->binary_type =DSO_BINARY_TYPE__OOL ; dso->data.file_size = event->ksymbol.len;
@@ -953,8 +946,7 @@ static int machine__process_ksymbol_register(struct machine *machine, }dso__insert_symbol (dso, sym); out: -if (put_map) -map__put (map); +map__put (map);return err; }
@@ -978,7 +970,7 @@ static int machine__process_ksymbol_unregister(struct machine *machine,if (sym)dso__delete_symbol (dso, sym); } - +map__put (map);return 0 ; }
@@ -1006,11 +998,11 @@ int machine__process_text_poke(struct machine *machine, union perf_event *event,perf_event__fprintf_text_poke (event, machine, stdout);if (!event->text_poke.new_len) -return 0 ; + goto out;if (cpumode !=PERF_RECORD_MISC_KERNEL ) {pr_debug ("%s: unsupported cpumode - ignoring\n" , __func__); -return 0 ; + goto out; }if (dso) {
@@ -1033,7 +1025,8 @@ int machine__process_text_poke(struct machine *machine, union perf_event *event,pr_debug ("Failed to find kernel text poke address map for %#" PRI_lx64"\n" , event->text_poke.addr); } - +out: +map__put (map);return 0 ; }
@@ -1301,9 +1294,10 @@ static int machine__map_x86_64_entry_trampolines_cb(struct map *map, void *data)return 0 ; dest_map =maps__find (args->kmaps,map__pgoff (map)); -if (dest_map != map) +if (RC_CHK_ACCESS (dest_map) !=RC_CHK_ACCESS (map))map__set_pgoff (map,map__map_ip (dest_map,map__pgoff (map))); +map__put (dest_map); args->found = true;return 0 ; }
tools/perf/util/maps.c +10 -7
@@ -487,15 +487,18 @@ void maps__remove_maps(struct maps *maps, bool (*cb)(struct map *map, void *datastruct symbol *maps__find_symbol (struct maps *maps,u64 addr,struct map **mapp) {struct map *map =maps__find (maps, addr); +struct symbol *result =NULL ;/* Ensure map is loaded before using map->map_ip */ if (map !=NULL &&map__load (map) >=0 ) { -if (mapp !=NULL ) - *mapp = map;// TODO: map_put on else path when find returns a get. -return map__find_symbol (map,map__map_ip (map, addr)); - } +if (mapp) + *mapp = map; -return NULL ; + result =map__find_symbol (map,map__map_ip (map, addr)); +if (!mapp) +map__put (map); + } +return result; }struct maps__find_symbol_by_name_args {
@@ -539,7 +542,7 @@ int maps__find_ams(struct maps *maps, struct addr_map_symbol *ams)if (ams->addr <map__start (ams->ms.map) || ams->addr >=map__end (ams->ms.map)) {if (maps ==NULL )return -1 ; - ams->ms.map =maps__find (maps, ams->addr);// TODO: map_get + ams->ms.map =maps__find (maps, ams->addr);if (ams->ms.map ==NULL )return -1 ; }
@@ -848,7 +851,7 @@ struct map *maps__find(struct maps *maps, u64 ip) sizeof(*mapp), map__addr_cmp);if (mapp) - result = *mapp;// map__get(*mapp); + result =map__get (*mapp); done = true; }up_read (maps__lock (maps));
tools/perf/util/symbol.c +2 -1
@@ -757,7 +757,6 @@ static int dso__load_all_kallsyms(struct dso *dso, const char *filename)static int maps__split_kallsyms_for_kcore (struct maps *kmaps,struct dso *dso) { -struct map *curr_map;struct symbol *pos;int count =0 ;struct rb_root_cached old_root = dso->symbols;
@@ -770,6 +769,7 @@ static int maps__split_kallsyms_for_kcore(struct maps *kmaps, struct dso *dso) *root =RB_ROOT_CACHED ;while (next) { +struct map *curr_map;struct dso *curr_map_dso;char *module;
@@ -796,6 +796,7 @@ static int maps__split_kallsyms_for_kcore(struct maps *kmaps, struct dso *dso) pos->end -=map__start (curr_map) -map__pgoff (curr_map);symbols__insert (&curr_map_dso->symbols, pos); ++count; +map__put (curr_map); }/* Symbols have been adjusted */
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 30/53 perf maps: Get map before returning in maps__find_by_name
In reply to Ian RogersFinding a map is done under a lock, returning the map without a reference count means it can be removed without notice and causing uses after free. Grab a reference count to the map within the lock region and return this. Fix up locations that need a map__put following this. Also fix some reference counted pointer comparisons.
--- tools/perf/tests/vmlinux-kallsyms.c | 5 +++-- tools/perf/util/machine.c | 6 ++++-- tools/perf/util/maps.c | 6 +++--- tools/perf/util/probe-event.c | 1 + tools/perf/util/symbol-elf.c | 4 +++- tools/perf/util/symbol.c | 20 ++++++++++++-------- 6 files changed, 26 insertions(+), 16 deletions(-)
tools/perf/tests/vmlinux-kallsyms.c +3 -2
@@ -131,9 +131,10 @@ static int test__vmlinux_matches_kallsyms_cb1(struct map *map, void *data)struct map *pair =maps__find_by_name (args->kallsyms.kmaps, (dso->kernel ? dso->short_name : dso->name)); -if (pair) +if (pair) {map__set_priv (pair,1 ); -else { +map__put (pair); + }else {if (!args->header_printed) {pr_info ("WARN: Maps only in vmlinux:\n" ); args->header_printed = true;
tools/perf/util/machine.c +4 -2
@@ -1538,8 +1538,10 @@ static int maps__set_module_path(struct maps *maps, const char *path, struct kmoreturn 0 ; long_name =strdup (path); -if (long_name ==NULL ) +if (long_name ==NULL ) { +map__put (map);return -ENOMEM ; + } dso =map__dso (map);dso__set_long_name (dso, long_name, true);
@@ -1553,7 +1555,7 @@ static int maps__set_module_path(struct maps *maps, const char *path, struct kmo dso->symtab_type++; dso->comp = m->comp; } - +map__put (map);return 0 ; }
tools/perf/util/maps.c +3 -3
@@ -885,7 +885,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)struct dso *dso =map__dso (maps__maps_by_name (maps)[i]);if (dso &&strcmp (dso->short_name, name) ==0 ) { - result =maps__maps_by_name (maps)[i];// TODO: map__get + result =map__get (maps__maps_by_name (maps)[i]); done = true; } }
@@ -897,7 +897,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name) sizeof(*mapp), map__strcmp_name);if (mapp) { - result = *mapp;// TODO: map__get + result =map__get (*mapp); i = mapp -maps__maps_by_name (maps);RC_CHK_ACCESS (maps)->last_search_by_name_idx = i; }
@@ -922,7 +922,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)struct dso *dso =map__dso (pos);if (dso &&strcmp (dso->short_name, name) ==0 ) { - result = pos;// TODO: map__get + result =map__get (pos);break ; } }
tools/perf/util/probe-event.c +1 -0
@@ -358,6 +358,7 @@ static int kernel_get_module_dso(const char *module, struct dso **pdso) map =maps__find_by_name (machine__kernel_maps (host_machine), module_name);if (map) { dso =map__dso (map); +map__put (map); goto found; }pr_debug ("Failed to find module %s.\n" , module);
tools/perf/util/symbol-elf.c +3 -1
@@ -1470,8 +1470,10 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map,dso__set_loaded (curr_dso); *curr_mapp = curr_map; *curr_dsop = curr_dso; - }else + }else { *curr_dsop =map__dso (curr_map); +map__put (curr_map); + }return 0 ; }
tools/perf/util/symbol.c +12 -8
@@ -814,7 +814,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, struct map *initial_map) {struct machine *machine; -struct map *curr_map = initial_map; +struct map *curr_map =map__get (initial_map);struct symbol *pos;int count =0 , moved =0 ;struct rb_root_cached *root = &dso->symbols;
@@ -858,13 +858,14 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,dso__set_loaded (curr_map_dso); } +map__zput (curr_map); curr_map =maps__find_by_name (kmaps, module);if (curr_map ==NULL ) {pr_debug ("%s/proc/{kallsyms,modules} " "inconsistency while looking " "for \"%s\" module!\n" , machine->root_dir, module); - curr_map = initial_map; + curr_map =map__get (initial_map); goto discard_symbol; } curr_map_dso =map__dso (curr_map);
@@ -888,7 +889,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,* symbols at this point. */ goto discard_symbol; - }else if (curr_map != initial_map) { + }else if (!RC_CHK_EQUAL (curr_map, initial_map)) {char dso_name[PATH_MAX ];struct dso *ndso;
@@ -899,7 +900,8 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, }if (count ==0 ) { - curr_map = initial_map; +map__zput (curr_map); + curr_map =map__get (initial_map); goto add_symbol; }
@@ -913,6 +915,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, kernel_range++); ndso =dso__new (dso_name); +map__zput (curr_map);if (ndso ==NULL )return -1 ;
@@ -926,6 +929,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,map__set_mapping_type (curr_map,MAPPING_TYPE__IDENTITY );if (maps__insert (kmaps, curr_map)) { +map__zput (curr_map);dso__put (ndso);return -1 ; }
@@ -936,7 +940,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta, pos->end -= delta; } add_symbol: -if (curr_map != initial_map) { +if (!RC_CHK_EQUAL (curr_map, initial_map)) {struct dso *curr_map_dso =map__dso (curr_map);rb_erase_cached (&pos->rb_node, root);
@@ -951,12 +955,12 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,symbol__delete (pos); } -if (curr_map != initial_map && +if (!RC_CHK_EQUAL (curr_map, initial_map) && dso->kernel ==DSO_SPACE__KERNEL_GUEST &&machine__is_default_guest (maps__machine (kmaps))) {dso__set_loaded (map__dso (curr_map)); } - +map__put (curr_map);return count + moved; }
@@ -1248,7 +1252,7 @@ static bool remove_old_maps(struct map *map, void *data)* We need to preserve eBPF maps even if they are covered by kcore, * because we need to access eBPF dso for source data. */ -return RC_CHK_ACCESS (map) !=RC_CHK_ACCESS (map_to_save) && !__map__is_bpf_prog (map); +return !RC_CHK_EQUAL (map, map_to_save) && !__map__is_bpf_prog (map); } static int dso__load_kcore(struct dso *dso, struct map *map,
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 31/53 perf maps: Get map before returning in maps__find_next_entry
In reply to Ian RogersFinding a map is done under a lock, returning the map without a reference count means it can be removed without notice and causing uses after free. Grab a reference count to the map within the lock region and return this. Fix up locations that need a map__put following this.
--- tools/perf/util/machine.c | 4 +++- tools/perf/util/maps.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
tools/perf/util/machine.c +3 -1
@@ -1758,8 +1758,10 @@ int machine__create_kernel_maps(struct machine *machine)struct map *next =maps__find_next_entry (machine__kernel_maps (machine),machine__kernel_map (machine)); -if (next) +if (next) {machine__set_kernel_mmap (machine, start,map__start (next)); +map__put (next); + } } out_put:
tools/perf/util/maps.c +1 -1
@@ -942,7 +942,7 @@ struct map *maps__find_next_entry(struct maps *maps, struct map *map)down_read (maps__lock (maps)); i =maps__by_address_index (maps, map);if (i <maps__nr_maps (maps)) - result =maps__maps_by_address (maps)[i];// TODO: map__get + result =map__get (maps__maps_by_address (maps)[i]);up_read (maps__lock (maps));return result;
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 32/53 perf maps: Hide maps internals
In reply to Ian RogersMove the struct into the C file. Add maps__equal to work around exposing the struct for reference count checking. Add accessors for the unwind_libunwind_ops. Move maps_list_node to its only use in symbol.c.
--- tools/perf/tests/thread-maps-share.c | 8 +- tools/perf/util/callchain.c | 2 +- tools/perf/util/maps.c | 96 +++++++++++++++++++++++ tools/perf/util/maps.h | 97 +++--------------------- tools/perf/util/symbol.c | 10 +++ tools/perf/util/thread.c | 2 +- tools/perf/util/unwind-libunwind-local.c | 2 +- tools/perf/util/unwind-libunwind.c | 7 +- 8 files changed, 123 insertions(+), 101 deletions(-)
tools/perf/tests/thread-maps-share.c +4 -4
@@ -46,9 +46,9 @@ static int test__thread_maps_share(struct test_suite *test __maybe_unused, int sTEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (maps__refcnt (maps)),4 );/* test the maps pointer is shared */ -TEST_ASSERT_VAL ("maps don't match" ,RC_CHK_EQUAL (maps,thread__maps (t1))); -TEST_ASSERT_VAL ("maps don't match" ,RC_CHK_EQUAL (maps,thread__maps (t2))); -TEST_ASSERT_VAL ("maps don't match" ,RC_CHK_EQUAL (maps,thread__maps (t3))); +TEST_ASSERT_VAL ("maps don't match" ,maps__equal (maps,thread__maps (t1))); +TEST_ASSERT_VAL ("maps don't match" ,maps__equal (maps,thread__maps (t2))); +TEST_ASSERT_VAL ("maps don't match" ,maps__equal (maps,thread__maps (t3)));/* * Verify the other leader was created by previous call.
@@ -73,7 +73,7 @@ static int test__thread_maps_share(struct test_suite *test __maybe_unused, int s other_maps =thread__maps (other);TEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (maps__refcnt (other_maps)),2 ); -TEST_ASSERT_VAL ("maps don't match" ,RC_CHK_EQUAL (other_maps,thread__maps (other_leader))); +TEST_ASSERT_VAL ("maps don't match" ,maps__equal (other_maps,thread__maps (other_leader)));/* release thread group */ thread__put (t3);
tools/perf/util/callchain.c +1 -1
@@ -1157,7 +1157,7 @@ int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *if (al->map ==NULL ) goto out; } -if (RC_CHK_EQUAL (al->maps,machine__kernel_maps (machine))) { +if (maps__equal (al->maps,machine__kernel_maps (machine))) {if (machine__is_host (machine)) { al->cpumode =PERF_RECORD_MISC_KERNEL ; al->level ='k' ;
tools/perf/util/maps.c +96 -0
117 lines not on this page · raw message
tools/perf/util/maps.h +9 -88
125 lines not on this page · raw message
tools/perf/util/symbol.c +10 -0
@@ -63,6 +63,16 @@ struct symbol_conf symbol_conf = { .res_sample = 0, }; +struct map_list_node { +struct list_head node; +struct map *map; +}; + +static struct map_list_node *map_list_node__new (void ) +{ +return malloc (sizeof (struct map_list_node )); +} +static enum dso_binary_type binary_type_symtab[] = {DSO_BINARY_TYPE__KALLSYMS ,DSO_BINARY_TYPE__GUEST_KALLSYMS ,
tools/perf/util/thread.c +1 -1
@@ -383,7 +383,7 @@ static int thread__clone_maps(struct thread *thread, struct thread *parent, boolif (thread__pid (thread) ==thread__pid (parent))return thread__prepare_access (thread); -if (RC_CHK_EQUAL (thread__maps (thread),thread__maps (parent))) { +if (maps__equal (thread__maps (thread),thread__maps (parent))) {pr_debug ("broken map groups on thread %d/%d parent %d/%d\n" ,thread__pid (thread),thread__tid (thread),thread__pid (parent),thread__tid (parent));
tools/perf/util/unwind-libunwind-local.c +1 -1
@@ -706,7 +706,7 @@ static int _unwind__prepare_access(struct maps *maps) {void *addr_space =unw_create_addr_space (&accessors,0 ); -RC_CHK_ACCESS (maps)->addr_space = addr_space; +maps__set_addr_space (maps, addr_space);if (!addr_space) {pr_err ("unwind: Can't create unwind address space.\n" );return -ENOMEM ;
tools/perf/util/unwind-libunwind.c +1 -6
@@ -12,11 +12,6 @@ struct unwind_libunwind_ops __weak *local_unwind_libunwind_ops;struct unwind_libunwind_ops __weak *x86_32_unwind_libunwind_ops;struct unwind_libunwind_ops __weak *arm64_unwind_libunwind_ops; -static void unwind__register_ops (struct maps *maps,struct unwind_libunwind_ops *ops) -{ -RC_CHK_ACCESS (maps)->unwind_libunwind_ops = ops; -} -int unwind__prepare_access (struct maps *maps,struct map *map,bool *initialized) {const char *arch;
@@ -60,7 +55,7 @@ int unwind__prepare_access(struct maps *maps, struct map *map, bool *initializedreturn 0 ; } out_register: -unwind__register_ops (maps, ops); +maps__set_unwind_libunwind_ops (maps, ops); err =maps__unwind_libunwind_ops (maps)->prepare_access (maps);if (initialized)
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 33/53 perf maps: Locking tidy up of nr_maps
In reply to Ian RogersAfter this change maps__nr_maps is only used by tests, existing users are migrated to maps__empty. Compute maps__empty under the read lock.
--- tools/perf/util/machine.c | 2 +- tools/perf/util/maps.c | 10 ++++++++-- tools/perf/util/maps.h | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-)
tools/perf/util/machine.c +1 -1
@@ -441,7 +441,7 @@ static struct thread *findnew_guest_code(struct machine *machine,return NULL ;/* Assume maps are set up if there are any */ -if (maps__nr_maps (thread__maps (thread))) +if (!maps__empty (thread__maps (thread)))return thread; host_thread =machine__find_thread (host_machine,-1 , pid);
tools/perf/util/maps.c +8 -2
@@ -528,7 +528,13 @@ void maps__remove(struct maps *maps, struct map *map)bool maps__empty (struct maps *maps) { -return maps__nr_maps (maps) ==0 ; +bool res; + +down_read (maps__lock (maps)); + res =maps__nr_maps (maps) ==0 ; +up_read (maps__lock (maps)); + +return res; }bool maps__equal (struct maps *a,struct maps *b)
@@ -851,7 +857,7 @@ int maps__copy_from(struct maps *dest, struct maps *parent) parent_maps_by_address =maps__maps_by_address (parent); n =maps__nr_maps (parent); -if (maps__empty (dest)) { +if (maps__nr_maps (dest) ==0 ) {/* No existing mappings so just copy from parent to avoid reallocs in insert. */ unsigned int nr_maps_allocated =RC_CHK_ACCESS (parent)->nr_maps_allocated; struct map **dest_maps_by_address =
tools/perf/util/maps.h +2 -2
@@ -43,8 +43,8 @@ int maps__for_each_map(struct maps *maps, int (*cb)(struct map *map, void *data)void maps__remove_maps (struct maps *maps,bool (*cb)(struct map *map,void *data),void *data);struct machine *maps__machine (const struct maps *maps); -unsigned int maps__nr_maps (const struct maps *maps); -refcount_t *maps__refcnt (struct maps *maps); +unsigned int maps__nr_maps (const struct maps *maps);/* Test only. */ +refcount_t *maps__refcnt (struct maps *maps);/* Test only. */ #ifdef HAVE_LIBUNWIND_SUPPORT void *maps__addr_space (const struct maps *maps);
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 34/53 perf dso: Reorder variables to save space in struct dso
In reply to Ian RogersSave 40 bytes and move from 8 to 7 cache lines. Make variable dwfl dependent on being a powerpc build. Squeeze bits of int/enum types when appropriate. Remove holes/padding by reordering variables.
Before:
```
struct dso {
struct mutex lock; /* 0 40 */
struct list_head node; /* 40 16 */
struct rb_node rb_node __attribute__((__aligned__(8))); /* 56 24 */
/* --- cacheline 1 boundary (64 bytes) was 16 bytes ago --- */
struct rb_root * root; /* 80 8 */
struct rb_root_cached symbols; /* 88 16 */
struct symbol * * symbol_names; /* 104 8 */
size_t symbol_names_len; /* 112 8 */
struct rb_root_cached inlined_nodes; /* 120 16 */
/* --- cacheline 2 boundary (128 bytes) was 8 bytes ago --- */
struct rb_root_cached srclines; /* 136 16 */
struct {
u64 addr; /* 152 8 */
struct symbol * symbol; /* 160 8 */
} last_find_result; /* 152 16 */
void * a2l; /* 168 8 */
char * symsrc_filename; /* 176 8 */
unsigned int a2l_fails; /* 184 4 */
enum dso_space_type kernel; /* 188 4 */
/* --- cacheline 3 boundary (192 bytes) --- */
_Bool is_kmod; /* 192 1 */
/* XXX 3 bytes hole, try to pack */
enum dso_swap_type needs_swap; /* 196 4 */
enum dso_binary_type symtab_type; /* 200 4 */
enum dso_binary_type binary_type; /* 204 4 */
enum dso_load_errno load_errno; /* 208 4 */
u8 adjust_symbols:1; /* 212: 0 1 */
u8 has_build_id:1; /* 212: 1 1 */
u8 header_build_id:1; /* 212: 2 1 */
u8 has_srcline:1; /* 212: 3 1 */
u8 hit:1; /* 212: 4 1 */
u8 annotate_warned:1; /* 212: 5 1 */
u8 auxtrace_warned:1; /* 212: 6 1 */
u8 short_name_allocated:1; /* 212: 7 1 */
u8 long_name_allocated:1; /* 213: 0 1 */
u8 is_64_bit:1; /* 213: 1 1 */
/* XXX 6 bits hole, try to pack */
_Bool sorted_by_name; /* 214 1 */
_Bool loaded; /* 215 1 */
u8 rel; /* 216 1 */
/* XXX 7 bytes hole, try to pack */
struct build_id bid; /* 224 32 */
/* --- cacheline 4 boundary (256 bytes) --- */
u64 text_offset; /* 256 8 */
u64 text_end; /* 264 8 */
const char * short_name; /* 272 8 */
const char * long_name; /* 280 8 */
u16 long_name_len; /* 288 2 */
u16 short_name_len; /* 290 2 */
/* XXX 4 bytes hole, try to pack */
void * dwfl; /* 296 8 */
struct auxtrace_cache * auxtrace_cache; /* 304 8 */
int comp; /* 312 4 */
/* XXX 4 bytes hole, try to pack */
/* --- cacheline 5 boundary (320 bytes) --- */
struct {
struct rb_root cache; /* 320 8 */
int fd; /* 328 4 */
int status; /* 332 4 */
u32 status_seen; /* 336 4 */
/* XXX 4 bytes hole, try to pack */
u64 file_size; /* 344 8 */
struct list_head open_entry; /* 352 16 */
u64 elf_base_addr; /* 368 8 */
u64 debug_frame_offset; /* 376 8 */
/* --- cacheline 6 boundary (384 bytes) --- */
u64 eh_frame_hdr_addr; /* 384 8 */
u64 eh_frame_hdr_offset; /* 392 8 */
} data; /* 320 80 */
struct {
u32 id; /* 400 4 */
u32 sub_id; /* 404 4 */
struct perf_env * env; /* 408 8 */
} bpf_prog; /* 400 16 */
union {
void * priv; /* 416 8 */
u64 db_id; /* 416 8 */
}; /* 416 8 */
struct nsinfo * nsinfo; /* 424 8 */
struct dso_id id; /* 432 24 */
/* --- cacheline 7 boundary (448 bytes) was 8 bytes ago --- */
refcount_t refcnt; /* 456 4 */
char name[]; /* 460 0 */
/* size: 464, cachelines: 8, members: 49 */
/* sum members: 440, holes: 4, sum holes: 18 */
/* sum bitfield members: 10 bits, bit holes: 1, sum bit holes: 6 bits */
/* padding: 4 */
/* forced alignments: 1 */
/* last cacheline: 16 bytes */
} __attribute__((__aligned__(8)));
```After:
```
struct dso {
struct mutex lock; /* 0 40 */
struct list_head node; /* 40 16 */
struct rb_node rb_node __attribute__((__aligned__(8))); /* 56 24 */
/* --- cacheline 1 boundary (64 bytes) was 16 bytes ago --- */
struct rb_root * root; /* 80 8 */
struct rb_root_cached symbols; /* 88 16 */
struct symbol * * symbol_names; /* 104 8 */
size_t symbol_names_len; /* 112 8 */
struct rb_root_cached inlined_nodes; /* 120 16 */
/* --- cacheline 2 boundary (128 bytes) was 8 bytes ago --- */
struct rb_root_cached srclines; /* 136 16 */
struct {
u64 addr; /* 152 8 */
struct symbol * symbol; /* 160 8 */
} last_find_result; /* 152 16 */
struct build_id bid; /* 168 32 */
/* --- cacheline 3 boundary (192 bytes) was 8 bytes ago --- */
u64 text_offset; /* 200 8 */
u64 text_end; /* 208 8 */
const char * short_name; /* 216 8 */
const char * long_name; /* 224 8 */
void * a2l; /* 232 8 */
char * symsrc_filename; /* 240 8 */
struct nsinfo * nsinfo; /* 248 8 */
/* --- cacheline 4 boundary (256 bytes) --- */
struct auxtrace_cache * auxtrace_cache; /* 256 8 */
union {
void * priv; /* 264 8 */
u64 db_id; /* 264 8 */
}; /* 264 8 */
struct {
struct perf_env * env; /* 272 8 */
u32 id; /* 280 4 */
u32 sub_id; /* 284 4 */
} bpf_prog; /* 272 16 */
struct {
struct rb_root cache; /* 288 8 */
struct list_head open_entry; /* 296 16 */
u64 file_size; /* 312 8 */
/* --- cacheline 5 boundary (320 bytes) --- */
u64 elf_base_addr; /* 320 8 */
u64 debug_frame_offset; /* 328 8 */
u64 eh_frame_hdr_addr; /* 336 8 */
u64 eh_frame_hdr_offset; /* 344 8 */
int fd; /* 352 4 */
int status; /* 356 4 */
u32 status_seen; /* 360 4 */
} data; /* 288 80 */
/* XXX last struct has 4 bytes of padding */
struct dso_id id; /* 368 24 */
/* --- cacheline 6 boundary (384 bytes) was 8 bytes ago --- */
unsigned int a2l_fails; /* 392 4 */
int comp; /* 396 4 */
refcount_t refcnt; /* 400 4 */
enum dso_load_errno load_errno; /* 404 4 */
u16 long_name_len; /* 408 2 */
u16 short_name_len; /* 410 2 */
enum dso_binary_type symtab_type:8; /* 412: 0 4 */
enum dso_binary_type binary_type:8; /* 412: 8 4 */
enum dso_space_type kernel:2; /* 412:16 4 */
enum dso_swap_type needs_swap:2; /* 412:18 4 */
/* Bitfield combined with next fields */
_Bool is_kmod:1; /* 414: 4 1 */
u8 adjust_symbols:1; /* 414: 5 1 */
u8 has_build_id:1; /* 414: 6 1 */
u8 header_build_id:1; /* 414: 7 1 */
u8 has_srcline:1; /* 415: 0 1 */
u8 hit:1; /* 415: 1 1 */
u8 annotate_warned:1; /* 415: 2 1 */
u8 auxtrace_warned:1; /* 415: 3 1 */
u8 short_name_allocated:1; /* 415: 4 1 */
u8 long_name_allocated:1; /* 415: 5 1 */
u8 is_64_bit:1; /* 415: 6 1 */
/* XXX 1 bit hole, try to pack */
_Bool sorted_by_name; /* 416 1 */
_Bool loaded; /* 417 1 */
u8 rel; /* 418 1 */
char name[]; /* 419 0 */
/* size: 424, cachelines: 7, members: 48 */
/* sum members: 415 */
/* sum bitfield members: 31 bits, bit holes: 1, sum bit holes: 1 bits */
/* padding: 5 */
/* paddings: 1, sum paddings: 4 */
/* forced alignments: 1 */
/* last cacheline: 40 bytes */
} __attribute__((__aligned__(8)));
```--- tools/perf/util/dso.h | 84 +++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 42 deletions(-)
tools/perf/util/dso.h +42 -42
@@ -158,66 +158,66 @@ struct dso {u64 addr;struct symbol *symbol; } last_find_result; -void *a2l; -char *symsrc_filename; -unsigned int a2l_fails; -enum dso_space_type kernel; -bool is_kmod; -enum dso_swap_type needs_swap; -enum dso_binary_type symtab_type; -enum dso_binary_type binary_type; -enum dso_load_errno load_errno; - u8 adjust_symbols:1; - u8 has_build_id:1; - u8 header_build_id:1; - u8 has_srcline:1; - u8 hit:1; - u8 annotate_warned:1; - u8 auxtrace_warned:1; - u8 short_name_allocated:1; - u8 long_name_allocated:1; - u8 is_64_bit:1; -bool sorted_by_name; -bool loaded; -u8 rel;struct build_id bid;u64 text_offset;u64 text_end;const char *short_name;const char *long_name; -u16 long_name_len; -u16 short_name_len; +void *a2l; +char *symsrc_filename; +#if defined(__powerpc__)void *dwfl;/* DWARF debug info */ +#endif +struct nsinfo *nsinfo;struct auxtrace_cache *auxtrace_cache; -int comp; - +union {/* Tool specific area */ +void *priv; +u64 db_id; + }; +/* bpf prog information */ +struct { +struct perf_env *env; +u32 id; +u32 sub_id; + } bpf_prog;/* dso data file */ struct {struct rb_root cache; -int fd; -int status; -u32 status_seen; -u64 file_size;struct list_head open_entry; +u64 file_size;u64 elf_base_addr;u64 debug_frame_offset;u64 eh_frame_hdr_addr;u64 eh_frame_hdr_offset; +int fd; +int status; +u32 status_seen; } data; -/* bpf prog information */ -struct { -u32 id; -u32 sub_id; -struct perf_env *env; - } bpf_prog; - -union {/* Tool specific area */ -void *priv; -u64 db_id; - }; -struct nsinfo *nsinfo;struct dso_id id; +unsigned int a2l_fails; +int comp;refcount_t refcnt; +enum dso_load_errno load_errno; +u16 long_name_len; +u16 short_name_len; + enum dso_binary_type symtab_type:8; + enum dso_binary_type binary_type:8; + enum dso_space_type kernel:2; + enum dso_swap_type needs_swap:2; + bool is_kmod:1; + u8 adjust_symbols:1; + u8 has_build_id:1; + u8 header_build_id:1; + u8 has_srcline:1; + u8 hit:1; + u8 annotate_warned:1; + u8 auxtrace_warned:1; + u8 short_name_allocated:1; + u8 long_name_allocated:1; + u8 is_64_bit:1; +bool sorted_by_name; +bool loaded; +u8 rel;char name[]; };
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 35/53 perf report: Sort child tasks by tid
In reply to Ian RogersCommit 91e467bc568f ("perf machine: Use hashtable for machine threads") made the iteration of thread tids unordered. The perf report --tasks output now shows child threads in an order determined by the hashing. For example, in this snippet tid 3 appears after tid 256 even though they have the same ppid 2:
```
$ perf report --tasks
% pid tid ppid comm
0 0 -1 |swapper
2 2 0 | kthreadd
256 256 2 | kworker/12:1H-k
693761 693761 2 | kworker/10:1-mm
1301762 1301762 2 | kworker/1:1-mm_
1302530 1302530 2 | kworker/u32:0-k
3 3 2 | rcu_gp
...
```The output is easier to read if threads appear numerically increasing. To allow for this, read all threads into a list then sort with a comparator that orders by the child task's of the first common parent. The list creation and deletion are created as utilities on machine. The indentation is possible by counting the number of parents a child has.
With this change the output for the same data file is now like:
```
$ perf report --tasks
% pid tid ppid comm
0 0 -1 |swapper
1 1 0 | systemd
823 823 1 | systemd-journal
853 853 1 | systemd-udevd
3230 3230 1 | systemd-timesyn
3236 3236 1 | auditd
3239 3239 3236 | audisp-syslog
3321 3321 1 | accounts-daemon
...
```--- tools/perf/builtin-report.c | 203 ++++++++++++++++++++---------------- tools/perf/util/machine.c | 30 ++++++ tools/perf/util/machine.h | 10 ++ 3 files changed, 155 insertions(+), 88 deletions(-)
tools/perf/builtin-report.c +115 -88
@@ -59,6 +59,7 @@#include <linux/ctype.h> #include <signal.h> #include <linux/bitmap.h> +#include <linux/list_sort.h> #include <linux/string.h> #include <linux/stringify.h> #include <linux/time64.h>
@@ -830,35 +831,6 @@ static void tasks_setup(struct report *rep) rep->tool.no_warn = true; } -struct task { -struct thread *thread; -struct list_head list; -struct list_head children; -}; - -static struct task *tasks_list (struct task *task,struct machine *machine) -{ -struct thread *parent_thread, *thread = task->thread; -struct task *parent_task; - -/* Already listed. */ -if (!list_empty (&task->list)) -return NULL ; - -/* Last one in the chain. */ -if (thread__ppid (thread) ==-1 ) -return task; - - parent_thread =machine__find_thread (machine,-1 ,thread__ppid (thread)); -if (!parent_thread) -return ERR_PTR (-ENOENT ); - - parent_task =thread__priv (parent_thread); -thread__put (parent_thread); -list_add_tail (&task->list, &parent_task->children); -return tasks_list (parent_task, machine); -} -struct maps__fprintf_task_args {int indent;FILE *fp;
@@ -902,89 +874,144 @@ static size_t maps__fprintf_task(struct maps *maps, int indent, FILE *fp)return args.printed; } -static void task__print_level (struct task *task,FILE *fp,int level) +static int thread_level (struct machine *machine,const struct thread *thread) { -struct thread *thread = task->thread; -struct task *child; -int comm_indent =fprintf (fp," %8d %8d %8d |%*s" , -thread__pid (thread),thread__tid (thread), -thread__ppid (thread), level,"" ); +struct thread *parent_thread; +int res; -fprintf (fp,"%s\n" ,thread__comm_str (thread)); +if (thread__tid (thread) <=0 ) +return 0 ; -maps__fprintf_task (thread__maps (thread), comm_indent, fp); +if (thread__ppid (thread) <=0 ) +return 1 ; -if (!list_empty (&task->children)) { -list_for_each_entry (child, &task->children, list) -task__print_level (child, fp, level +1 ); + parent_thread =machine__find_thread (machine,-1 ,thread__ppid (thread)); +if (!parent_thread) { +pr_err ("Missing parent thread of %d\n" ,thread__tid (thread)); +return 0 ; } + res =1 +thread_level (machine, parent_thread); +thread__put (parent_thread); +return res; } -static int tasks_print (struct report *rep,FILE *fp) +static void task__print_level (struct machine *machine,struct thread *thread,FILE *fp) { -struct perf_session *session = rep->session; -struct machine *machine = &session->machines.host; -struct task *tasks, *task; -unsigned int nr =0 , itask =0 , i; -struct rb_node *nd; -LIST_HEAD (list); +int level =thread_level (machine, thread); +int comm_indent =fprintf (fp," %8d %8d %8d |%*s" , +thread__pid (thread),thread__tid (thread), +thread__ppid (thread), level,"" ); -/* -* No locking needed while accessing machine->threads, -* because --tasks is single threaded command. -*/ +fprintf (fp,"%s\n" ,thread__comm_str (thread)); -/* Count all the threads. */ -for (i =0 ; i <THREADS__TABLE_SIZE ; i++) - nr += machine->threads[i].nr; +maps__fprintf_task (thread__maps (thread), comm_indent, fp); +} - tasks =malloc (sizeof (*tasks) * nr); -if (!tasks) -return -ENOMEM ; +static int task_list_cmp (void *priv,const struct list_head *la,const struct list_head *lb) +{ +struct machine *machine = priv; + struct thread_list *task_a = list_entry(la, struct thread_list, list); + struct thread_list *task_b = list_entry(lb, struct thread_list, list); +struct thread *a = task_a->thread; +struct thread *b = task_b->thread; +int level_a, level_b, res; + +/* Compare a and b to root. */ +if (thread__tid (a) ==thread__tid (b)) +return 0 ; -for (i =0 ; i <THREADS__TABLE_SIZE ; i++) { -struct threads *threads = &machine->threads[i]; +if (thread__tid (a) ==0 ) +return -1 ; -for (nd =rb_first_cached (&threads->entries); nd; - nd =rb_next (nd)) { - task = tasks + itask++; +if (thread__tid (b) ==0 ) +return 1 ; - task->thread = rb_entry(nd, struct thread_rb_node, rb_node)->thread; -INIT_LIST_HEAD (&task->children); -INIT_LIST_HEAD (&task->list); -thread__set_priv (task->thread, task); - } +/* If parents match sort by tid. */ +if (thread__ppid (a) ==thread__ppid (b)) { +return thread__tid (a) <thread__tid (b) + ?-1 + : (thread__tid (a) >thread__tid (b) ?1 :0 ); }/* -* Iterate every task down to the unprocessed parent -* and link all in task children list. Task with no -* parent is added into 'list'. +* Find a and b such that if they are a child of each other a and b's +* tid's match, otherwise a and b have a common parent and distinct +* tid's to sort by. First make the depths of the threads match. */ -for (itask =0 ; itask < nr; itask++) { - task = tasks + itask; - -if (!list_empty (&task->list)) -continue ; - - task =tasks_list (task, machine); -if (IS_ERR (task)) { -pr_err ("Error: failed to process tasks\n" ); -free (tasks); -return PTR_ERR (task); + level_a =thread_level (machine, a); + level_b =thread_level (machine, b); + a =thread__get (a); + b =thread__get (b); +for (int i = level_a; i > level_b; i--) { +struct thread *parent =machine__find_thread (machine,-1 ,thread__ppid (a)); + +thread__put (a); +if (!parent) { +pr_err ("Missing parent thread of %d\n" ,thread__tid (a)); +thread__put (b); +return -1 ; } + a = parent; + } +for (int i = level_b; i > level_a; i--) { +struct thread *parent =machine__find_thread (machine,-1 ,thread__ppid (b)); -if (task) -list_add_tail (&task->list, &list); +thread__put (b); +if (!parent) { +pr_err ("Missing parent thread of %d\n" ,thread__tid (b)); +thread__put (a); +return 1 ; + } + b = parent; + } +/* Search up to a common parent. */ +while (thread__ppid (a) !=thread__ppid (b)) { +struct thread *parent; + + parent =machine__find_thread (machine,-1 ,thread__ppid (a)); +thread__put (a); +if (!parent) +pr_err ("Missing parent thread of %d\n" ,thread__tid (a)); + a = parent; + parent =machine__find_thread (machine,-1 ,thread__ppid (b)); +thread__put (b); +if (!parent) +pr_err ("Missing parent thread of %d\n" ,thread__tid (b)); + b = parent; +if (!a || !b) +return !a && !b ?0 : (!a ?-1 :1 ); + } +if (thread__tid (a) ==thread__tid (b)) { +/* a is a child of b or vice-versa, deeper levels appear later. */ + res = level_a < level_b ?-1 : (level_a > level_b ?1 :0 ); + }else { +/* Sort by tid now the parent is the same. */ + res =thread__tid (a) <thread__tid (b) ?-1 :1 ; } +thread__put (a); +thread__put (b); +return res; +} + +static int tasks_print (struct report *rep,FILE *fp) +{ +struct machine *machine = &rep->session->machines.host; +LIST_HEAD (tasks); +int ret; -fprintf (fp,"# %8s %8s %8s %s\n" ,"pid" ,"tid" ,"ppid" ,"comm" ); + ret =machine__thread_list (machine, &tasks); +if (!ret) { +struct thread_list *task; -list_for_each_entry (task, &list, list) -task__print_level (task, fp,0 ); +list_sort (machine, &tasks, task_list_cmp); -free (tasks); -return 0 ; +fprintf (fp,"# %8s %8s %8s %s\n" ,"pid" ,"tid" ,"ppid" ,"comm" ); + +list_for_each_entry (task, &tasks, list) +task__print_level (machine, task->thread, fp); + } +thread_list__delete (&tasks); +return ret; }static int __cmd_report (struct report *rep)
tools/perf/util/machine.c +30 -0
@@ -3258,6 +3258,36 @@ int machines__for_each_thread(struct machines *machines,return rc; } + +static int thread_list_cb (struct thread *thread,void *data) +{ +struct list_head *list = data; +struct thread_list *entry =malloc (sizeof (*entry)); + +if (!entry) +return -ENOMEM ; + + entry->thread =thread__get (thread); +list_add_tail (&entry->list, list); +return 0 ; +} + +int machine__thread_list (struct machine *machine,struct list_head *list) +{ +return machine__for_each_thread (machine, thread_list_cb, list); +} + +void thread_list__delete (struct list_head *list) +{ +struct thread_list *pos, *next; + +list_for_each_entry_safe (pos, next, list, list) { +thread__zput (pos->thread); +list_del (&pos->list); +free (pos); + } +} +pid_t machine__get_current_tid (struct machine *machine,int cpu) {if (cpu <0 || (size_t )cpu >= machine->current_tid_sz)
tools/perf/util/machine.h +10 -0
@@ -280,6 +280,16 @@ int machines__for_each_thread(struct machines *machines,int (*fn)(struct thread *thread,void *p), void *priv); +struct thread_list { +struct list_head list; +struct thread *thread; +}; + +/* Make a list of struct thread_list based on threads in the machine. */ +int machine__thread_list (struct machine *machine,struct list_head *list); +/* Free up the nodes within the thread_list list. */ +void thread_list__delete (struct list_head *list); +pid_t machine__get_current_tid (struct machine *machine,int cpu);int machine__set_current_tid (struct machine *machine,int cpu,pid_t pid,pid_t tid);
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 36/53 perf trace: Ignore thread hashing in summary
In reply to Ian RogersCommit 91e467bc568f ("perf machine: Use hashtable for machine threads") made the iteration of thread tids unordered. The perf trace --summary output sorts and prints each hash bucket, rather than all threads globally. Change this behavior by turn all threads into a list, sort the list by number of trace events then by tids, finally print the list. This also allows the rbtree in threads to be not accessed outside of machine.
--- tools/perf/builtin-trace.c | 41 +++++++++++++++++++++---------------- tools/perf/util/rb_resort.h | 5 ----- 2 files changed, 23 insertions(+), 23 deletions(-)
tools/perf/builtin-trace.c +23 -18
@@ -74,6 +74,7 @@#include <linux/err.h> #include <linux/filter.h> #include <linux/kernel.h> +#include <linux/list_sort.h> #include <linux/random.h> #include <linux/stringify.h> #include <linux/time64.h>
@@ -4314,34 +4315,38 @@ static unsigned long thread__nr_events(struct thread_trace *ttrace)return ttrace ? ttrace->nr_events :0 ; } -DEFINE_RESORT_RB (threads, - (thread__nr_events (thread__priv (a->thread)) < -thread__nr_events (thread__priv (b->thread))), - struct thread *thread; -) +static int trace_nr_events_cmp (void *priv__maybe_unused , +const struct list_head *la, +const struct list_head *lb) { - entry->thread = rb_entry(nd, struct thread_rb_node, rb_node)->thread; + struct thread_list *a = list_entry(la, struct thread_list, list); + struct thread_list *b = list_entry(lb, struct thread_list, list); +unsigned long a_nr_events =thread__nr_events (thread__priv (a->thread)); +unsigned long b_nr_events =thread__nr_events (thread__priv (b->thread)); + +if (a_nr_events != b_nr_events) +return a_nr_events < b_nr_events ?-1 :1 ; + +/* Identical number of threads, place smaller tids first. */ +return thread__tid (a->thread) <thread__tid (b->thread) + ?-1 + : (thread__tid (a->thread) >thread__tid (b->thread) ?1 :0 ); }static size_t trace__fprintf_thread_summary (struct trace *trace,FILE *fp) {size_t printed =trace__fprintf_threads_header (fp); -struct rb_node *nd; -int i; - -for (i =0 ; i <THREADS__TABLE_SIZE ; i++) { -DECLARE_RESORT_RB_MACHINE_THREADS (threads, trace->host, i); +LIST_HEAD (threads); -if (threads ==NULL ) { -fprintf (fp,"%s" ,"Error sorting output by nr_events!\n" ); -return 0 ; - } +if (machine__thread_list (trace->host, &threads) ==0 ) { +struct thread_list *pos; -resort_rb__for_each_entry (nd, threads) - printed +=trace__fprintf_thread (fp, threads_entry->thread, trace); +list_sort (NULL , &threads, trace_nr_events_cmp); -resort_rb__delete (threads); +list_for_each_entry (pos, &threads, list) + printed +=trace__fprintf_thread (fp, pos->thread, trace); } +thread_list__delete (&threads);return printed; }
tools/perf/util/rb_resort.h +0 -5
@@ -143,9 +143,4 @@ struct __name##_sorted *__name = __name##_sorted__newDECLARE_RESORT_RB (__name)(&__ilist->rblist.entries.rb_root, \ __ilist->rblist.nr_entries) -/* For 'struct machine->threads' */ -#define DECLARE_RESORT_RB_MACHINE_THREADS (__name, __machine, hash_bucket) \ - DECLARE_RESORT_RB(__name)(&__machine->threads[hash_bucket].entries.rb_root, \ - __machine->threads[hash_bucket].nr) -#endif /* _PERF_RESORT_RB_H_ */
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 37/53 perf machine: Move fprintf to for_each loop and a callback
In reply to Ian RogersAvoid exposing the threads data structure by switching to the callback machine__for_each_thread approach. machine__fprintf is only used in tests and verbose >3 output so don't turn to list and sort. Add machine__threads_nr to be refactored later.
Note, all existing *_fprintf routines ignore fprintf errors.
--- tools/perf/util/machine.c | 43 ++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 16 deletions(-)
tools/perf/util/machine.c +27 -16
@@ -1114,29 +1114,40 @@ size_t machine__fprintf_vmlinux_path(struct machine *machine, FILE *fp)return printed; } -size_t machine__fprintf (struct machine *machine,FILE *fp) +struct machine_fprintf_cb_args { +FILE *fp; +size_t printed; +}; + +static int machine_fprintf_cb (struct thread *thread,void *data) { -struct rb_node *nd; -size_t ret; -int i; +struct machine_fprintf_cb_args *args = data; -for (i =0 ; i <THREADS__TABLE_SIZE ; i++) { -struct threads *threads = &machine->threads[i]; +/* TODO: handle fprintf errors. */ + args->printed +=thread__fprintf (thread, args->fp); +return 0 ; +} -down_read (&threads->lock); +static size_t machine__threads_nr (const struct machine *machine) +{ +size_t nr =0 ; - ret =fprintf (fp,"Threads: %u\n" , threads->nr); +for (int i =0 ; i <THREADS__TABLE_SIZE ; i++) + nr += machine->threads[i].nr; -for (nd =rb_first_cached (&threads->entries); nd; - nd =rb_next (nd)) { - struct thread *pos = rb_entry(nd, struct thread_rb_node, rb_node)->thread; +return nr; +} - ret +=thread__fprintf (pos, fp); - } +size_t machine__fprintf (struct machine *machine,FILE *fp) +{ +struct machine_fprintf_cb_args args = { + .fp = fp, + .printed =0 , + }; +size_t ret =fprintf (fp,"Threads: %zu\n" ,machine__threads_nr (machine)); -up_read (&threads->lock); - } -return ret; +machine__for_each_thread (machine, machine_fprintf_cb, &args); +return ret + args.printed; }static struct dso *machine__get_kernel (struct machine *machine)
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 38/53 perf threads: Move threads to its own files
In reply to Ian RogersMove threads out of machine and move thread_rb_node into the C file. This hides the implementation of threads from the rest of the code allowing for it to be refactored.
Locking discipline is tightened up in this change.
--- tools/perf/util/Build | 1 + tools/perf/util/bpf_lock_contention.c | 8 +- tools/perf/util/machine.c | 287 ++++---------------------- tools/perf/util/machine.h | 20 +- tools/perf/util/thread.c | 2 +- tools/perf/util/thread.h | 6 - tools/perf/util/threads.c | 244 ++++++++++++++++++++++ tools/perf/util/threads.h | 35 ++++ 8 files changed, 325 insertions(+), 278 deletions(-) create mode 100644 tools/perf/util/threads.c create mode 100644 tools/perf/util/threads.h
tools/perf/util/Build +1 -0
@@ -71,6 +71,7 @@ perf-y += ordered-events.o perf-y += namespaces.o perf-y += comm.o perf-y += thread.o +perf-y += threads.o perf-y += thread_map.o perf-y += parse-events-flex.o perf-y += parse-events-bison.o
tools/perf/util/bpf_lock_contention.c +4 -4
@@ -209,7 +209,7 @@ static const char *lock_contention_get_name(struct lock_contention *con,/* do not update idle comm which contains CPU number */ if (pid) { -struct thread *t =__machine__findnew_thread (machine,/*pid=*/ -1 , pid); +struct thread *t =machine__findnew_thread (machine,/*pid=*/ -1 , pid);if (t ==NULL )return name;
@@ -301,9 +301,9 @@ int lock_contention_read(struct lock_contention *con)return -1 ;if (con->aggr_mode ==LOCK_AGGR_TASK ) { -struct thread *idle =__machine__findnew_thread (machine, -/*pid=*/ 0 , -/*tid=*/ 0 ); +struct thread *idle =machine__findnew_thread (machine, +/*pid=*/ 0 , +/*tid=*/ 0 );thread__set_comm (idle,"swapper" ,/*timestamp=*/ 0 ); }
tools/perf/util/machine.c +38 -249
377 lines not on this page · raw message
tools/perf/util/machine.h +2 -18
@@ -7,6 +7,7 @@#include "maps.h" #include "dsos.h" #include "rwsem.h" +#include "threads.h" struct addr_location ;struct branch_stack ;
@@ -28,16 +29,6 @@ extern const char *ref_reloc_sym_names[];struct vdso_info ; -#define THREADS__TABLE_BITS 8 -#define THREADS__TABLE_SIZE (1 << THREADS__TABLE_BITS) - -struct threads { -struct rb_root_cached entries; -struct rw_semaphore lock; -unsigned int nr; -struct thread *last_match; -}; -struct machine {struct rb_node rb_node;pid_t pid;
@@ -48,7 +39,7 @@ struct machine {char *root_dir;char *mmap_name;char *kallsyms_filename; -struct threads threads[THREADS__TABLE_SIZE ]; +struct threads threads;struct vdso_info *vdso_info;struct perf_env *env;struct dsos dsos;
@@ -69,12 +60,6 @@ struct machine {bool trampolines_mapped; }; -static inline struct threads *machine__threads (struct machine *machine,pid_t tid) -{ -/* Cast it to handle tid == -1 */ -return &machine->threads[(unsigned int )tid %THREADS__TABLE_SIZE ]; -} -/* * The main kernel (vmlinux) map */
@@ -220,7 +205,6 @@ bool machine__is(struct machine *machine, const char *arch);bool machine__normalized_is (struct machine *machine,const char *arch);int machine__nr_cpus_avail (struct machine *machine); -struct thread *__machine__findnew_thread (struct machine *machine,pid_t pid,pid_t tid);struct thread *machine__findnew_thread (struct machine *machine,pid_t pid,pid_t tid);struct dso *machine__findnew_dso_id (struct machine *machine,const char *filename,struct dso_id *id);
tools/perf/util/thread.c +1 -1
@@ -26,7 +26,7 @@ int thread__init_maps(struct thread *thread, struct machine *machine)if (pid ==thread__tid (thread) || pid ==-1 ) {thread__set_maps (thread,maps__new (machine)); }else { -struct thread *leader =__machine__findnew_thread (machine, pid, pid); +struct thread *leader =machine__findnew_thread (machine, pid, pid);if (leader) {thread__set_maps (thread,maps__get (thread__maps (leader)));
tools/perf/util/thread.h +0 -6
@@ -3,7 +3,6 @@#define __PERF_THREAD_H#include <linux/refcount.h> -#include <linux/rbtree.h> #include <linux/list.h> #include <stdio.h> #include <unistd.h>
@@ -30,11 +29,6 @@ struct lbr_stitch {struct callchain_cursor_node *prev_lbr_cursor; }; -struct thread_rb_node { -struct rb_node rb_node; -struct thread *thread; -}; -DECLARE_RC_STRUCT (thread) {/** @maps: mmaps associated with this thread. */ struct maps *maps;
tools/perf/util/threads.c new file +244 -0
244 lines not on this page · raw message
tools/perf/util/threads.h new file +35 -0
@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __PERF_THREADS_H +#define __PERF_THREADS_H + +#include <linux/rbtree.h> +#include "rwsem.h" + +struct thread ; + +#define THREADS__TABLE_BITS 8 +#define THREADS__TABLE_SIZE (1 << THREADS__TABLE_BITS) + +struct threads_table_entry { +struct rb_root_cached entries; +struct rw_semaphore lock; +unsigned int nr; +struct thread *last_match; +}; + +struct threads { +struct threads_table_entry table[THREADS__TABLE_SIZE ]; +}; + +void threads__init (struct threads *threads); +void threads__exit (struct threads *threads); +size_t threads__nr (struct threads *threads); +struct thread *threads__find (struct threads *threads,pid_t tid); +struct thread *threads__findnew (struct threads *threads,pid_t pid,pid_t tid,bool *created); +void threads__remove_all_threads (struct threads *threads); +void threads__remove (struct threads *threads,struct thread *thread); +int threads__for_each_thread (struct threads *threads, +int (*fn)(struct thread *thread,void *data), +void *data); + +#endif /* __PERF_THREADS_H */
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 39/53 perf threads: Switch from rbtree to hashmap
In reply to Ian RogersThe rbtree provides a sorting on entries but this is unused. Switch to using hashmap for O(1) rather than O(log n) find/insert/remove complexity.
--- tools/perf/util/threads.c | 146 ++++++++++++-------------------------- tools/perf/util/threads.h | 6 +- 2 files changed, 47 insertions(+), 105 deletions(-)
tools/perf/util/threads.c +44 -102
@@ -3,25 +3,30 @@#include "machine.h" #include "thread.h" -struct thread_rb_node { -struct rb_node rb_node; -struct thread *thread; -}; -static struct threads_table_entry *threads__table (struct threads *threads,pid_t tid) {/* Cast it to handle tid == -1 */ return &threads->table[(unsigned int )tid %THREADS__TABLE_SIZE ]; } +static size_t key_hash (long key,void *ctx__maybe_unused ) +{ +/* The table lookup removes low bit entropy, but this is just ignored here. */ +return key; +} + +static bool key_equal (long key1,long key2,void *ctx__maybe_unused ) +{ +return key1 == key2; +} +void threads__init (struct threads *threads) {for (int i =0 ; i <THREADS__TABLE_SIZE ; i++) {struct threads_table_entry *table = &threads->table[i]; - table->entries =RB_ROOT_CACHED ; +hashmap__init (&table->shard, key_hash, key_equal,NULL );init_rwsem (&table->lock); - table->nr =0 ; table->last_match =NULL ; } }
@@ -32,6 +37,7 @@ void threads__exit(struct threads *threads)for (int i =0 ; i <THREADS__TABLE_SIZE ; i++) {struct threads_table_entry *table = &threads->table[i]; +hashmap__clear (&table->shard);exit_rwsem (&table->lock); } }
@@ -44,7 +50,7 @@ size_t threads__nr(struct threads *threads)struct threads_table_entry *table = &threads->table[i];down_read (&table->lock); - nr += table->nr; + nr +=hashmap__size (&table->shard);up_read (&table->lock); }return nr;
@@ -86,28 +92,13 @@ static void threads_table_entry__set_last_match(struct threads_table_entry *tablstruct thread *threads__find (struct threads *threads,pid_t tid) {struct threads_table_entry *table =threads__table (threads, tid); -struct rb_node **p; -struct thread *res =NULL ; +struct thread *res;down_read (&table->lock); res =__threads_table_entry__get_last_match (table, tid); -if (res) -return res; - - p = &table->entries.rb_root.rb_node; -while (*p !=NULL ) { -struct rb_node *parent = *p; - struct thread *th = rb_entry(parent, struct thread_rb_node, rb_node)->thread; - -if (thread__tid (th) == tid) { - res =thread__get (th); -break ; - } - -if (tid <thread__tid (th)) - p = &(*p)->rb_left; -else - p = &(*p)->rb_right; +if (!res) { +if (hashmap__find (&table->shard, tid, &res)) + res =thread__get (res); }up_read (&table->lock);if (res)
@@ -118,49 +109,25 @@ struct thread *threads__find(struct threads *threads, pid_t tid)struct thread *threads__findnew (struct threads *threads,pid_t pid,pid_t tid,bool *created) {struct threads_table_entry *table =threads__table (threads, tid); -struct rb_node **p; -struct rb_node *parent =NULL ;struct thread *res =NULL ; -struct thread_rb_node *nd; -bool leftmost = true; *created = false;down_write (&table->lock); - p = &table->entries.rb_root.rb_node; -while (*p !=NULL ) { -struct thread *th; - - parent = *p; - th = rb_entry(parent, struct thread_rb_node, rb_node)->thread; - -if (thread__tid (th) == tid) { -__threads_table_entry__set_last_match (table, th); - res =thread__get (th); - goto out_unlock; - } - -if (tid <thread__tid (th)) - p = &(*p)->rb_left; -else { - leftmost = false; - p = &(*p)->rb_right; - } - } - nd =malloc (sizeof (*nd)); -if (nd ==NULL ) - goto out_unlock; res =thread__new (pid, tid); -if (!res) -free (nd); -else { - *created = true; - nd->thread =thread__get (res); -rb_link_node (&nd->rb_node, parent, p); -rb_insert_color_cached (&nd->rb_node, &table->entries, leftmost); - ++table->nr; -__threads_table_entry__set_last_match (table, res); +if (res) { +if (hashmap__add (&table->shard, tid, res)) { +/* Add failed. Assume a race so find other entry. */ +thread__put (res); + res =NULL ; +if (hashmap__find (&table->shard, tid, &res)) + res =thread__get (res); + }else { + res =thread__get (res); + *created = true; + } +if (res) +__threads_table_entry__set_last_match (table, res); } -out_unlock:up_write (&table->lock);return res; }
@@ -169,57 +136,32 @@ void threads__remove_all_threads(struct threads *threads) {for (int i =0 ; i <THREADS__TABLE_SIZE ; i++) {struct threads_table_entry *table = &threads->table[i]; -struct rb_node *nd; +struct hashmap_entry *cur, *tmp; +size_t bkt;down_write (&table->lock);__threads_table_entry__set_last_match (table,NULL ); - nd =rb_first_cached (&table->entries); -while (nd) { - struct thread_rb_node *trb = rb_entry(nd, struct thread_rb_node, rb_node); - - nd =rb_next (nd); -thread__put (trb->thread); -rb_erase_cached (&trb->rb_node, &table->entries); -RB_CLEAR_NODE (&trb->rb_node); - --table->nr; +hashmap__for_each_entry_safe ((&table->shard), cur, tmp, bkt) { +struct thread *old_value; -free (trb); +hashmap__delete (&table->shard, cur->key,/*old_key=*/ NULL , &old_value); +thread__put (old_value); } -assert (table->nr ==0 );up_write (&table->lock); } }void threads__remove (struct threads *threads,struct thread *thread) { -struct rb_node **p;struct threads_table_entry *table =threads__table (threads,thread__tid (thread)); -pid_t tid =thread__tid (thread); +struct thread *old_value;down_write (&table->lock);if (table->last_match &&RC_CHK_EQUAL (table->last_match, thread))__threads_table_entry__set_last_match (table,NULL ); - p = &table->entries.rb_root.rb_node; -while (*p !=NULL ) { -struct rb_node *parent = *p; - struct thread_rb_node *nd = rb_entry(parent, struct thread_rb_node, rb_node); -struct thread *th = nd->thread; - -if (RC_CHK_EQUAL (th, thread)) { -thread__put (nd->thread); -rb_erase_cached (&nd->rb_node, &table->entries); -RB_CLEAR_NODE (&nd->rb_node); - --table->nr; -free (nd); -break ; - } - -if (tid <thread__tid (th)) - p = &(*p)->rb_left; -else - p = &(*p)->rb_right; - } +hashmap__delete (&table->shard,thread__tid (thread),/*old_key=*/ NULL , &old_value); +thread__put (old_value);up_write (&table->lock); }
@@ -229,11 +171,11 @@ int threads__for_each_thread(struct threads *threads, {for (int i =0 ; i <THREADS__TABLE_SIZE ; i++) {struct threads_table_entry *table = &threads->table[i]; -struct rb_node *nd; +struct hashmap_entry *cur; +size_t bkt; -for (nd =rb_first_cached (&table->entries); nd; nd =rb_next (nd)) { - struct thread_rb_node *trb = rb_entry(nd, struct thread_rb_node, rb_node); -int rc =fn (trb->thread, data); +hashmap__for_each_entry ((&table->shard), cur, bkt) { +int rc =fn ((struct thread *)cur->pvalue, data);if (rc !=0 )return rc;
tools/perf/util/threads.h +3 -3
@@ -2,7 +2,7 @@#ifndef __PERF_THREADS_H#define __PERF_THREADS_H -#include <linux/rbtree.h> +#include "hashmap.h" #include "rwsem.h" struct thread ;
@@ -11,9 +11,9 @@ struct thread;#define THREADS__TABLE_SIZE (1 << THREADS__TABLE_BITS)struct threads_table_entry { -struct rb_root_cached entries; +/* Key is tid, value is struct thread. */ +struct hashmap shard;struct rw_semaphore lock; -unsigned int nr;struct thread *last_match; };
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 40/53 perf threads: Reduce table size from 256 to 8
In reply to Ian RogersThe threads data structure is an array of hashmaps, previously rbtrees. The two levels allows for a fixed outer array where access is guarded by rw_semaphores. Commit 91e467bc568f ("perf machine: Use hashtable for machine threads") sized the outer table at 256 entries to avoid future scalability problems, however, this means the threads struct is sized at 30,720 bytes. As the hashmaps allow O(1) access for the common find/insert/remove operations, lower the number of entries to 8. This reduces the size overhead to 960 bytes.
--- tools/perf/util/threads.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/threads.h +1 -1
@@ -7,7 +7,7 @@struct thread ; -#define THREADS__TABLE_BITS 8 +#define THREADS__TABLE_BITS 3#define THREADS__TABLE_SIZE (1 << THREADS__TABLE_BITS)struct threads_table_entry {
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 41/53 perf dsos: Attempt to better abstract dsos internals
In reply to Ian RogersMove functions from machine and build-id to dsos. Pass dsos struct rather than internal state. Rename some functions to better represent which data structure they operate on.
--- tools/perf/builtin-inject.c | 2 +- tools/perf/builtin-record.c | 2 +- tools/perf/util/build-id.c | 38 +--------------------------- tools/perf/util/build-id.h | 2 -- tools/perf/util/dso.h | 6 ----- tools/perf/util/dsos.c | 49 ++++++++++++++++++++++++++++++++++--- tools/perf/util/dsos.h | 19 +++++++++++--- tools/perf/util/machine.c | 40 ++++++------------------------ tools/perf/util/machine.h | 2 ++ tools/perf/util/session.c | 21 ++++++++++++++++ tools/perf/util/session.h | 2 ++ 11 files changed, 97 insertions(+), 86 deletions(-)
tools/perf/builtin-inject.c +1 -1
@@ -2122,7 +2122,7 @@ static int __cmd_inject(struct perf_inject *inject)*/ if (perf_header__has_feat (&session->header,HEADER_BUILD_ID ) && inject->have_auxtrace && !inject->itrace_synth_opts.set) -dsos__hit_all (session); +perf_session__dsos_hit_all (session);/* * The AUX areas have been removed and replaced with * synthesized hardware events, so clear the feature flag.
tools/perf/builtin-record.c +1 -1
@@ -1787,7 +1787,7 @@ record__finish_output(struct record *rec)process_buildids (rec);if (rec->buildid_all) -dsos__hit_all (rec->session); +perf_session__dsos_hit_all (rec->session); }perf_session__write_header (rec->session, rec->evlist, fd, true);
tools/perf/util/build-id.c +1 -37
@@ -390,42 +390,6 @@ int perf_session__write_buildid_table(struct perf_session *session,return err; } -static int __dsos__hit_all (struct list_head *head) -{ -struct dso *pos; - -list_for_each_entry (pos, head, node) - pos->hit = true; - -return 0 ; -} - -static int machine__hit_all_dsos (struct machine *machine) -{ -return __dsos__hit_all (&machine->dsos.head); -} - -int dsos__hit_all (struct perf_session *session) -{ -struct rb_node *nd; -int err; - - err =machine__hit_all_dsos (&session->machines.host); -if (err) -return err; - -for (nd =rb_first_cached (&session->machines.guests); nd; - nd =rb_next (nd)) { - struct machine *pos = rb_entry(nd, struct machine, rb_node); - - err =machine__hit_all_dsos (pos); -if (err) -return err; - } - -return 0 ; -} -void disable_buildid_cache (void ) { no_buildid_cache = true;
@@ -992,7 +956,7 @@ int perf_session__cache_build_ids(struct perf_session *session)static bool machine__read_build_ids (struct machine *machine,bool with_hits) { -return __dsos__read_build_ids (&machine->dsos.head, with_hits); +return __dsos__read_build_ids (&machine->dsos, with_hits); }bool perf_session__read_build_ids (struct perf_session *session,bool with_hits)
tools/perf/util/build-id.h +0 -2
@@ -39,8 +39,6 @@ int build_id__mark_dso_hit(struct perf_tool *tool, union perf_event *event, struct perf_sample *sample, struct evsel *evsel, struct machine *machine); -int dsos__hit_all (struct perf_session *session); -int perf_event__inject_buildid (struct perf_tool *tool,union perf_event *event,struct perf_sample *sample,struct evsel *evsel,struct machine *machine);
tools/perf/util/dso.h +0 -6
@@ -230,12 +230,6 @@ struct dso {#define dso__for_each_symbol (dso, pos, n) \ symbols__for_each_entry(&(dso)->symbols, pos, n) -#define dsos__for_each_with_build_id (pos, head) \ - list_for_each_entry(pos, head, node) \ - if (!pos->has_build_id) \ - continue; \ - else -static inline void dso__set_loaded (struct dso *dso) { dso->loaded = true;
tools/perf/util/dsos.c +46 -3
80 lines not on this page · raw message
tools/perf/util/dsos.h +15 -4
@@ -21,6 +21,15 @@ struct dsos {struct rw_semaphore lock; }; +#define dsos__for_each_with_build_id (pos, head) \ + list_for_each_entry(pos, head, node) \ + if (!pos->has_build_id) \ + continue; \ + else + +void dsos__init (struct dsos *dsos); +void dsos__exit (struct dsos *dsos); +void __dsos__add (struct dsos *dsos,struct dso *dso);void dsos__add (struct dsos *dsos,struct dso *dso);struct dso *__dsos__addnew (struct dsos *dsos,const char *name);
@@ -28,13 +37,15 @@ struct dso *__dsos__find(struct dsos *dsos, const char *name, bool cmp_short);struct dso *dsos__findnew_id (struct dsos *dsos,const char *name,struct dso_id *id); +bool __dsos__read_build_ids (struct dsos *dsos,bool with_hits); +struct dso *__dsos__findnew_link_by_longname_id (struct rb_root *root,struct dso *dso,const char *name,struct dso_id *id); -bool __dsos__read_build_ids (struct list_head *head,bool with_hits); - -size_t __dsos__fprintf_buildid (struct list_head *head,FILE *fp, +size_t __dsos__fprintf_buildid (struct dsos *dsos,FILE *fp,bool (skip )(struct dso *dso,int parm),int parm); -size_t __dsos__fprintf (struct list_head *head,FILE *fp); +size_t __dsos__fprintf (struct dsos *dsos,FILE *fp); + +int __dsos__hit_all (struct dsos *dsos);#endif /* __PERF_DSOS */
tools/perf/util/machine.c +8 -32
@@ -49,13 +49,6 @@ static struct dso *machine__kernel_dso(struct machine *machine)return map__dso (machine->vmlinux_map); } -static void dsos__init (struct dsos *dsos) -{ -INIT_LIST_HEAD (&dsos->head); - dsos->root =RB_ROOT ; -init_rwsem (&dsos->lock); -} -static int machine__set_mmap_name (struct machine *machine) {if (machine__is_host (machine))
@@ -166,28 +159,6 @@ struct machine *machine__new_kallsyms(void)return machine; } -static void dsos__purge (struct dsos *dsos) -{ -struct dso *pos, *n; - -down_write (&dsos->lock); - -list_for_each_entry_safe (pos, n, &dsos->head, node) { -RB_CLEAR_NODE (&pos->rb_node); - pos->root =NULL ; -list_del_init (&pos->node); -dso__put (pos); - } - -up_write (&dsos->lock); -} - -static void dsos__exit (struct dsos *dsos) -{ -dsos__purge (dsos); -exit_rwsem (&dsos->lock); -} -void machine__delete_threads (struct machine *machine) {threads__remove_all_threads (&machine->threads);
@@ -907,11 +878,11 @@ static struct map *machine__addnew_module_map(struct machine *machine, u64 startsize_t machines__fprintf_dsos (struct machines *machines,FILE *fp) {struct rb_node *nd; -size_t ret =__dsos__fprintf (&machines->host.dsos.head, fp); +size_t ret =__dsos__fprintf (&machines->host.dsos, fp);for (nd =rb_first_cached (&machines->guests); nd; nd =rb_next (nd)) { struct machine *pos = rb_entry(nd, struct machine, rb_node); - ret +=__dsos__fprintf (&pos->dsos.head, fp); + ret +=__dsos__fprintf (&pos->dsos, fp); }return ret;
@@ -920,7 +891,7 @@ size_t machines__fprintf_dsos(struct machines *machines, FILE *fp)size_t machine__fprintf_dsos_buildid (struct machine *m,FILE *fp,bool (skip )(struct dso *dso,int parm),int parm) { -return __dsos__fprintf_buildid (&m->dsos.head, fp, skip, parm); +return __dsos__fprintf_buildid (&m->dsos, fp, skip, parm); } size_t machines__fprintf_dsos_buildid(struct machines *machines, FILE *fp,
@@ -3278,3 +3249,8 @@ bool machine__is_lock_function(struct machine *machine, u64 addr)return false; } + +int machine__hit_all_dsos (struct machine *machine) +{ +return __dsos__hit_all (&machine->dsos); +}
tools/perf/util/machine.h +2 -0
@@ -306,4 +306,6 @@ int machine__map_x86_64_entry_trampolines(struct machine *machine,int machine__resolve (struct machine *machine,struct addr_location *al,struct perf_sample *sample); +int machine__hit_all_dsos (struct machine *machine); +#endif /* __PERF_MACHINE_H */
tools/perf/util/session.c +21 -0
@@ -2895,3 +2895,24 @@ int perf_event__process_id_index(struct perf_session *session, }return 0 ; } + +int perf_session__dsos_hit_all (struct perf_session *session) +{ +struct rb_node *nd; +int err; + + err =machine__hit_all_dsos (&session->machines.host); +if (err) +return err; + +for (nd =rb_first_cached (&session->machines.guests); nd; + nd =rb_next (nd)) { + struct machine *pos = rb_entry(nd, struct machine, rb_node); + + err =machine__hit_all_dsos (pos); +if (err) +return err; + } + +return 0 ; +}
tools/perf/util/session.h +2 -0
@@ -154,6 +154,8 @@ int perf_session__deliver_synth_event(struct perf_session *session,union perf_event *event, struct perf_sample *sample); +int perf_session__dsos_hit_all (struct perf_session *session); +int perf_event__process_id_index (struct perf_session *session,union perf_event *event);
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 42/53 perf dsos: Tidy reference counting and locking
In reply to Ian RogersMove more functionality into dsos.c generally from machine, renaming functions to match their new usage. The find function is made to always "get" before returning a dso. Reduce the scope of locks in vdso to match the locking paradigm.
--- tools/perf/util/dsos.c | 73 +++++++++++++++++++++++++++++++++++---- tools/perf/util/dsos.h | 9 ++++- tools/perf/util/machine.c | 62 ++------------------------------- tools/perf/util/map.c | 4 +-- tools/perf/util/vdso.c | 48 +++++++++++-------------- 5 files changed, 97 insertions(+), 99 deletions(-)
tools/perf/util/dsos.c +66 -7
@@ -181,7 +181,7 @@ struct dso *__dsos__findnew_link_by_longname_id(struct rb_root *root, struct dso* at the end of the list of duplicates. */ if (!dso || (dso == this)) -return this;/* Find matching dso */ +return dso__get (this);/* Find matching dso */ /* * The core kernel DSOs may have duplicated long name. * In this case, the short name should be different.
@@ -253,15 +253,20 @@ static struct dso *__dsos__find_id(struct dsos *dsos, const char *name, struct dif (cmp_short) {list_for_each_entry (pos, &dsos->head, node)if (__dso__cmp_short_name (name, id, pos) ==0 ) -return pos; +return dso__get (pos);return NULL ; }return __dsos__findnew_by_longname_id (&dsos->root, name, id); } -struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short) +struct dso *dsos__find (struct dsos *dsos,const char *name,bool cmp_short) { -return __dsos__find_id (dsos, name,NULL , cmp_short); +struct dso *res; + +down_read (&dsos->lock); + res =__dsos__find_id (dsos, name,NULL , cmp_short); +up_read (&dsos->lock); +return res; }static void dso__set_basename (struct dso *dso)
@@ -303,8 +308,6 @@ static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, structif (dso !=NULL ) {__dsos__add (dsos, dso);dso__set_basename (dso); -/* Put dso here because __dsos_add already got it */ -dso__put (dso); }return dso; }
@@ -328,7 +331,7 @@ struct dso *dsos__findnew_id(struct dsos *dsos, const char *name, struct dso_id {struct dso *dso;down_write (&dsos->lock); - dso =dso__get (__dsos__findnew_id (dsos, name, id)); + dso =__dsos__findnew_id (dsos, name, id);up_write (&dsos->lock);return dso; }
@@ -374,3 +377,59 @@ int __dsos__hit_all(struct dsos *dsos)return 0 ; } + +struct dso *dsos__findnew_module_dso (struct dsos *dsos, +struct machine *machine, +struct kmod_path *m, +const char *filename) +{ +struct dso *dso; + +down_write (&dsos->lock); + + dso =__dsos__find_id (dsos, m->name,NULL ,/*cmp_short=*/ true); +if (!dso) { + dso =__dsos__addnew (dsos, m->name); +if (dso ==NULL ) + goto out_unlock; + +dso__set_module_info (dso, m, machine); +dso__set_long_name (dso,strdup (filename), true); + dso->kernel =DSO_SPACE__KERNEL ; + } + +out_unlock: +up_write (&dsos->lock); +return dso; +} + +struct dso *dsos__find_kernel_dso (struct dsos *dsos) +{ +struct dso *dso, *res =NULL ; + +down_read (&dsos->lock); +list_for_each_entry (dso, &dsos->head, node) { +/* +* The cpumode passed to is_kernel_module is not the cpumode of +* *this* event. If we insist on passing correct cpumode to +* is_kernel_module, we should record the cpumode when we adding +* this dso to the linked list. +* +* However we don't really need passing correct cpumode. We +* know the correct cpumode must be kernel mode (if not, we +* should not link it onto kernel_dsos list). +* +* Therefore, we pass PERF_RECORD_MISC_CPUMODE_UNKNOWN. +* is_kernel_module() treats it as a kernel cpumode. +*/ +if (!dso->kernel || +is_kernel_module (dso->long_name, +PERF_RECORD_MISC_CPUMODE_UNKNOWN )) +continue ; + + res =dso__get (dso); +break ; + } +up_read (&dsos->lock); +return res; +}
tools/perf/util/dsos.h +8 -1
@@ -10,6 +10,8 @@struct dso ;struct dso_id ; +struct kmod_path ; +struct machine ;/* * DSOs are put into both a list for fast iteration and rbtree for fast
@@ -33,7 +35,7 @@ void dsos__exit(struct dsos *dsos);void __dsos__add (struct dsos *dsos,struct dso *dso);void dsos__add (struct dsos *dsos,struct dso *dso);struct dso *__dsos__addnew (struct dsos *dsos,const char *name); -struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short); +struct dso *dsos__find (struct dsos *dsos,const char *name,bool cmp_short);struct dso *dsos__findnew_id (struct dsos *dsos,const char *name,struct dso_id *id);
@@ -48,4 +50,9 @@ size_t __dsos__fprintf(struct dsos *dsos, FILE *fp);int __dsos__hit_all (struct dsos *dsos); +struct dso *dsos__findnew_module_dso (struct dsos *dsos,struct machine *machine, +struct kmod_path *m,const char *filename); + +struct dso *dsos__find_kernel_dso (struct dsos *dsos); +#endif /* __PERF_DSOS */
tools/perf/util/machine.c +2 -60
80 lines not on this page · raw message
tools/perf/util/map.c +1 -3
@@ -196,9 +196,7 @@ struct map *map__new(struct machine *machine, u64 start, u64 len,* reading the header will have the build ID set and all future mmaps will * have it missing. */ -down_read (&machine->dsos.lock); - header_bid_dso =__dsos__find (&machine->dsos, filename, false); -up_read (&machine->dsos.lock); + header_bid_dso =dsos__find (&machine->dsos, filename, false);if (header_bid_dso && header_bid_dso->header_build_id) {dso__set_build_id (dso, &header_bid_dso->bid); dso->header_build_id =1 ;
tools/perf/util/vdso.c +20 -28
103 lines not on this page · raw message
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 43/53 perf dsos: Add dsos__for_each_dso
In reply to Ian RogersTo better abstract the dsos internals, add dsos__for_each_dso that does a callback on each dso. This also means the read lock can be correctly held.
--- tools/perf/builtin-inject.c | 25 +++++++----- tools/perf/util/build-id.c | 76 ++++++++++++++++++++----------------- tools/perf/util/dsos.c | 16 ++++++++ tools/perf/util/dsos.h | 8 +--- tools/perf/util/machine.c | 40 +++++++++++-------- 5 files changed, 100 insertions(+), 65 deletions(-)
tools/perf/builtin-inject.c +15 -10
@@ -1187,23 +1187,28 @@ static int synthesize_build_id(struct perf_inject *inject, struct dso *dso, pid_ process_build_id, machine); } +static int guest_session__add_build_ids_cb (struct dso *dso,void *data) +{ +struct guest_session *gs = data; + struct perf_inject *inject = container_of(gs, struct perf_inject, guest_session); + +if (!dso->has_build_id) +return 0 ; + +return synthesize_build_id (inject, dso, gs->machine_pid); + +} +static int guest_session__add_build_ids (struct guest_session *gs) { struct perf_inject *inject = container_of(gs, struct perf_inject, guest_session); -struct machine *machine = &gs->session->machines.host; -struct dso *dso; -int ret;/* Build IDs will be put in the Build ID feature section */ perf_header__set_feat (&inject->session->header,HEADER_BUILD_ID ); -dsos__for_each_with_build_id (dso, &machine->dsos.head) { - ret =synthesize_build_id (inject, dso, gs->machine_pid); -if (ret) -return ret; - } - -return 0 ; +return dsos__for_each_dso (&gs->session->machines.host.dsos, + guest_session__add_build_ids_cb, + gs); } static int guest_session__ksymbol_event(struct perf_tool *tool,
tools/perf/util/build-id.c +42 -34
90 lines not on this page · raw message
tools/perf/util/dsos.c +16 -0
@@ -433,3 +433,19 @@ struct dso *dsos__find_kernel_dso(struct dsos *dsos)up_read (&dsos->lock);return res; } + +int dsos__for_each_dso (struct dsos *dsos,int (*cb)(struct dso *dso,void *data),void *data) +{ +struct dso *dso; + +down_read (&dsos->lock); +list_for_each_entry (dso, &dsos->head, node) { +int err; + + err =cb (dso, data); +if (err) +return err; + } +up_read (&dsos->lock); +return 0 ; +}
tools/perf/util/dsos.h +2 -6
@@ -23,12 +23,6 @@ struct dsos {struct rw_semaphore lock; }; -#define dsos__for_each_with_build_id (pos, head) \ - list_for_each_entry(pos, head, node) \ - if (!pos->has_build_id) \ - continue; \ - else -void dsos__init (struct dsos *dsos);void dsos__exit (struct dsos *dsos);
@@ -55,4 +49,6 @@ struct dso *dsos__findnew_module_dso(struct dsos *dsos, struct machine *machine,struct dso *dsos__find_kernel_dso (struct dsos *dsos); +int dsos__for_each_dso (struct dsos *dsos,int (*cb)(struct dso *dso,void *data),void *data); +#endif /* __PERF_DSOS */
tools/perf/util/machine.c +25 -15
@@ -1558,16 +1558,14 @@ int machine__create_kernel_maps(struct machine *machine)return ret; } -static bool machine__uses_kcore (struct machine *machine) +static int machine__uses_kcore_cb (struct dso *dso,void *data__maybe_unused ) { -struct dso *dso; - -list_for_each_entry (dso, &machine->dsos.head, node) { -if (dso__is_kcore (dso)) -return true; - } +return dso__is_kcore (dso) ?1 :0 ; +} -return false; +static bool machine__uses_kcore (struct machine *machine) +{ +return dsos__for_each_dso (&machine->dsos, machine__uses_kcore_cb,NULL ) !=0 ? true : false; } static bool perf_event__is_extra_kernel_mmap(struct machine *machine,
@@ -3133,16 +3131,28 @@ char *machine__resolve_kernel_addr(void *vmachine, unsigned long long *addrp, chreturn sym->name; } +struct machine__for_each_dso_cb_args { +struct machine *machine; +machine__dso_t fn; +void *priv; +}; + +static int machine__for_each_dso_cb (struct dso *dso,void *data) +{ +struct machine__for_each_dso_cb_args *args = data; + +return args->fn (dso, args->machine, args->priv); +} +int machine__for_each_dso (struct machine *machine,machine__dso_t fn,void *priv) { -struct dso *pos; -int err =0 ; +struct machine__for_each_dso_cb_args args = { + .machine = machine, + .fn = fn, + .priv = priv, + }; -list_for_each_entry (pos, &machine->dsos.head, node) { -if (fn (pos, machine, priv)) - err =-1 ; - } -return err; +return dsos__for_each_dso (&machine->dsos, machine__for_each_dso_cb, &args); }int machine__for_each_kernel_map (struct machine *machine,machine__map_t fn,void *priv)
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 44/53 perf dso: Move dso functions out of dsos
In reply to Ian RogersMove dso and dso_id functions to dso.c to match the struct declarations.
--- tools/perf/util/dso.c | 61 ++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/dso.h | 4 +++ tools/perf/util/dsos.c | 61 ------------------------------------------ 3 files changed, 65 insertions(+), 61 deletions(-)
tools/perf/util/dso.c +61 -0
@@ -1268,6 +1268,67 @@ static void dso__set_long_name_id(struct dso *dso, const char *name, struct dso___dsos__findnew_link_by_longname_id (root, dso,NULL , id); } +static int __dso_id__cmp (struct dso_id *a,struct dso_id *b) +{ +if (a->maj > b->maj)return -1 ; +if (a->maj < b->maj)return 1 ; + +if (a->min > b->min)return -1 ; +if (a->min < b->min)return 1 ; + +if (a->ino > b->ino)return -1 ; +if (a->ino < b->ino)return 1 ; + +/* +* Synthesized MMAP events have zero ino_generation, avoid comparing +* them with MMAP events with actual ino_generation. +* +* I found it harmful because the mismatch resulted in a new +* dso that did not have a build ID whereas the original dso did have a +* build ID. The build ID was essential because the object was not found +* otherwise. - Adrian +*/ +if (a->ino_generation && b->ino_generation) { +if (a->ino_generation > b->ino_generation)return -1 ; +if (a->ino_generation < b->ino_generation)return 1 ; + } + +return 0 ; +} + +bool dso_id__empty (struct dso_id *id) +{ +if (!id) +return true; + +return !id->maj && !id->min && !id->ino && !id->ino_generation; +} + +void dso__inject_id (struct dso *dso,struct dso_id *id) +{ + dso->id.maj = id->maj; + dso->id.min = id->min; + dso->id.ino = id->ino; + dso->id.ino_generation = id->ino_generation; +} + +int dso_id__cmp (struct dso_id *a,struct dso_id *b) +{ +/* +* The second is always dso->id, so zeroes if not set, assume passing +* NULL for a means a zeroed id +*/ +if (dso_id__empty (a) ||dso_id__empty (b)) +return 0 ; + +return __dso_id__cmp (a, b); +} + +int dso__cmp_id (struct dso *a,struct dso *b) +{ +return __dso_id__cmp (&a->id, &b->id); +} +void dso__set_long_name (struct dso *dso,const char *name,bool name_allocated) {dso__set_long_name_id (dso, name,NULL , name_allocated);
tools/perf/util/dso.h +4 -0
@@ -235,6 +235,9 @@ static inline void dso__set_loaded(struct dso *dso) dso->loaded = true; } +int dso_id__cmp (struct dso_id *a,struct dso_id *b); +bool dso_id__empty (struct dso_id *id); +struct dso *dso__new_id (const char *name,struct dso_id *id);struct dso *dso__new (const char *name);void dso__delete (struct dso *dso);
@@ -242,6 +245,7 @@ void dso__delete(struct dso *dso);int dso__cmp_id (struct dso *a,struct dso *b);void dso__set_short_name (struct dso *dso,const char *name,bool name_allocated);void dso__set_long_name (struct dso *dso,const char *name,bool name_allocated); +void dso__inject_id (struct dso *dso,struct dso_id *id);int dso__name_len (const struct dso *dso);
tools/perf/util/dsos.c +0 -61
67 lines not on this page · raw message
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 45/53 perf dsos: Switch more loops to dsos__for_each_dso
In reply to Ian RogersSwitch loops within dsos.c, add a version that isn't locked. Switch some unlocked loops to hold the read lock.
--- tools/perf/util/build-id.c | 2 +- tools/perf/util/dsos.c | 258 ++++++++++++++++++++++++------------- tools/perf/util/dsos.h | 8 +- tools/perf/util/machine.c | 8 +- 4 files changed, 174 insertions(+), 102 deletions(-)
tools/perf/util/build-id.c +1 -1
@@ -964,7 +964,7 @@ int perf_session__cache_build_ids(struct perf_session *session)static bool machine__read_build_ids (struct machine *machine,bool with_hits) { -return __dsos__read_build_ids (&machine->dsos, with_hits); +return dsos__read_build_ids (&machine->dsos, with_hits); }bool perf_session__read_build_ids (struct perf_session *session,bool with_hits)
tools/perf/util/dsos.c +165 -93
323 lines not on this page · raw message
tools/perf/util/dsos.h +4 -4
@@ -33,16 +33,16 @@ struct dso *dsos__find(struct dsos *dsos, const char *name, bool cmp_short);struct dso *dsos__findnew_id (struct dsos *dsos,const char *name,struct dso_id *id); -bool __dsos__read_build_ids (struct dsos *dsos,bool with_hits); +bool dsos__read_build_ids (struct dsos *dsos,bool with_hits);struct dso *__dsos__findnew_link_by_longname_id (struct rb_root *root,struct dso *dso,const char *name,struct dso_id *id); -size_t __dsos__fprintf_buildid (struct dsos *dsos,FILE *fp, +size_t dsos__fprintf_buildid (struct dsos *dsos,FILE *fp,bool (skip )(struct dso *dso,int parm),int parm); -size_t __dsos__fprintf (struct dsos *dsos,FILE *fp); +size_t dsos__fprintf (struct dsos *dsos,FILE *fp); -int __dsos__hit_all (struct dsos *dsos); +int dsos__hit_all (struct dsos *dsos);struct dso *dsos__findnew_module_dso (struct dsos *dsos,struct machine *machine,struct kmod_path *m,const char *filename);
tools/perf/util/machine.c +4 -4
@@ -853,11 +853,11 @@ static struct map *machine__addnew_module_map(struct machine *machine, u64 startsize_t machines__fprintf_dsos (struct machines *machines,FILE *fp) {struct rb_node *nd; -size_t ret =__dsos__fprintf (&machines->host.dsos, fp); +size_t ret =dsos__fprintf (&machines->host.dsos, fp);for (nd =rb_first_cached (&machines->guests); nd; nd =rb_next (nd)) { struct machine *pos = rb_entry(nd, struct machine, rb_node); - ret +=__dsos__fprintf (&pos->dsos, fp); + ret +=dsos__fprintf (&pos->dsos, fp); }return ret;
@@ -866,7 +866,7 @@ size_t machines__fprintf_dsos(struct machines *machines, FILE *fp)size_t machine__fprintf_dsos_buildid (struct machine *m,FILE *fp,bool (skip )(struct dso *dso,int parm),int parm) { -return __dsos__fprintf_buildid (&m->dsos, fp, skip, parm); +return dsos__fprintf_buildid (&m->dsos, fp, skip, parm); } size_t machines__fprintf_dsos_buildid(struct machines *machines, FILE *fp,
@@ -3204,5 +3204,5 @@ bool machine__is_lock_function(struct machine *machine, u64 addr)int machine__hit_all_dsos (struct machine *machine) { -return __dsos__hit_all (&machine->dsos); +return dsos__hit_all (&machine->dsos); }
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 46/53 perf dsos: Switch backing storage to array from rbtree/list
In reply to Ian RogersDSOs were held on a list for fast iteration and in an rbtree for fast finds. Switch to using a lazily sorted array where iteration is just iterating through the array and binary searches are the same complexity as searching the rbtree. The find may need to sort the array first which does increase the complexity, but add operations have lower complexity and overall the complexity should remain about the same.
The set name operations on the dso just records that the array is no longer sorted, avoiding complexity in rebalancing the rbtree. Tighter locking discipline is enforced to avoid the array being resorted while long and short names or ids are changed.
The array is smaller in size, replacing 6 pointers with 2, and so even with extra allocated space in the array, the array may be 50% unoccupied, the memory saving should be at least 2x.
--- tools/perf/util/dso.c | 67 +++++++++------ tools/perf/util/dso.h | 10 +-- tools/perf/util/dsos.c | 188 ++++++++++++++++++++++++++--------------- tools/perf/util/dsos.h | 21 +++-- 4 files changed, 177 insertions(+), 109 deletions(-)
tools/perf/util/dso.c +42 -25
@@ -1240,35 +1240,35 @@ struct dso *machine__findnew_kernel(struct machine *machine, const char *name,return dso; } -static void dso__set_long_name_id (struct dso *dso,const char *name,struct dso_id *id,bool name_allocated) +static void dso__set_long_name_id (struct dso *dso,const char *name,bool name_allocated) { -struct rb_root *root = dso->root; +struct dsos *dsos = dso->dsos;if (name ==NULL )return ; -if (dso->long_name_allocated) -free ((char *)dso->long_name); - -if (root) { -rb_erase (&dso->rb_node, root); +if (dsos) {/* -* __dsos__findnew_link_by_longname_id() isn't guaranteed to -* add it back, so a clean removal is required here. +* Need to avoid re-sorting the dsos breaking by non-atomically +* renaming the dso. */ -RB_CLEAR_NODE (&dso->rb_node); - dso->root =NULL ; +down_write (&dsos->lock); } +if (dso->long_name_allocated) +free ((char *)dso->long_name); + dso->long_name = name; dso->long_name_len =strlen (name); dso->long_name_allocated = name_allocated; -if (root) -__dsos__findnew_link_by_longname_id (root, dso,NULL , id); +if (dsos) { + dsos->sorted = false; +up_write (&dsos->lock); + } } -static int __dso_id__cmp (struct dso_id *a,struct dso_id *b) +static int __dso_id__cmp (const struct dso_id *a,const struct dso_id *b) {if (a->maj > b->maj)return -1 ;if (a->maj < b->maj)return 1 ;
@@ -1296,7 +1296,7 @@ static int __dso_id__cmp(struct dso_id *a, struct dso_id *b)return 0 ; } -bool dso_id__empty (struct dso_id *id) +bool dso_id__empty (const struct dso_id *id) {if (!id)return true;
@@ -1304,15 +1304,22 @@ bool dso_id__empty(struct dso_id *id)return !id->maj && !id->min && !id->ino && !id->ino_generation; } -void dso__inject_id (struct dso *dso,struct dso_id *id) +void __dso__inject_id (struct dso *dso,struct dso_id *id) { +struct dsos *dsos = dso->dsos; + +/* dsos write lock held by caller. */ + dso->id.maj = id->maj; dso->id.min = id->min; dso->id.ino = id->ino; dso->id.ino_generation = id->ino_generation; + +if (dsos) + dsos->sorted = false; } -int dso_id__cmp (struct dso_id *a,struct dso_id *b) +int dso_id__cmp (const struct dso_id *a,const struct dso_id *b) {/* * The second is always dso->id, so zeroes if not set, assume passing
@@ -1331,20 +1338,34 @@ int dso__cmp_id(struct dso *a, struct dso *b)void dso__set_long_name (struct dso *dso,const char *name,bool name_allocated) { -dso__set_long_name_id (dso, name,NULL , name_allocated); +dso__set_long_name_id (dso, name, name_allocated); }void dso__set_short_name (struct dso *dso,const char *name,bool name_allocated) { +struct dsos *dsos = dso->dsos; +if (name ==NULL )return ; +if (dsos) { +/* +* Need to avoid re-sorting the dsos breaking by non-atomically +* renaming the dso. +*/ +down_write (&dsos->lock); + }if (dso->short_name_allocated)free ((char *)dso->short_name); dso->short_name = name; dso->short_name_len =strlen (name); dso->short_name_allocated = name_allocated; + +if (dsos) { + dsos->sorted = false; +up_write (&dsos->lock); + } }int dso__name_len (const struct dso *dso)
@@ -1380,7 +1401,7 @@ struct dso *dso__new_id(const char *name, struct dso_id *id)strcpy (dso->name, name);if (id) dso->id = *id; -dso__set_long_name_id (dso, dso->name, id, false); +dso__set_long_name_id (dso, dso->name, false);dso__set_short_name (dso, dso->name, false); dso->symbols =RB_ROOT_CACHED ; dso->symbol_names =NULL ;
@@ -1403,9 +1424,6 @@ struct dso *dso__new_id(const char *name, struct dso_id *id) dso->is_kmod =0 ; dso->needs_swap =DSO_SWAP__UNSET ; dso->comp =COMP_ID__NONE ; -RB_CLEAR_NODE (&dso->rb_node); - dso->root =NULL ; -INIT_LIST_HEAD (&dso->node);INIT_LIST_HEAD (&dso->data.open_entry);mutex_init (&dso->lock);refcount_set (&dso->refcnt,1 );
@@ -1421,9 +1439,8 @@ struct dso *dso__new(const char *name)void dso__delete (struct dso *dso) { -if (!RB_EMPTY_NODE (&dso->rb_node)) -pr_err ("DSO %s is still in rbtree when being deleted!\n" , - dso->long_name); +if (dso->dsos) +pr_err ("DSO %s is still in rbtree when being deleted!\n" , dso->long_name);/* free inlines first, as they reference symbols */ inlines__tree_delete (&dso->inlined_nodes);
tools/perf/util/dso.h +4 -6
@@ -146,9 +146,7 @@ struct auxtrace_cache;struct dso {struct mutex lock; -struct list_head node; -struct rb_node rb_node;/* rbtree node sorted by long name */ -struct rb_root *root;/* root of rbtree that rb_node is in */ +struct dsos *dsos;struct rb_root_cached symbols;struct symbol **symbol_names;size_t symbol_names_len;
@@ -235,8 +233,8 @@ static inline void dso__set_loaded(struct dso *dso) dso->loaded = true; } -int dso_id__cmp (struct dso_id *a,struct dso_id *b); -bool dso_id__empty (struct dso_id *id); +int dso_id__cmp (const struct dso_id *a,const struct dso_id *b); +bool dso_id__empty (const struct dso_id *id);struct dso *dso__new_id (const char *name,struct dso_id *id);struct dso *dso__new (const char *name);
@@ -245,7 +243,7 @@ void dso__delete(struct dso *dso);int dso__cmp_id (struct dso *a,struct dso *b);void dso__set_short_name (struct dso *dso,const char *name,bool name_allocated);void dso__set_long_name (struct dso *dso,const char *name,bool name_allocated); -void dso__inject_id (struct dso *dso,struct dso_id *id); +void __dso__inject_id (struct dso *dso,struct dso_id *id);int dso__name_len (const struct dso *dso);
tools/perf/util/dsos.c +118 -70
291 lines not on this page · raw message
tools/perf/util/dsos.h +13 -8
@@ -14,20 +14,22 @@ struct kmod_path;struct machine ;/* -* DSOs are put into both a list for fast iteration and rbtree for fast -* long name lookup. +* Collection of DSOs as an array for iteration speed, but sorted for O(n) +* lookup. */ struct dsos { -struct list_head head; -struct rb_root root;/* rbtree root sorted by long name */ struct rw_semaphore lock; +struct dso **dsos; +unsigned int cnt; +unsigned int allocated; +bool sorted; };void dsos__init (struct dsos *dsos);void dsos__exit (struct dsos *dsos); -void __dsos__add (struct dsos *dsos,struct dso *dso); -void dsos__add (struct dsos *dsos,struct dso *dso); +int __dsos__add (struct dsos *dsos,struct dso *dso); +int dsos__add (struct dsos *dsos,struct dso *dso);struct dso *__dsos__addnew (struct dsos *dsos,const char *name);struct dso *dsos__find (struct dsos *dsos,const char *name,bool cmp_short);
@@ -35,8 +37,11 @@ struct dso *dsos__findnew_id(struct dsos *dsos, const char *name, struct dso_idbool dsos__read_build_ids (struct dsos *dsos,bool with_hits); -struct dso *__dsos__findnew_link_by_longname_id (struct rb_root *root,struct dso *dso, -const char *name,struct dso_id *id); +struct dso *__dsos__findnew_link_by_longname_id (struct dsos *dsos, +struct dso *dso, +const char *name, +struct dso_id *id, +bool write_locked);size_t dsos__fprintf_buildid (struct dsos *dsos,FILE *fp,bool (skip )(struct dso *dso,int parm),int parm);
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 47/53 perf dsos: Remove __dsos__addnew
In reply to Ian RogersFunction no longer used so remove.
--- tools/perf/util/dsos.c | 5 ----- tools/perf/util/dsos.h | 1 - 2 files changed, 6 deletions(-)
tools/perf/util/dsos.c +0 -5
@@ -341,11 +341,6 @@ static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, structreturn dso; } -struct dso *__dsos__addnew (struct dsos *dsos,const char *name) -{ -return __dsos__addnew_id (dsos, name,NULL ); -} -static struct dso *__dsos__findnew_id (struct dsos *dsos,const char *name,struct dso_id *id) {struct dso *dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ true);
tools/perf/util/dsos.h +0 -1
@@ -30,7 +30,6 @@ void dsos__exit(struct dsos *dsos);int __dsos__add (struct dsos *dsos,struct dso *dso);int dsos__add (struct dsos *dsos,struct dso *dso); -struct dso *__dsos__addnew (struct dsos *dsos,const char *name);struct dso *dsos__find (struct dsos *dsos,const char *name,bool cmp_short);struct dso *dsos__findnew_id (struct dsos *dsos,const char *name,struct dso_id *id);
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 48/53 perf dsos: Remove __dsos__findnew_link_by_longname_id
In reply to Ian RogersFunction was only called in dsos.c with the dso parameter as NULL. Remove the function and specialize for the dso being NULL case removing other unused functions along the way.
--- tools/perf/util/dsos.c | 51 +++++++++--------------------------------- tools/perf/util/dsos.h | 6 ----- 2 files changed, 10 insertions(+), 47 deletions(-)
tools/perf/util/dsos.c +10 -41
@@ -119,11 +119,6 @@ static int __dso__cmp_short_name(const char *short_name, struct dso_id *id, strureturn rc ?:dso_id__cmp (id, &b->id); } -static int dso__cmp_short_name (struct dso *a,struct dso *b) -{ -return __dso__cmp_short_name (a->short_name, &a->id, b); -} -static int dsos__cmp_long_name_id_short_name (const void *va,const void *vb) {const struct dso *a = *((const struct dso **)va);
@@ -143,20 +138,21 @@ static int dsos__cmp_long_name_id_short_name(const void *va, const void *vb)* Either one of the dso or name parameter must be non-NULL or the * function will not work. */ -struct dso *__dsos__findnew_link_by_longname_id (struct dsos *dsos, -struct dso *dso, -const char *name, -struct dso_id *id, -bool write_locked) +static struct dso *__dsos__find_by_longname_id (struct dsos *dsos, +const char *name, +struct dso_id *id, +bool write_locked) {int low =0 , high = dsos->cnt -1 ;if (!dsos->sorted) {if (!write_locked) { +struct dso *dso; +up_read (&dsos->lock);down_write (&dsos->lock); - dso =__dsos__findnew_link_by_longname_id (dsos, dso, name, id, -/*write_locked=*/ true); + dso =__dsos__find_by_longname_id (dsos, name, id, +/*write_locked=*/ true);up_write (&dsos->lock);down_read (&dsos->lock);return dso;
@@ -166,9 +162,6 @@ struct dso *__dsos__findnew_link_by_longname_id(struct dsos *dsos, dsos->sorted = true; } -if (!name) - name = dso->long_name; -/* * Find node with the matching name */
@@ -178,31 +171,13 @@ struct dso *__dsos__findnew_link_by_longname_id(struct dsos *dsos,int rc =__dso__cmp_long_name (name, id, this);if (rc ==0 ) { -/* -* In case the new DSO is a duplicate of an existing -* one, print a one-time warning & put the new entry -* at the end of the list of duplicates. -*/ -if (!dso || (dso == this)) -return dso__get (this);/* Find matching dso */ -/* -* The core kernel DSOs may have duplicated long name. -* In this case, the short name should be different. -* Comparing the short names to differentiate the DSOs. -*/ - rc =dso__cmp_short_name (dso, this); -if (rc ==0 ) { -pr_err ("Duplicated dso name: %s\n" , name); -return NULL ; - } +return dso__get (this);/* Find matching dso */ }if (rc <0 ) high = mid -1 ;else low = mid +1 ; } -if (dso) -__dsos__add (dsos, dso);return NULL ; }
@@ -240,12 +215,6 @@ int dsos__add(struct dsos *dsos, struct dso *dso)return ret; } -static struct dso *__dsos__findnew_by_longname_id (struct dsos *dsos,const char *name, -struct dso_id *id,bool write_locked) -{ -return __dsos__findnew_link_by_longname_id (dsos,NULL , name, id, write_locked); -} -struct dsos__find_id_cb_args {const char *name;struct dso_id *id;
@@ -279,7 +248,7 @@ static struct dso *__dsos__find_id(struct dsos *dsos, const char *name, struct d__dsos__for_each_dso (dsos, dsos__find_id_cb, &args);return args.res; } - res =__dsos__findnew_by_longname_id (dsos, name, id, write_locked); + res =__dsos__find_by_longname_id (dsos, name, id, write_locked);return res; }
tools/perf/util/dsos.h +0 -6
@@ -36,12 +36,6 @@ struct dso *dsos__findnew_id(struct dsos *dsos, const char *name, struct dso_idbool dsos__read_build_ids (struct dsos *dsos,bool with_hits); -struct dso *__dsos__findnew_link_by_longname_id (struct dsos *dsos, -struct dso *dso, -const char *name, -struct dso_id *id, -bool write_locked); -size_t dsos__fprintf_buildid (struct dsos *dsos,FILE *fp,bool (skip )(struct dso *dso,int parm),int parm);size_t dsos__fprintf (struct dsos *dsos,FILE *fp);
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 49/53 perf dsos: Switch hand code to bsearch
In reply to Ian RogersSwitch to using the bsearch library function rather than having a hand written binary search. Const-ify some static functions to avoid compiler warnings.
--- tools/perf/util/dsos.c | 46 +++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 19 deletions(-)
tools/perf/util/dsos.c +27 -19
@@ -107,13 +107,15 @@ bool dsos__read_build_ids(struct dsos *dsos, bool with_hits)return args.have_build_id; } -static int __dso__cmp_long_name (const char *long_name,struct dso_id *id,struct dso *b) +static int __dso__cmp_long_name (const char *long_name,const struct dso_id *id, +const struct dso *b) {int rc =strcmp (long_name, b->long_name);return rc ?:dso_id__cmp (id, &b->id); } -static int __dso__cmp_short_name (const char *short_name,struct dso_id *id,struct dso *b) +static int __dso__cmp_short_name (const char *short_name,const struct dso_id *id, +const struct dso *b) {int rc =strcmp (short_name, b->short_name);return rc ?:dso_id__cmp (id, &b->id);
@@ -133,6 +135,19 @@ static int dsos__cmp_long_name_id_short_name(const void *va, const void *vb)return rc; } +struct dsos__key { +const char *long_name; +const struct dso_id *id; +}; + +static int dsos__cmp_key_long_name_id (const void *vkey,const void *vdso) +{ +const struct dsos__key *key = vkey; +const struct dso *dso = *((const struct dso **)vdso); + +return __dso__cmp_long_name (key->long_name, key->id, dso); +} +/* * Find a matching entry and/or link current entry to RB tree. * Either one of the dso or name parameter must be non-NULL or the
@@ -143,7 +158,11 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, struct dso_id *id, bool write_locked) { - int low = 0, high = dsos->cnt - 1; +struct dsos__key key = { + .long_name = name, + .id = id, + }; +struct dso **res;if (!dsos->sorted) {if (!write_locked) {
@@ -162,23 +181,12 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, dsos->sorted = true; } -/* -* Find node with the matching name -*/ -while (low <= high) { -int mid = (low + high) /2 ; -struct dso *this = dsos->dsos[mid]; -int rc =__dso__cmp_long_name (name, id, this); + res =bsearch (&key, dsos->dsos, dsos->cnt,sizeof (struct dso *), + dsos__cmp_key_long_name_id); +if (!res) +return NULL ; -if (rc ==0 ) { -return dso__get (this);/* Find matching dso */ - } -if (rc <0 ) - high = mid -1 ; -else - low = mid +1 ; - } -return NULL ; +return dso__get (*res); }int __dsos__add (struct dsos *dsos,struct dso *dso)
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 50/53 perf dso: Add reference count checking and accessor functions
In reply to Ian RogersAdd reference count checking to struct dso, this can help with implementing correct reference counting discipline. To avoid RC_CHK_ACCESS everywhere, add accessor functions for the variables in struct dso.
The majority of the change is mechanical in nature and not easy to split up.
--- tools/perf/builtin-annotate.c | 6 +- tools/perf/builtin-buildid-cache.c | 2 +- tools/perf/builtin-buildid-list.c | 18 +- tools/perf/builtin-inject.c | 71 ++- tools/perf/builtin-kallsyms.c | 2 +- tools/perf/builtin-mem.c | 4 +- tools/perf/builtin-report.c | 6 +- tools/perf/builtin-script.c | 8 +- tools/perf/builtin-top.c | 4 +- tools/perf/tests/code-reading.c | 8 +- tools/perf/tests/dso-data.c | 11 +- tools/perf/tests/hists_common.c | 6 +- tools/perf/tests/hists_cumulate.c | 4 +- tools/perf/tests/hists_output.c | 2 +- tools/perf/tests/maps.c | 4 +- tools/perf/tests/symbols.c | 2 +- tools/perf/tests/vmlinux-kallsyms.c | 6 +- tools/perf/ui/browsers/annotate.c | 6 +- tools/perf/ui/browsers/hists.c | 8 +- tools/perf/ui/browsers/map.c | 4 +- tools/perf/util/annotate.c | 44 +- tools/perf/util/auxtrace.c | 2 +- tools/perf/util/block-info.c | 2 +- tools/perf/util/bpf-event.c | 8 +- tools/perf/util/build-id.c | 38 +- tools/perf/util/callchain.c | 2 +- tools/perf/util/data-convert-json.c | 2 +- tools/perf/util/db-export.c | 6 +- tools/perf/util/dlfilter.c | 12 +- tools/perf/util/dso.c | 364 ++++++------- tools/perf/util/dso.h | 478 ++++++++++++++++-- tools/perf/util/dsos.c | 54 +- tools/perf/util/event.c | 8 +- tools/perf/util/header.c | 8 +- tools/perf/util/hist.c | 4 +- tools/perf/util/intel-pt.c | 22 +- tools/perf/util/machine.c | 46 +- tools/perf/util/map.c | 69 ++- tools/perf/util/maps.c | 14 +- tools/perf/util/probe-event.c | 25 +- .../scripting-engines/trace-event-python.c | 21 +- tools/perf/util/sort.c | 19 +- tools/perf/util/srcline.c | 65 +-- tools/perf/util/symbol-elf.c | 92 ++-- tools/perf/util/symbol.c | 186 +++---- tools/perf/util/symbol_fprintf.c | 4 +- tools/perf/util/synthetic-events.c | 24 +- tools/perf/util/thread.c | 4 +- tools/perf/util/unwind-libunwind-local.c | 18 +- tools/perf/util/unwind-libunwind.c | 2 +- tools/perf/util/vdso.c | 8 +- 51 files changed, 1126 insertions(+), 707 deletions(-)
tools/perf/builtin-annotate.c +3 -3
@@ -210,7 +210,7 @@ static int process_branch_callback(struct evsel *evsel, }if (a.map !=NULL ) -map__dso (a.map)->hit =1 ; +dso__set_hit (map__dso (a.map));hist__account_cycles (sample->branch_stack, al, sample, false,NULL );
@@ -245,7 +245,7 @@ static int evsel__add_sample(struct evsel *evsel, struct perf_sample *sample,if (al->sym !=NULL ) {struct dso *dso =map__dso (al->map); -rb_erase_cached (&al->sym->rb_node, &dso->symbols); +rb_erase_cached (&al->sym->rb_node,dso__symbols (dso));symbol__delete (al->sym);dso__reset_find_symbol_cache (dso); }
@@ -331,7 +331,7 @@ static void hists__find_annotations(struct hists *hists, struct hist_entry *he = rb_entry(nd, struct hist_entry, rb_node);struct annotation *notes; -if (he->ms.sym ==NULL ||map__dso (he->ms.map)->annotate_warned) +if (he->ms.sym ==NULL ||dso__annotate_warned (map__dso (he->ms.map))) goto find_next; if (ann->sym_hist_filter &&
tools/perf/builtin-buildid-cache.c +1 -1
@@ -286,7 +286,7 @@ static bool dso__missing_buildid_cache(struct dso *dso, int parm __maybe_unused)pr_warning ("Problems with %s file, consider removing it from the cache\n" , filename); - }else if (memcmp (dso->bid.data, bid.data, bid.size)) { + }else if (memcmp (dso__bid (dso)->data, bid.data, bid.size)) {pr_warning ("Problems with %s file, consider removing it from the cache\n" , filename); }
tools/perf/builtin-buildid-list.c +10 -8
@@ -26,16 +26,18 @@ static int buildid__map_cb(struct map *map, void *arg __maybe_unused) {const struct dso *dso =map__dso (map);char bid_buf[SBUILD_ID_SIZE ]; +const char *dso_long_name =dso__long_name (dso); +const char *dso_short_name =dso__short_name (dso);memset (bid_buf,0 ,sizeof (bid_buf)); -if (dso->has_build_id) -build_id__sprintf (&dso->bid, bid_buf); +if (dso__has_build_id (dso)) +build_id__sprintf (dso__bid_const (dso), bid_buf);printf ("%s %16" PRIx64" %16" PRIx64, bid_buf,map__start (map),map__end (map)); -if (dso->long_name !=NULL ) { -printf (" %s" , dso->long_name); - }else if (dso->short_name !=NULL ) { -printf (" %s" , dso->short_name); - } +if (dso_long_name !=NULL ) +printf (" %s" , dso_long_name); +else if (dso_short_name !=NULL ) +printf (" %s" , dso_short_name); +printf ("\n" );return 0 ;
@@ -76,7 +78,7 @@ static int filename__fprintf_build_id(const char *name, FILE *fp)static bool dso__skip_buildid (struct dso *dso,int with_hits) { -return with_hits && !dso->hit; +return with_hits && !dso__hit (dso); }static int perf_session__list_build_ids (bool force,bool with_hits)
tools/perf/builtin-inject.c +35 -36
166 lines not on this page · raw message
tools/perf/builtin-kallsyms.c +1 -1
@@ -38,7 +38,7 @@ static int __cmd_kallsyms(int argc, const char **argv) dso =map__dso (map);printf ("%s: %s %s %#" PRIx64"-%#" PRIx64" (%#" PRIx64"-%#" PRIx64")\n" , - symbol->name, dso->short_name, dso->long_name, + symbol->name,dso__short_name (dso),dso__long_name (dso),map__unmap_ip (map, symbol->start),map__unmap_ip (map, symbol->end), symbol->start, symbol->end); }
tools/perf/builtin-mem.c +2 -2
@@ -213,7 +213,7 @@ dump_raw_samples(struct perf_tool *tool,if (al.map !=NULL ) { dso =map__dso (al.map);if (dso) - dso->hit =1 ; +dso__set_hit (dso); } field_sep = symbol_conf.field_sep;
@@ -255,7 +255,7 @@ dump_raw_samples(struct perf_tool *tool, symbol_conf.field_sep, sample->data_src, symbol_conf.field_sep, - dso ? dso->long_name :"???" , + dso ?dso__long_name (dso) :"???" , al.sym ? al.sym->name : "???"); out_put:addr_location__exit (&al);
tools/perf/builtin-report.c +3 -3
@@ -322,7 +322,7 @@ static int process_sample_event(struct perf_tool *tool, }if (al.map !=NULL ) -map__dso (al.map)->hit =1 ; +dso__set_hit (map__dso (al.map));if (ui__has_annotation () || rep->symbol_ipc || rep->total_cycles_mode) { hist__account_cycles(sample->branch_stack, &al, sample,
@@ -611,7 +611,7 @@ static void report__warn_kptr_restrict(const struct report *rep)return ;if (kernel_map ==NULL || - (map__dso (kernel_map)->hit && + (dso__hit (map__dso (kernel_map)) && (kernel_kmap->ref_reloc_sym ==NULL || kernel_kmap->ref_reloc_sym->addr ==0 ))) { const char *desc =
@@ -852,7 +852,7 @@ static int maps__fprintf_task_cb(struct map *map, void *data) prot &PROT_EXEC ?'x' :'-' ,map__flags (map) ?'s' :'p' ,map__pgoff (map), - dso->id.ino, dso->name); + dso__id_const(dso)->ino, dso__name(dso));if (ret <0 )return ret;
tools/perf/builtin-script.c +4 -4
@@ -1011,11 +1011,11 @@ static int perf_sample__fprintf_brstackoff(struct perf_sample *sample, to = entries[i].to;if (thread__find_map_fb (thread, sample->cpumode, from, &alf) && - !map__dso (alf.map)->adjust_symbols) + !dso__adjust_symbols (map__dso (alf.map))) from =map__dso_map_ip (alf.map, from);if (thread__find_map_fb (thread, sample->cpumode, to, &alt) && - !map__dso (alt.map)->adjust_symbols) + !dso__adjust_symbols (map__dso (alt.map))) to =map__dso_map_ip (alt.map, to); printed +=fprintf (fp," 0x%" PRIx64, from);
@@ -1076,7 +1076,7 @@ static int grab_bb(u8 *buffer, u64 start, u64 end,pr_debug ("\tcannot resolve %" PRIx64"-%" PRIx64"\n" , start, end); goto out; } -if (dso->data.status ==DSO_DATA_STATUS_ERROR ) { +if (dso__data (dso)->status ==DSO_DATA_STATUS_ERROR ) {pr_debug ("\tcannot resolve %" PRIx64"-%" PRIx64"\n" , start, end); goto out; }
@@ -1088,7 +1088,7 @@ static int grab_bb(u8 *buffer, u64 start, u64 end, len =dso__data_read_offset (dso, machine, offset, (u8 *)buffer, end - start +MAXINSN ); - *is64bit = dso->is_64_bit; + *is64bit =dso__is_64_bit (dso);if (len <=0 )pr_debug ("\tcannot fetch code for block at %" PRIx64"-%" PRIx64"\n" , start, end);
tools/perf/builtin-top.c +2 -2
@@ -129,7 +129,7 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he)/* * We can't annotate with just /proc/kallsyms */ -if (dso->symtab_type ==DSO_BINARY_TYPE__KALLSYMS && !dso__is_kcore (dso)) { +if (dso__symtab_type (dso) ==DSO_BINARY_TYPE__KALLSYMS && !dso__is_kcore (dso)) {pr_err ("Can't annotate %s: No vmlinux file was found in the " "path\n" , sym->name);sleep (1 );
@@ -182,7 +182,7 @@ static void ui__warn_map_erange(struct map *map, struct symbol *sym, u64 ip)"Tools: %s\n\n" "Not all samples will be on the annotation output.\n\n" "Please report to [email protected]\n" , - ip, dso->long_name,dso__symtab_origin (dso), + ip,dso__long_name (dso),dso__symtab_origin (dso),map__start (map),map__end (map), sym->start, sym->end, sym->binding ==STB_GLOBAL ?'g' : sym->binding == STB_LOCAL ? 'l' : 'w', sym->name,
tools/perf/tests/code-reading.c +4 -4
@@ -253,9 +253,9 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode, goto out; } dso =map__dso (al.map); -pr_debug ("File is: %s\n" , dso->long_name); +pr_debug ("File is: %s\n" ,dso__long_name (dso)); -if (dso->symtab_type ==DSO_BINARY_TYPE__KALLSYMS && !dso__is_kcore (dso)) { +if (dso__symtab_type (dso) ==DSO_BINARY_TYPE__KALLSYMS && !dso__is_kcore (dso)) {pr_debug ("Unexpected kernel address - skipping\n" ); goto out; }
@@ -274,7 +274,7 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode,* modules to manage long jumps. Check if the ip offset falls in stubs * sections for kernel modules. And skip module address after text end */ -if (dso->is_kmod && al.addr > dso->text_end) { +if (dso__is_kmod (dso) && al.addr >dso__text_end (dso)) {pr_debug ("skipping the module address %#" PRIx64" after text end\n" , al.addr); goto out; }
@@ -315,7 +315,7 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode, state->done[state->done_cnt++] =map__start (al.map); } - objdump_name = dso->long_name; + objdump_name =dso__long_name (dso);if (dso__needs_decompress (dso)) { if (dso__decompress_kmodule_path(dso, objdump_name, decomp_name,
tools/perf/tests/dso-data.c +6 -5
@@ -228,7 +228,8 @@ static void dsos__delete(int cnt)for (i =0 ; i < cnt; i++) {struct dso *dso = dsos[i]; -unlink (dso->name); +dso__data_close (dso); +unlink (dso__name (dso));dso__put (dso); }
@@ -289,14 +290,14 @@ static int test__dso_data_cache(struct test_suite *test __maybe_unused, int subt }/* verify the first one is already open */ -TEST_ASSERT_VAL ("dsos[0] is not open" , dsos[0 ]->data.fd !=-1 ); +TEST_ASSERT_VAL ("dsos[0] is not open" ,dso__data (dsos[0 ])->fd !=-1 );/* open +1 dso to reach the allowed limit */ fd =dso__data_fd (dsos[i], &machine);TEST_ASSERT_VAL ("failed to get fd" , fd >0 );/* should force the first one to be closed */ -TEST_ASSERT_VAL ("failed to close dsos[0]" , dsos[0 ]->data.fd ==-1 ); +TEST_ASSERT_VAL ("failed to close dsos[0]" ,dso__data (dsos[0 ])->fd ==-1 );/* cleanup everything */ dsos__delete (dso_cnt);
@@ -371,7 +372,7 @@ static int test__dso_data_reopen(struct test_suite *test __maybe_unused, int sub* dso_0 should get closed, because we reached * the file descriptor limit */ -TEST_ASSERT_VAL ("failed to close dso_0" , dso_0->data.fd ==-1 ); +TEST_ASSERT_VAL ("failed to close dso_0" ,dso__data (dso_0)->fd ==-1 );/* open dso_0 */ fd =dso__data_fd (dso_0, &machine);
@@ -381,7 +382,7 @@ static int test__dso_data_reopen(struct test_suite *test __maybe_unused, int sub* dso_1 should get closed, because we reached * the file descriptor limit */ -TEST_ASSERT_VAL ("failed to close dso_1" , dso_1->data.fd ==-1 ); +TEST_ASSERT_VAL ("failed to close dso_1" ,dso__data (dso_1)->fd ==-1 );/* cleanup everything */ close (fd_extra);
tools/perf/tests/hists_common.c +3 -3
@@ -146,7 +146,7 @@ struct machine *setup_fake_machine(struct machines *machines) goto out; } -symbols__insert (&dso->symbols, sym); +symbols__insert (dso__symbols (dso), sym); }dso__put (dso);
@@ -183,7 +183,7 @@ void print_hists_in(struct hists *hists)pr_info ("%2d: entry: %-8s [%-8s] %20s: period = %" PRIu64"\n" , i,thread__comm_str (he->thread), - dso->short_name, +dso__short_name (dso), he->ms.sym->name, he->stat.period); }
@@ -212,7 +212,7 @@ void print_hists_out(struct hists *hists)pr_info ("%2d: entry: %8s:%5d [%-8s] %20s: period = %" PRIu64"/%" PRIu64"\n" , i,thread__comm_str (he->thread),thread__tid (he->thread), - dso->short_name, +dso__short_name (dso), he->ms.sym->name, he->stat.period, he->stat_acc ? he->stat_acc->period :0 ); }
tools/perf/tests/hists_cumulate.c +2 -2
@@ -164,11 +164,11 @@ static void put_fake_samples(void)typedef int (*test_fn_t )(struct evsel *,struct machine *);#define COMM (he) (thread__comm_str(he->thread)) -#define DSO (he) (map__dso(he->ms.map)->short_name) +#define DSO (he) (dso__short_name(map__dso(he->ms.map)))#define SYM (he) (he->ms.sym->name)#define CPU (he) (he->cpu)#define DEPTH (he) (he->callchain->max_depth) -#define CDSO (cl) (map__dso(cl->ms.map)->short_name) +#define CDSO (cl) (dso__short_name(map__dso(cl->ms.map)))#define CSYM (cl) (cl->ms.sym->name)struct result {
tools/perf/tests/hists_output.c +1 -1
@@ -129,7 +129,7 @@ static void put_fake_samples(void)typedef int (*test_fn_t )(struct evsel *,struct machine *);#define COMM (he) (thread__comm_str(he->thread)) -#define DSO (he) (map__dso(he->ms.map)->short_name) +#define DSO (he) (dso__short_name(map__dso(he->ms.map)))#define SYM (he) (he->ms.sym->name)#define CPU (he) (he->cpu)#define PID (he) (thread__tid(he->thread))
tools/perf/tests/maps.c +2 -2
@@ -26,7 +26,7 @@ static int check_maps_cb(struct map *map, void *data)if (map__start (map) != merged->start ||map__end (map) != merged->end || -strcmp (map__dso (map)->name, merged->name) || +strcmp (dso__name (map__dso (map)), merged->name) ||refcount_read (map__refcnt (map)) !=1 ) {return 1 ; }
@@ -39,7 +39,7 @@ static int failed_cb(struct map *map, void *data __maybe_unused)pr_debug ("\tstart: %" PRIu64" end: %" PRIu64" name: '%s' refcnt: %d\n" ,map__start (map),map__end (map), -map__dso (map)->name, +dso__name (map__dso (map)),refcount_read (map__refcnt (map)));return 0 ;
tools/perf/tests/symbols.c +1 -1
@@ -72,7 +72,7 @@ static int test_dso(struct dso *dso)if (verbose >1 )dso__fprintf (dso, stderr); -for (nd =rb_first_cached (&dso->symbols); nd; nd =rb_next (nd)) { +for (nd =rb_first_cached (dso__symbols (dso)); nd; nd =rb_next (nd)) { struct symbol *sym = rb_entry(nd, struct symbol, rb_node);if (sym->type !=STT_FUNC && sym->type !=STT_GNU_IFUNC )
tools/perf/tests/vmlinux-kallsyms.c +3 -3
@@ -129,7 +129,7 @@ static int test__vmlinux_matches_kallsyms_cb1(struct map *map, void *data)* cases. */ struct map *pair =maps__find_by_name (args->kallsyms.kmaps, - (dso->kernel ? dso->short_name : dso->name)); + (dso__kernel (dso) ?dso__short_name (dso) :dso__name (dso)));if (pair) {map__set_priv (pair,1 );
@@ -162,11 +162,11 @@ static int test__vmlinux_matches_kallsyms_cb2(struct map *map, void *data) }pr_info ("WARN: %" PRIx64"-%" PRIx64" %" PRIx64" %s in kallsyms as" , -map__start (map),map__end (map),map__pgoff (map), dso->name); +map__start (map),map__end (map),map__pgoff (map),dso__name (dso));if (mem_end !=map__end (pair))pr_info (":\nWARN: *%" PRIx64"-%" PRIx64" %" PRIx64,map__start (pair),map__end (pair),map__pgoff (pair)); -pr_info (" %s\n" , dso->name); +pr_info (" %s\n" ,dso__name (dso));map__set_priv (pair,1 ); }map__put (pair);
tools/perf/ui/browsers/annotate.c +3 -3
@@ -442,7 +442,7 @@ static int sym_title(struct symbol *sym, struct map *map, char *title, size_t sz, int percent_type) {return snprintf (title, sz,"%s %s [Percent: %s]" , sym->name, -map__dso (map)->long_name, +dso__long_name (map__dso (map)),percent_type_str (percent_type)); }
@@ -975,14 +975,14 @@ int symbol__tui_annotate(struct map_symbol *ms, struct evsel *evsel,return -1 ; dso =map__dso (ms->map); -if (dso->annotate_warned) +if (dso__annotate_warned (dso))return -1 ;if (not_annotated) { err =symbol__annotate2 (ms, evsel, opts, &browser.arch);if (err) {char msg[BUFSIZ ]; - dso->annotate_warned = true; +dso__set_annotate_warned (dso);symbol__strerror_disassemble (ms, err, msg,sizeof (msg));ui__error ("Couldn't annotate %s:\n%s" , sym->name, msg); goto out_free_offsets;
tools/perf/ui/browsers/hists.c +4 -4
@@ -2491,7 +2491,7 @@ add_annotate_opt(struct hist_browser *browser __maybe_unused, {struct dso *dso; -if (!ms->map || (dso =map__dso (ms->map)) ==NULL || dso->annotate_warned) +if (!ms->map || (dso =map__dso (ms->map)) ==NULL ||dso__annotate_warned (dso))return 0 ;if (!ms->sym)
@@ -2584,7 +2584,7 @@ static int hists_browser__zoom_map(struct hist_browser *browser, struct map *map }else {struct dso *dso =map__dso (map);ui_helpline__fpush ("To zoom out press ESC or ENTER + \"Zoom out of %s DSO\"" , -__map__is_kernel (map) ?"the Kernel" : dso->short_name); +__map__is_kernel (map) ?"the Kernel" :dso__short_name (dso)); browser->hists->dso_filter = dso;perf_hpp__set_elide (HISTC_DSO , true);pstack__push (browser->pstack, &browser->hists->dso_filter);
@@ -2610,7 +2610,7 @@ add_dso_opt(struct hist_browser *browser, struct popup_action *act,if (asprintf (optstr,"Zoom %s %s DSO (use the 'k' hotkey to zoom directly into the kernel)" , browser->hists->dso_filter ?"out of" :"into" , -__map__is_kernel (map) ?"the Kernel" :map__dso (map)->short_name) <0 ) +__map__is_kernel (map) ?"the Kernel" :dso__short_name (map__dso (map))) <0 )return 0 ; act->ms.map = map;
@@ -3086,7 +3086,7 @@ static int evsel__hists_browse(struct evsel *evsel, int nr_events, const char *hif (!browser->selection || !browser->selection->map || !map__dso (browser->selection->map) || -map__dso (browser->selection->map)->annotate_warned) { +dso__annotate_warned (map__dso (browser->selection->map))) {continue ; }
tools/perf/ui/browsers/map.c +2 -2
@@ -76,7 +76,7 @@ static int map_browser__run(struct map_browser *browser) {int key; -if (ui_browser__show (&browser->b,map__dso (browser->map)->long_name, +if (ui_browser__show (&browser->b,dso__long_name (map__dso (browser->map)),"Press ESC to exit, %s / to search" , verbose >0 ?"" :"restart with -v to use" ) <0 )return -1 ;
@@ -106,7 +106,7 @@ int map__browse(struct map *map) {struct map_browser mb = { .b = { - .entries = &map__dso (map)->symbols, + .entries =dso__symbols (map__dso (map)), .refresh = ui_browser__rb_tree_refresh, .seek = ui_browser__rb_tree_seek, .write = map_browser__write,
tools/perf/util/annotate.c +22 -22
133 lines not on this page · raw message
tools/perf/util/auxtrace.c +1 -1
@@ -2649,7 +2649,7 @@ static int addr_filter__entire_dso(struct addr_filter *filt, struct dso *dso) } filt->addr =0 ; - filt->size = dso->data.file_size; + filt->size =dso__data (dso)->file_size;return 0 ; }
tools/perf/util/block-info.c +1 -1
@@ -319,7 +319,7 @@ static int block_dso_entry(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,if (map &&map__dso (map)) {return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, -map__dso (map)->short_name); +dso__short_name (map__dso (map))); } return scnprintf(hpp->buf, hpp->size, "%*s", block_fmt->width,
tools/perf/util/bpf-event.c +4 -4
@@ -59,10 +59,10 @@ static int machine__process_bpf_event_load(struct machine *machine,if (map) {struct dso *dso =map__dso (map); - dso->binary_type =DSO_BINARY_TYPE__BPF_PROG_INFO ; - dso->bpf_prog.id = id; - dso->bpf_prog.sub_id = i; - dso->bpf_prog.env = env; +dso__set_binary_type (dso,DSO_BINARY_TYPE__BPF_PROG_INFO ); +dso__bpf_prog (dso)->id = id; +dso__bpf_prog (dso)->sub_id = i; +dso__bpf_prog (dso)->env = env;map__put (map); } }
tools/perf/util/build-id.c +19 -19
@@ -60,7 +60,7 @@ int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused,addr_location__init (&al);if (thread__find_map (thread, sample->cpumode, sample->ip, &al)) -map__dso (al.map)->hit =1 ; +dso__set_hit (map__dso (al.map));addr_location__exit (&al);thread__put (thread);
@@ -272,10 +272,10 @@ char *__dso__build_id_filename(const struct dso *dso, char *bf, size_t size,bool alloc = (bf ==NULL );int ret; -if (!dso->has_build_id) +if (!dso__has_build_id (dso))return NULL ; -build_id__sprintf (&dso->bid, sbuild_id); +build_id__sprintf (dso__bid_const (dso), sbuild_id); linkname =build_id_cache__linkname (sbuild_id,NULL ,0 );if (!linkname)return NULL ;
@@ -340,25 +340,25 @@ static int machine__write_buildid_table_cb(struct dso *dso, void *data)size_t name_len;bool in_kernel = false; -if (!dso->has_build_id) +if (!dso__has_build_id (dso))return 0 ; -if (!dso->hit && !dso__is_vdso (dso)) +if (!dso__hit (dso) && !dso__is_vdso (dso))return 0 ;if (dso__is_vdso (dso)) { - name = dso->short_name; - name_len = dso->short_name_len; + name =dso__short_name (dso); + name_len =dso__short_name_len (dso); }else if (dso__is_kcore (dso)) { name = args->machine->mmap_name; name_len =strlen (name); }else { - name = dso->long_name; - name_len = dso->long_name_len; + name =dso__long_name (dso); + name_len =dso__long_name_len (dso); } - in_kernel = dso->kernel ||is_kernel_module (name,PERF_RECORD_MISC_CPUMODE_UNKNOWN ); -return write_buildid (name, name_len, &dso->bid, args->machine->pid, + in_kernel =dso__kernel (dso) ||is_kernel_module (name,PERF_RECORD_MISC_CPUMODE_UNKNOWN ); +return write_buildid (name, name_len,dso__bid (dso), args->machine->pid, in_kernel ? args->kmisc : args->umisc, args->fd); }
@@ -876,11 +876,11 @@ static bool dso__build_id_mismatch(struct dso *dso, const char *name)struct build_id bid;bool ret = false; -mutex_lock (&dso->lock); -if (filename__read_build_id_ns (name, &bid, dso->nsinfo) >=0 ) +mutex_lock (dso__lock (dso)); +if (filename__read_build_id_ns (name, &bid,dso__nsinfo (dso)) >=0 ) ret = !dso__build_id_equal (dso, &bid); -mutex_unlock (&dso->lock); +mutex_unlock (dso__lock (dso));return ret; }
@@ -890,13 +890,13 @@ static int dso__cache_build_id(struct dso *dso, struct machine *machine, {bool is_kallsyms =dso__is_kallsyms (dso);bool is_vdso =dso__is_vdso (dso); -const char *name = dso->long_name; +const char *name =dso__long_name (dso);const char *proper_name =NULL ;const char *root_dir =NULL ;char *allocated_name =NULL ;int ret =0 ; -if (!dso->has_build_id) +if (!dso__has_build_id (dso))return 0 ;if (dso__is_kcore (dso)) {
@@ -921,10 +921,10 @@ static int dso__cache_build_id(struct dso *dso, struct machine *machine,if (!is_kallsyms &&dso__build_id_mismatch (dso, name)) goto out_free; -mutex_lock (&dso->lock); - ret =build_id_cache__add_b (&dso->bid, name, dso->nsinfo, +mutex_lock (dso__lock (dso)); + ret =build_id_cache__add_b (dso__bid (dso), name,dso__nsinfo (dso), is_kallsyms, is_vdso, proper_name, root_dir); -mutex_unlock (&dso->lock); +mutex_unlock (dso__lock (dso)); out_free:free (allocated_name);return ret;
tools/perf/util/callchain.c +1 -1
@@ -1205,7 +1205,7 @@ char *callchain_list__sym_name(struct callchain_list *cl,if (show_dso)scnprintf (bf + printed, bfsize - printed," %s" , cl->ms.map ? -map__dso (cl->ms.map)->short_name : +dso__short_name (map__dso (cl->ms.map)) :"unknown" );return bf;
tools/perf/util/data-convert-json.c +1 -1
@@ -134,7 +134,7 @@ static void output_sample_callchain_entry(struct perf_tool *tool,output_json_key_string (out, false,5 ,"symbol" , al->sym->name);if (dso) { -const char *dso_name = dso->short_name; +const char *dso_name =dso__short_name (dso);if (dso_name &&strlen (dso_name) >0 ) {fputc (',' , out);
tools/perf/util/db-export.c +3 -3
@@ -146,10 +146,10 @@ int db_export__comm_thread(struct db_export *dbe, struct comm *comm,int db_export__dso (struct db_export *dbe,struct dso *dso,struct machine *machine) { -if (dso->db_id) +if (dso__db_id (dso))return 0 ; - dso->db_id = ++dbe->dso_last_db_id; +dso__set_db_id (dso, ++dbe->dso_last_db_id);if (dbe->export_dso)return dbe->export_dso (dbe, dso, machine);
@@ -184,7 +184,7 @@ static int db_ids_from_al(struct db_export *dbe, struct addr_location *al, err =db_export__dso (dbe, dso,maps__machine (al->maps));if (err)return err; - *dso_db_id = dso->db_id; + *dso_db_id =dso__db_id (dso);if (!al->sym) { al->sym =symbol__new (al->addr,0 ,0 ,0 ,"unknown" );
tools/perf/util/dlfilter.c +6 -6
@@ -33,13 +33,13 @@ static void al_to_d_al(struct addr_location *al, struct perf_dlfilter_al *d_al)if (al->map) {struct dso *dso =map__dso (al->map); -if (symbol_conf.show_kernel_path && dso->long_name) - d_al->dso = dso->long_name; +if (symbol_conf.show_kernel_path &&dso__long_name (dso)) + d_al->dso =dso__long_name (dso);else - d_al->dso = dso->name; - d_al->is_64_bit = dso->is_64_bit; - d_al->buildid_size = dso->bid.size; - d_al->buildid = dso->bid.data; + d_al->dso =dso__name (dso); + d_al->is_64_bit =dso__is_64_bit (dso); + d_al->buildid_size =dso__bid (dso)->size; + d_al->buildid =dso__bid (dso)->data; }else { d_al->dso =NULL ; d_al->is_64_bit =0 ;
tools/perf/util/dso.c +194 -170
877 lines not on this page · raw message
tools/perf/util/dso.h +432 -46
536 lines not on this page · raw message
tools/perf/util/dsos.c +27 -27
142 lines not on this page · raw message
tools/perf/util/event.c +4 -4
@@ -726,7 +726,7 @@ int machine__resolve(struct machine *machine, struct addr_location *al, dso = al->map ?map__dso (al->map) :NULL ;dump_printf (" ...... dso: %s\n" , dso - ? dso->long_name + ?dso__long_name (dso) : (al->level =='H' ?"[hypervisor]" :"<not found>" ));if (thread__is_filtered (thread))
@@ -750,10 +750,10 @@ int machine__resolve(struct machine *machine, struct addr_location *al,if (al->map) {if (symbol_conf.dso_list && (!dso || !(strlist__has_entry (symbol_conf.dso_list, - dso->short_name) || - (dso->short_name != dso->long_name && +dso__short_name (dso)) || + (dso__short_name (dso) !=dso__long_name (dso) &&strlist__has_entry (symbol_conf.dso_list, - dso->long_name))))) { +dso__long_name (dso)))))) { al->filtered |= (1 <<HIST_FILTER__DSO ); }
tools/perf/util/header.c +4 -4
@@ -2299,7 +2299,7 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev,build_id__init (&bid, bev->data, size);dso__set_build_id (dso, &bid); - dso->header_build_id =1 ; +dso__set_header_build_id (dso, true);if (dso_space !=DSO_SPACE__USER ) {struct kmod_path m = { .name =NULL , };
@@ -2307,13 +2307,13 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev,if (!kmod_path__parse_name (&m, filename) && m.kmod)dso__set_module_info (dso, &m, machine); - dso->kernel = dso_space; +dso__set_kernel (dso, dso_space);free (m.name); } -build_id__sprintf (&dso->bid, sbuild_id); +build_id__sprintf (dso__bid (dso), sbuild_id);pr_debug ("build id event received for %s: %s [%zu]\n" , - dso->long_name, sbuild_id, size); +dso__long_name (dso), sbuild_id, size);dso__put (dso); }
tools/perf/util/hist.c +2 -2
@@ -2128,7 +2128,7 @@ static bool hists__filter_entry_by_dso(struct hists *hists, struct hist_entry *he) {if (hists->dso_filter !=NULL && - (he->ms.map ==NULL ||map__dso (he->ms.map) != hists->dso_filter)) { + (he->ms.map ==NULL || !RC_CHK_EQUAL (map__dso (he->ms.map), hists->dso_filter))) { he->filtered |= (1 <<HIST_FILTER__DSO );return true; }
@@ -2808,7 +2808,7 @@ int __hists__scnprintf_title(struct hists *hists, char *bf, size_t size, bool sh }if (dso) printed +=scnprintf (bf + printed, size - printed, -", DSO: %s" , dso->short_name); +", DSO: %s" ,dso__short_name (dso));if (socket_id >-1 ) printed +=scnprintf (bf + printed, size - printed,", Processor Socket: %d" , socket_id);
tools/perf/util/intel-pt.c +11 -11
@@ -598,15 +598,15 @@ static struct auxtrace_cache *intel_pt_cache(struct dso *dso,struct auxtrace_cache *c;unsigned int bits; -if (dso->auxtrace_cache) -return dso->auxtrace_cache; +if (dso__auxtrace_cache (dso)) +return dso__auxtrace_cache (dso); bits =intel_pt_cache_size (dso, machine);/* Ignoring cache creation failure */ c =auxtrace_cache__new (bits,sizeof (struct intel_pt_cache_entry ),200 ); - dso->auxtrace_cache = c; +dso__set_auxtrace_cache (dso, c);return c; }
@@ -650,7 +650,7 @@ intel_pt_cache_lookup(struct dso *dso, struct machine *machine, u64 offset)if (!c)return NULL ; -return auxtrace_cache__lookup (dso->auxtrace_cache, offset); +return auxtrace_cache__lookup (dso__auxtrace_cache (dso), offset); } static void intel_pt_cache_invalidate(struct dso *dso, struct machine *machine,
@@ -661,7 +661,7 @@ static void intel_pt_cache_invalidate(struct dso *dso, struct machine *machine,if (!c)return ; -auxtrace_cache__remove (dso->auxtrace_cache, offset); +auxtrace_cache__remove (dso__auxtrace_cache (dso), offset); }static inline bool intel_pt_guest_kernel_ip (uint64_t ip)
@@ -820,8 +820,8 @@ static int intel_pt_walk_next_insn(struct intel_pt_insn *intel_pt_insn, } dso =map__dso (al.map); -if (dso->data.status ==DSO_DATA_STATUS_ERROR && -dso__data_status_seen (dso,DSO_DATA_STATUS_SEEN_ITRACE )) { +if (dso__data (dso)->status ==DSO_DATA_STATUS_ERROR && +dso__data_status_seen (dso,DSO_DATA_STATUS_SEEN_ITRACE )) { ret = -ENOENT ; goto out_ret; }
@@ -854,7 +854,7 @@ static int intel_pt_walk_next_insn(struct intel_pt_insn *intel_pt_insn,/* Load maps to ensure dso->is_64_bit has been updated */ map__load (al.map); - x86_64 = dso->is_64_bit; + x86_64 =dso__is_64_bit (dso);while (1 ) { len = dso__data_read_offset(dso, machine,
@@ -1008,7 +1008,7 @@ static int __intel_pt_pgd_ip(uint64_t ip, void *data) offset =map__map_ip (al.map, ip); - res =intel_pt_match_pgd_ip (ptq->pt, ip, offset,map__dso (al.map)->long_name); + res =intel_pt_match_pgd_ip (ptq->pt, ip, offset,dso__long_name (map__dso (al.map)));addr_location__exit (&al);return res; }
@@ -3416,7 +3416,7 @@ static int intel_pt_text_poke(struct intel_pt *pt, union perf_event *event) } dso =map__dso (al.map); -if (!dso || !dso->auxtrace_cache) +if (!dso || !dso__auxtrace_cache (dso))continue ; offset =map__map_ip (al.map, addr);
@@ -3436,7 +3436,7 @@ static int intel_pt_text_poke(struct intel_pt *pt, union perf_event *event) }else {intel_pt_cache_invalidate (dso, machine, offset);intel_pt_log ("Invalidated instruction cache for %s at %#" PRIx64"\n" , - dso->long_name, addr); +dso__long_name (dso), addr); } } out:
tools/perf/util/machine.c +23 -23
131 lines not on this page · raw message
tools/perf/util/map.c +34 -35
213 lines not on this page · raw message
tools/perf/util/maps.c +7 -7
@@ -76,7 +76,7 @@ static void check_invariants(const struct maps *maps __maybe_unused)/* Expect at least 1 reference count. */ assert (refcount_read (map__refcnt (map)) >0 ); -if (map__dso (map) &&map__dso (map)->kernel) +if (map__dso (map) &&dso__kernel (map__dso (map)))assert (RC_CHK_EQUAL (map__kmap (map)->kmaps, maps));if (i >0 ) {
@@ -331,7 +331,7 @@ static int map__strcmp(const void *a, const void *b)const struct map *map_b = *(const struct map *const *)b;const struct dso *dso_a =map__dso (map_a);const struct dso *dso_b =map__dso (map_b); -int ret =strcmp (dso_a->short_name, dso_b->short_name); +int ret =strcmp (dso__short_name (dso_a),dso__short_name (dso_b));if (ret ==0 &&RC_CHK_ACCESS (map_a) !=RC_CHK_ACCESS (map_b)) {/* Ensure distinct but name equal maps have an order. */
@@ -470,7 +470,7 @@ static int __maps__insert(struct maps *maps, struct map *new) }if (map__end (new) <map__start (new))RC_CHK_ACCESS (maps)->ends_broken = true; -if (dso && dso->kernel) { +if (dso &&dso__kernel (dso)) {struct kmap *kmap =map__kmap (new);if (kmap)
@@ -746,7 +746,7 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)if (use_browser) {pr_debug ("overlapping maps in %s (disable tui for more info)\n" , -map__dso (new)->name); +dso__name (map__dso (new))); }else if (verbose >=2 ) {pr_debug ("overlapping maps:\n" );map__fprintf (new,debug_file ());
@@ -967,7 +967,7 @@ static int map__strcmp_name(const void *name, const void *b) {const struct dso *dso =map__dso (*(const struct map **)b); -return strcmp (name, dso->short_name); +return strcmp (name,dso__short_name (dso)); }struct map *maps__find_by_name (struct maps *maps,const char *name)
@@ -986,7 +986,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)if (i <maps__nr_maps (maps) &&maps__maps_by_name (maps)) {struct dso *dso =map__dso (maps__maps_by_name (maps)[i]); -if (dso &&strcmp (dso->short_name, name) ==0 ) { +if (dso &&strcmp (dso__short_name (dso), name) ==0 ) { result =map__get (maps__maps_by_name (maps)[i]); done = true; }
@@ -1023,7 +1023,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)struct map *pos = maps_by_address[i];struct dso *dso =map__dso (pos); -if (dso &&strcmp (dso->short_name, name) ==0 ) { +if (dso &&strcmp (dso__short_name (dso), name) ==0 ) { result =map__get (pos);break ; }
tools/perf/util/probe-event.c +12 -13
@@ -158,8 +158,8 @@ static int kernel_get_module_map_cb(struct map *map, void *data) {struct kernel_get_module_map_cb_args *args = data;struct dso *dso =map__dso (map); -const char *short_name = dso->short_name;/* short_name is "[module]" */ -u16 short_name_len = dso->short_name_len; +const char *short_name =dso__short_name (dso); +u16 short_name_len =dso__short_name_len (dso);if (strncmp (short_name +1 , args->module, short_name_len -2 ) ==0 && args->module[short_name_len -2 ] =='\0' ) {
@@ -201,10 +201,9 @@ struct map *get_target_map(const char *target, struct nsinfo *nsi, bool user) map =dso__new_map (target); dso = map ?map__dso (map) :NULL ;if (dso) { -mutex_lock (&dso->lock); -nsinfo__put (dso->nsinfo); - dso->nsinfo =nsinfo__get (nsi); -mutex_unlock (&dso->lock); +mutex_lock (dso__lock (dso)); +dso__set_nsinfo (dso,nsinfo__get (nsi)); +mutex_unlock (dso__lock (dso)); }return map; }else {
@@ -367,11 +366,11 @@ static int kernel_get_module_dso(const char *module, struct dso **pdso) map =machine__kernel_map (host_machine); dso =map__dso (map); -if (!dso->has_build_id) +if (!dso__has_build_id (dso))dso__read_running_kernel_build_id (dso, host_machine); vmlinux_name = symbol_conf.vmlinux_name; - dso->load_errno =0 ; + *dso__load_errno (dso) =0 ;if (vmlinux_name) ret =dso__load_vmlinux (dso, map, vmlinux_name, false);else
@@ -498,7 +497,7 @@ static struct debuginfo *open_from_debuginfod(struct dso *dso, struct nsinfo *nsif (!c)return NULL ; -build_id__sprintf (&dso->bid, sbuild_id); +build_id__sprintf (dso__bid (dso), sbuild_id);
Lines of this file are not shown. View the raw message.
tools/perf/util/scripting-engines/trace-event-python.c +11 -10
Lines of this file are not shown. View the raw message.
tools/perf/util/srcline.c +34 -31
65 lines not on this page · raw message
tools/perf/util/symbol-elf.c +46 -46
92 lines not on this page · raw message
tools/perf/util/symbol.c +95 -91
186 lines not on this page · raw message
tools/perf/util/unwind-libunwind-local.c +9 -9
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Part of the diff is not shown here. View the raw message.
Ian Rogers
reviewerPATCH v4 51/53 perf dso: Reference counting related fixes
In reply to Ian RogersEnsure gets and puts are better aligned fixing reference couting checking problems.
--- tools/perf/util/machine.c | 4 ++-- tools/perf/util/map.c | 1 + tools/perf/util/symbol-elf.c | 38 +++++++++++++++++------------------- 3 files changed, 21 insertions(+), 22 deletions(-)
tools/perf/util/machine.c +2 -2
@@ -683,7 +683,7 @@ static int machine__process_ksymbol_register(struct machine *machine, struct perf_sample *sample __maybe_unused) {struct symbol *sym; -struct dso *dso; +struct dso *dso =NULL ;struct map *map =maps__find (machine__kernel_maps (machine), event->ksymbol.addr);int err =0 ;
@@ -696,7 +696,6 @@ static int machine__process_ksymbol_register(struct machine *machine, }dso__set_kernel (dso,DSO_SPACE__KERNEL ); map =map__new2 (0 , dso); -dso__put (dso);if (!map) { err = -ENOMEM ; goto out;
@@ -735,6 +734,7 @@ static int machine__process_ksymbol_register(struct machine *machine,dso__insert_symbol (dso, sym); out:map__put (map); +dso__put (dso);return err; }
tools/perf/util/map.c +1 -0
@@ -200,6 +200,7 @@ struct map *map__new(struct machine *machine, u64 start, u64 len,dso__set_build_id (dso,dso__bid (header_bid_dso));dso__set_header_build_id (dso,1 ); } +dso__put (header_bid_dso); }dso__put (dso); }
tools/perf/util/symbol-elf.c +18 -20
@@ -1366,7 +1366,7 @@ void __weak arch__sym_update(struct symbol *s __maybe_unused,static int dso__process_kernel_symbol (struct dso *dso,struct map *map,GElf_Sym *sym,GElf_Shdr *shdr,struct maps *kmaps,struct kmap *kmap, -struct dso **curr_dsop,struct map **curr_mapp, +struct dso **curr_dsop,const char *section_name,bool adjust_kernel_syms,bool kmodule,bool *remap_kernel) {
@@ -1416,8 +1416,8 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map,map__set_pgoff (map, shdr->sh_offset); } - *curr_mapp = map; - *curr_dsop = dso; +dso__put (*curr_dsop); + *curr_dsop =dso__get (dso);return 0 ; }
@@ -1442,10 +1442,10 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map,dso__set_binary_type (curr_dso,dso__binary_type (dso));dso__set_adjust_symbols (curr_dso,dso__adjust_symbols (dso)); curr_map =map__new2 (start, curr_dso); -dso__put (curr_dso); -if (curr_map ==NULL ) +if (curr_map ==NULL ) { +dso__put (curr_dso);return -1 ; - + }if (dso__kernel (curr_dso))map__kmap (curr_map)->kmaps = kmaps;
@@ -1459,21 +1459,15 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map,dso__set_symtab_type (curr_dso,dso__symtab_type (dso));if (maps__insert (kmaps, curr_map))return -1 ; -/* -* Add it before we drop the reference to curr_map, i.e. while -* we still are sure to have a reference to this DSO via -* *curr_map->dso. -*/ dsos__add (&maps__machine (kmaps)->dsos, curr_dso); -/* kmaps already got it */ -map__put (curr_map);dso__set_loaded (curr_dso); - *curr_mapp = curr_map; +dso__put (*curr_dsop); *curr_dsop = curr_dso; }else { - *curr_dsop =map__dso (curr_map); -map__put (curr_map); +dso__put (*curr_dsop); + *curr_dsop =dso__get (map__dso (curr_map)); } +map__put (curr_map);return 0 ; }
@@ -1484,8 +1478,7 @@ dso__load_sym_internal(struct dso *dso, struct map *map, struct symsrc *syms_ss, {struct kmap *kmap =dso__kernel (dso) ?map__kmap (map) :NULL ;struct maps *kmaps = kmap ?map__kmaps (map) :NULL ; -struct map *curr_map = map; -struct dso *curr_dso = dso; +struct dso *curr_dso;Elf_Data *symstrs, *secstrs, *secstrs_run, *secstrs_sym;uint32_t nr_syms;int err =-1 ;
@@ -1586,6 +1579,7 @@ dso__load_sym_internal(struct dso *dso, struct map *map, struct symsrc *syms_ss, remap_kernel = true; adjust_kernel_syms =dso__adjust_symbols (dso); } + curr_dso =dso__get (dso);elf_symtab__for_each_symbol (syms, nr_syms, idx, sym) {struct symbol *f;const char *elf_name =elf_sym__name (&sym, symstrs);
@@ -1674,8 +1668,11 @@ dso__load_sym_internal(struct dso *dso, struct map *map, struct symsrc *syms_ss, --sym.st_value;if (dso__kernel (dso)) { -if (dso__process_kernel_symbol (dso, map, &sym, &shdr, kmaps, kmap, &curr_dso, &curr_map, - section_name, adjust_kernel_syms, kmodule, &remap_kernel)) +if (dso__process_kernel_symbol (dso, map, &sym, &shdr, + kmaps, kmap, &curr_dso, + section_name, + adjust_kernel_syms, + kmodule, &remap_kernel)) goto out_elf_end; }else if ((used_opd && runtime_ss->adjust_symbols) || (!used_opd && syms_ss->adjust_symbols)) {
@@ -1724,6 +1721,7 @@ dso__load_sym_internal(struct dso *dso, struct map *map, struct symsrc *syms_ss,__symbols__insert (dso__symbols (curr_dso), f,dso__kernel (dso)); nr++; } +dso__put (curr_dso);/* * For misannotated, zeroed, ASM function sizes.
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 52/53 perf dso: Use container_of to avoid a pointer in dso_data
In reply to Ian RogersThe dso pointer in dso_data is necessary for reference count checking to account for the dso_data forming a global list of open dso's with references to the dso. The dso pointer also allows for the indirection that reference count checking needs. Outside of reference count checking the indirection isn't needed and container_of is more efficient and saves space.
The reference count won't be increased by placing items onto the global list, matching how things were before the reference count checking change, but we assert the dso is in dsos holding it live (and that the set of open dsos is a subset of all dsos for the machine). Update the DSO data tests so that they use a dsos struct to make the invariant true.
--- tools/perf/tests/dso-data.c | 56 +++++++++++++++++-------------------- tools/perf/util/dso.c | 16 ++++++++++- tools/perf/util/dso.h | 2 ++ 3 files changed, 42 insertions(+), 32 deletions(-)
tools/perf/tests/dso-data.c +25 -31
@@ -10,6 +10,7 @@#include <sys/resource.h> #include <api/fs/fs.h> #include "dso.h" +#include "dsos.h" #include "machine.h" #include "symbol.h" #include "tests.h"
@@ -123,9 +124,10 @@ static int test__dso_data(struct test_suite *test __maybe_unused, int subtest __TEST_ASSERT_VAL ("No test file" , file);memset (&machine,0 ,sizeof (machine)); +dsos__init (&machine.dsos); - dso =dso__new ((const char *)file); - + dso =dso__new (file); +TEST_ASSERT_VAL ("Failed to add dso" , !dsos__add (&machine.dsos, dso));TEST_ASSERT_VAL ("Failed to access to dso" ,dso__data_fd (dso, &machine) >=0 );
@@ -170,6 +172,7 @@ static int test__dso_data(struct test_suite *test __maybe_unused, int subtest __ }dso__put (dso); +dsos__exit (&machine.dsos);unlink (file);return 0 ; }
@@ -199,41 +202,31 @@ static long open_files_cnt(void)return nr -1 ; } -static struct dso **dsos; - -static int dsos__create (int cnt,int size) +static int dsos__create (int cnt,int size,struct dsos *dsos) {int i; - dsos =malloc (sizeof (*dsos) * cnt); -TEST_ASSERT_VAL ("failed to alloc dsos array" , dsos); +dsos__init (dsos);for (i =0 ; i < cnt; i++) { -char *file; +char *file =test_file (size); - file =test_file (size);TEST_ASSERT_VAL ("failed to get dso file" , file); - - dsos[i] =dso__new (file); -TEST_ASSERT_VAL ("failed to get dso" , dsos[i]); +TEST_ASSERT_VAL ("failed to get dso" , !dsos__add (dsos,dso__new (file))); }return 0 ; } -static void dsos__delete (int cnt) +static void dsos__delete (struct dsos *dsos) { -int i; - -for (i =0 ; i < cnt; i++) { -struct dso *dso = dsos[i]; +for (unsigned int i =0 ; i < dsos->cnt; i++) { +struct dso *dso = dsos->dsos[i];dso__data_close (dso);unlink (dso__name (dso)); -dso__put (dso); } - -free (dsos); +dsos__exit (dsos); }static int set_fd_limit (int n)
@@ -267,10 +260,10 @@ static int test__dso_data_cache(struct test_suite *test __maybe_unused, int subt/* and this is now our dso open FDs limit */ dso_cnt = limit /2 ;TEST_ASSERT_VAL ("failed to create dsos\n" , - !dsos__create (dso_cnt,TEST_FILE_SIZE )); + !dsos__create (dso_cnt,TEST_FILE_SIZE , &machine.dsos));for (i =0 ; i < (dso_cnt -1 ); i++) { -struct dso *dso = dsos[i]; +struct dso *dso = machine.dsos.dsos[i];/* * Open dsos via dso__data_fd(), it opens the data
@@ -290,17 +283,17 @@ static int test__dso_data_cache(struct test_suite *test __maybe_unused, int subt }/* verify the first one is already open */ -TEST_ASSERT_VAL ("dsos[0] is not open" ,dso__data (dsos[0 ])->fd !=-1 ); +TEST_ASSERT_VAL ("dsos[0] is not open" ,dso__data (machine.dsos.dsos[0 ])->fd !=-1 );/* open +1 dso to reach the allowed limit */ - fd =dso__data_fd (dsos[i], &machine); + fd =dso__data_fd (machine.dsos.dsos[i], &machine);TEST_ASSERT_VAL ("failed to get fd" , fd >0 );/* should force the first one to be closed */ -TEST_ASSERT_VAL ("failed to close dsos[0]" ,dso__data (dsos[0 ])->fd ==-1 ); +TEST_ASSERT_VAL ("failed to close dsos[0]" ,dso__data (machine.dsos.dsos[0 ])->fd ==-1 );/* cleanup everything */ -dsos__delete (dso_cnt); +dsos__delete (&machine.dsos);/* Make sure we did not leak any file descriptor. */ nr_end =open_files_cnt ();
@@ -325,9 +318,9 @@ static int test__dso_data_reopen(struct test_suite *test __maybe_unused, int sublong nr_end, nr =open_files_cnt (), lim =new_limit (3 );int fd, fd_extra; -#define dso_0 (dsos[0]) -#define dso_1 (dsos[1]) -#define dso_2 (dsos[2]) +#define dso_0 (machine.dsos.dsos[0]) +#define dso_1 (machine.dsos.dsos[1]) +#define dso_2 (machine.dsos.dsos[2])/* Rest the internal dso open counter limit. */ reset_fd_limit ();
@@ -347,7 +340,8 @@ static int test__dso_data_reopen(struct test_suite *test __maybe_unused, int subTEST_ASSERT_VAL ("failed to set file limit" , !set_fd_limit ((lim))); -TEST_ASSERT_VAL ("failed to create dsos\n" , !dsos__create (3 ,TEST_FILE_SIZE )); +TEST_ASSERT_VAL ("failed to create dsos\n" , + !dsos__create (3 ,TEST_FILE_SIZE , &machine.dsos));/* open dso_0 */ fd =dso__data_fd (dso_0, &machine);
@@ -386,7 +380,7 @@ static int test__dso_data_reopen(struct test_suite *test __maybe_unused, int sub/* cleanup everything */ close (fd_extra); -dsos__delete (3 ); +dsos__delete (&machine.dsos);/* Make sure we did not leak any file descriptor. */ nr_end =open_files_cnt ();
tools/perf/util/dso.c +15 -1
@@ -496,14 +496,20 @@ static pthread_mutex_t dso__data_open_lock = PTHREAD_MUTEX_INITIALIZER;static void dso__list_add (struct dso *dso) {list_add_tail (&dso__data (dso)->open_entry, &dso__data_open); +#ifdef REFCNT_CHECKING dso__data (dso)->dso =dso__get (dso); +#endif +/* Assume the dso is part of dsos, hence the optional reference count above. */ +assert (dso__dsos (dso)); dso__data_open_cnt++; }static void dso__list_del (struct dso *dso) {list_del_init (&dso__data (dso)->open_entry); +#ifdef REFCNT_CHECKING dso__put (dso__data (dso)->dso); +#endif WARN_ONCE (dso__data_open_cnt <=0 ,"DSO data fd counter out of bounds." ); dso__data_open_cnt--;
@@ -653,9 +659,15 @@ static void close_dso(struct dso *dso)static void close_first_dso (void ) {struct dso_data *dso_data; +struct dso *dso; dso_data = list_first_entry(&dso__data_open, struct dso_data, open_entry); -close_dso (dso_data->dso); +#ifdef REFCNT_CHECKING + dso = dso_data->dso; +#else + dso = container_of(dso_data, struct dso, data); +#endif +close_dso (dso); }static rlim_t get_fd_limit (void )
@@ -1444,7 +1456,9 @@ struct dso *dso__new_id(const char *name, struct dso_id *id) data->fd =-1 ; data->status =DSO_DATA_STATUS_UNKNOWN ;INIT_LIST_HEAD (&data->open_entry); +#ifdef REFCNT_CHECKING data->dso =NULL ;/* Set when on the open_entry list. */ +#endif }return res; }
tools/perf/util/dso.h +2 -0
@@ -147,7 +147,9 @@ struct dso_cache {struct dso_data {struct rb_root cache;struct list_head open_entry; +#ifdef REFCNT_CHECKING struct dso *dso; +#endif int fd;int status;u32 status_seen;
Signature · 1 line
2.42.0.869.gea05f2083d-goog
Ian Rogers
reviewerPATCH v4 53/53 perf env: Avoid recursively taking env->bpf_progs.lock
In reply to Ian RogersAdd variants of perf_env__insert_bpf_prog_info, perf_env__insert_btf and perf_env__find_btf prefixed with __ to indicate the env->bpf_progs.lock is assumed held. Call these variants when the lock is held to avoid recursively taking it and potentially having a thread deadlock with itself.
--- tools/perf/util/bpf-event.c | 8 +++--- tools/perf/util/bpf-event.h | 12 ++++----- tools/perf/util/env.c | 53 +++++++++++++++++++++++-------------- tools/perf/util/env.h | 4 +++ tools/perf/util/header.c | 8 +++--- 5 files changed, 51 insertions(+), 34 deletions(-)
tools/perf/util/bpf-event.c +4 -4
@@ -546,9 +546,9 @@ int evlist__add_bpf_sb_event(struct evlist *evlist, struct perf_env *env)return evlist__add_sb_event (evlist, &attr, bpf_event__sb_cb, env); } -void bpf_event__print_bpf_prog_info (struct bpf_prog_info *info, -struct perf_env *env, -FILE *fp) +void __bpf_event__print_bpf_prog_info (struct bpf_prog_info *info, +struct perf_env *env, +FILE *fp) {__u32 *prog_lens = (__u32 *)(uintptr_t )(info->jited_func_lens);__u64 *prog_addrs = (__u64 *)(uintptr_t )(info->jited_ksyms);
@@ -564,7 +564,7 @@ void bpf_event__print_bpf_prog_info(struct bpf_prog_info *info,if (info->btf_id) {struct btf_node *node; - node =perf_env__find_btf (env, info->btf_id); + node =__perf_env__find_btf (env, info->btf_id);if (node) btf =btf__new ((__u8 *)(node->data), node->data_size);
tools/perf/util/bpf-event.h +6 -6
@@ -33,9 +33,9 @@ struct btf_node {int machine__process_bpf (struct machine *machine,union perf_event *event,struct perf_sample *sample);int evlist__add_bpf_sb_event (struct evlist *evlist,struct perf_env *env); -void bpf_event__print_bpf_prog_info (struct bpf_prog_info *info, -struct perf_env *env, -FILE *fp); +void __bpf_event__print_bpf_prog_info (struct bpf_prog_info *info, +struct perf_env *env, +FILE *fp);#else static inline int machine__process_bpf(struct machine *machine __maybe_unused, union perf_event *event __maybe_unused,
@@ -50,9 +50,9 @@ static inline int evlist__add_bpf_sb_event(struct evlist *evlist __maybe_unused,return 0 ; } -static inline void bpf_event__print_bpf_prog_info (struct bpf_prog_info *info__maybe_unused , -struct perf_env *env__maybe_unused , -FILE *fp__maybe_unused ) +static inline void __bpf_event__print_bpf_prog_info (struct bpf_prog_info *info__maybe_unused , +struct perf_env *env__maybe_unused , +FILE *fp__maybe_unused ) { }
tools/perf/util/env.c +33 -20
115 lines not on this page · raw message
tools/perf/util/env.h +4 -0
@@ -164,12 +164,16 @@ const char *perf_env__raw_arch(struct perf_env *env);int perf_env__nr_cpus_avail (struct perf_env *env);void perf_env__init (struct perf_env *env); +void __perf_env__insert_bpf_prog_info (struct perf_env *env, +struct bpf_prog_info_node *info_node);void perf_env__insert_bpf_prog_info (struct perf_env *env,struct bpf_prog_info_node *info_node);struct bpf_prog_info_node *perf_env__find_bpf_prog_info (struct perf_env *env,__u32 prog_id);bool perf_env__insert_btf (struct perf_env *env,struct btf_node *btf_node); +bool __perf_env__insert_btf (struct perf_env *env,struct btf_node *btf_node);struct btf_node *perf_env__find_btf (struct perf_env *env,__u32 btf_id); +struct btf_node *__perf_env__find_btf (struct perf_env *env,__u32 btf_id);int perf_env__numa_node (struct perf_env *env,struct perf_cpu cpu); char *perf_env__find_pmu_cap(struct perf_env *env, const char *pmu_name,
tools/perf/util/header.c +4 -4
@@ -1848,8 +1848,8 @@ static void print_bpf_prog_info(struct feat_fd *ff, FILE *fp) node = rb_entry(next, struct bpf_prog_info_node, rb_node); next =rb_next (&node->rb_node); -bpf_event__print_bpf_prog_info (&node->info_linear->info, - env, fp); +__bpf_event__print_bpf_prog_info (&node->info_linear->info, + env, fp); }up_read (&env->bpf_progs.lock);
@@ -3179,7 +3179,7 @@ static int process_bpf_prog_info(struct feat_fd *ff, void *data __maybe_unused)/* after reading from file, translate offset to address */ bpil_offs_to_addr (info_linear); info_node->info_linear = info_linear; -perf_env__insert_bpf_prog_info (env, info_node); +__perf_env__insert_bpf_prog_info (env, info_node); }up_write (&env->bpf_progs.lock);
@@ -3226,7 +3226,7 @@ static int process_bpf_btf(struct feat_fd *ff, void *data __maybe_unused)if (__do_read (ff, node->data, data_size)) goto out; -perf_env__insert_btf (env, node); +__perf_env__insert_btf (env, node); node =NULL ; }
Signature · 1 line
2.42.0.869.gea05f2083d-goog