From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Marco Elver <elver@google.com>
Cc: Bart Van Assche <bvanassche@acm.org>,
Jiri Olsa <jolsa@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
James Clark <james.clark@linaro.org>,
Weilin Wang <weilin.wang@intel.com>,
linux-perf-users@vger.kernel.org, llvm@lists.linux.dev,
bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
Ian Rogers <irogers@google.com>
Subject: [PATCH v14 09/23] perf dsos: Ensure DSOs in auxtrace, machine, and symbol are in dsos
Date: Tue, 17 Nov 2026 10:48:30 -0800 [thread overview]
Message-ID: <20261117184844.99889-10-irogers@google.com> (raw)
In-Reply-To: <20261117184844.99889-1-irogers@google.com>
Place the DSOs created in addr_filter__resolve_syms(),
machine__process_ksymbol_register(), and maps__split_kallsyms() into a
dsos collection so that all DSOs that may have data fds opened or be
referenced by maps belong to a dsos collection.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/auxtrace.c | 16 +++++++++++++---
tools/perf/util/machine.c | 4 ++++
tools/perf/util/symbol.c | 4 ++++
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index 8bb491d389a2..1451de019df0 100644
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -29,6 +29,7 @@
#include "config.h"
#include "evlist.h"
#include "dso.h"
+#include "dsos.h"
#include "map.h"
#include "pmu.h"
#include "evsel.h"
@@ -2684,7 +2685,7 @@ static int addr_filter__resolve_kernel_syms(struct addr_filter *filt)
return 0;
}
-static struct dso *load_dso(const char *name)
+static struct dso *load_dso(const char *name, struct dsos *dsos)
{
struct map *map;
struct dso *dso;
@@ -2693,6 +2694,11 @@ static struct dso *load_dso(const char *name)
if (!map)
return NULL;
+ if (dsos__add(dsos, map__dso(map))) {
+ map__put(map);
+ return NULL;
+ }
+
if (map__load(map) < 0)
pr_err("File '%s' not found or has no symbols.\n", name);
@@ -2794,6 +2800,7 @@ static int addr_filter__resolve_syms(struct addr_filter *filt)
{
u64 start, size;
struct dso *dso;
+ struct dsos dsos;
int err = 0;
if (!filt->sym_from && !filt->sym_to)
@@ -2802,9 +2809,11 @@ static int addr_filter__resolve_syms(struct addr_filter *filt)
if (!filt->filename)
return addr_filter__resolve_kernel_syms(filt);
- dso = load_dso(filt->filename);
+ dsos__init(&dsos);
+ dso = load_dso(filt->filename, &dsos);
if (!dso) {
pr_err("Failed to load symbols from: %s\n", filt->filename);
+ dsos__exit(&dsos);
return -EINVAL;
}
@@ -2831,13 +2840,14 @@ static int addr_filter__resolve_syms(struct addr_filter *filt)
err = check_end_after_start(filt, start, size);
if (err)
- return err;
+ goto put_dso;
filt->size = start + size - filt->addr;
}
put_dso:
dso__put(dso);
+ dsos__exit(&dsos);
return err;
}
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 4a3461d79593..02711995f0b6 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -797,6 +797,10 @@ static int machine__process_ksymbol_register(struct machine *machine,
dso__set_long_name(dso, "", false);
}
+ err = dsos__add(&machine->dsos, dso);
+ if (err)
+ goto out;
+
map__set_start(map, event->ksymbol.addr);
map__set_end(map, map__start(map) + event->ksymbol.len);
err = maps__fixup_overlap_and_insert(machine__kernel_maps(machine), map);
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index dc70bbe8514f..a7079381fae1 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1090,6 +1090,10 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,
dso__set_symtab_type(ndso, DSO_BINARY_TYPE__KALLSYMS);
}
dso__set_loaded(ndso);
+ if (dsos__add(&machine->dsos, ndso)) {
+ dso__put(ndso);
+ return -1;
+ }
curr_map = map__new2(pos->start, ndso);
if (curr_map == NULL) {
--
2.56.1.703.gf848ed807c-goog
next prev parent reply other threads:[~2026-11-17 18:49 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 18:48 [PATCH v14 00/23] tools/perf: Adopt kernel compiler-context-analysis.h annotations Ian Rogers
2026-11-17 18:48 ` [PATCH v14 01/23] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias() Ian Rogers
2026-11-17 18:53 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 02/23] tools headers compiler: Synchronize compiler_types.h with the kernel sources Ian Rogers
2026-11-17 18:56 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 03/23] tools headers: Synchronize linux/compiler-context-analysis.h " Ian Rogers
2026-11-17 18:54 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 04/23] perf mutex: Use kernel style compiler-context-analysis.h annotations Ian Rogers
2026-11-17 19:03 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 05/23] perf build: Enable additional Clang thread-safety flags Ian Rogers
2026-11-17 19:02 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 06/23] perf comm: Add __guarded_by annotations to struct comm_strs Ian Rogers
2026-11-17 18:53 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 07/23] perf vdso: Fix unlocked __dsos__add() and race in __machine__addnew_vdso() Ian Rogers
2026-11-17 18:56 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 08/23] perf dsos: Skip BPF and OOL DSOs in dsos__find_kernel_dso() Ian Rogers
2026-11-17 19:05 ` sashiko-bot
2026-11-17 18:48 ` Ian Rogers [this message]
2026-11-17 19:09 ` [PATCH v14 09/23] perf dsos: Ensure DSOs in auxtrace, machine, and symbol are in dsos sashiko-bot
2026-11-17 18:48 ` [PATCH v14 10/23] perf dso: Pass dso_data to close_data_fd() and dso__list_del() Ian Rogers
2026-11-17 18:56 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 11/23] perf dso: Use DEFINE_MUTEX for dso__data_open_lock Ian Rogers
2026-11-17 18:52 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 12/23] perf dsos: Use read lock fast path in dsos__findnew_id() Ian Rogers
2026-11-17 18:59 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 13/23] perf dso: Expand context analysis annotations Ian Rogers
2026-11-17 18:55 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 14/23] perf thread: Expand context analysis annotations to threads and namespaces_lock Ian Rogers
2026-11-17 18:56 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 15/23] perf intel-tpebs: Fix race in tpebs_stop() and tpebs_cmd.out fd handling Ian Rogers
2026-11-17 19:08 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 16/23] perf intel-tpebs: Use DEFINE_MUTEX for tpebs_mtx and add lock annotations Ian Rogers
2026-11-17 18:55 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 17/23] perf config: Add __guarded_by and __must_hold annotations Ian Rogers
2026-11-17 18:56 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 18/23] perf env: " Ian Rogers
2026-11-17 19:12 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 19/23] perf maps: Fix lock inversion in maps__load_first() Ian Rogers
2026-11-17 19:07 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 20/23] perf maps: Fix map index lookup fallback and removal Ian Rogers
2026-11-17 19:03 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 21/23] perf maps: Add context analysis annotations Ian Rogers
2026-11-17 19:04 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 22/23] perf machine: Hold machines->lock for remaining guests rbtree accesses Ian Rogers
2026-11-17 19:03 ` sashiko-bot
2026-11-17 18:48 ` [PATCH v14 23/23] perf machine: Add __guarded_by annotation to machines->guests Ian Rogers
2026-11-17 19:00 ` sashiko-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117184844.99889-10-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=bpf@vger.kernel.org \
--cc=bvanassche@acm.org \
--cc=elver@google.com \
--cc=james.clark@linaro.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=weilin.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox