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>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Bill Wendling <morbo@google.com>,
Justin Stitt <justinstitt@google.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 v15 12/23] perf dsos: Use read lock fast path in dsos__findnew_id()
Date: Fri, 20 Nov 2026 22:58:01 -0800 [thread overview]
Message-ID: <20261121065813.4143649-13-irogers@google.com> (raw)
In-Reply-To: <20261121065813.4143649-1-irogers@google.com>
In dsos__findnew_id(), try finding the DSO under the read lock first and
only acquire the write lock when a new DSO must be inserted or an
existing DSO needs its ID updated (checked via dso__needs_improve_id()).
Prioritize build IDs over inode fields in dso__needs_improve_id() and
__dso__improve_id() so an existing DSO with a defined build ID is not
updated with inode metadata.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/dso.c | 45 +++++++++++++++++++++++++++++-------------
tools/perf/util/dso.h | 1 +
tools/perf/util/dsos.c | 10 ++++++++++
3 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 5be5d224b246..1c938d1b11e9 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -1685,6 +1685,20 @@ const struct dso_id dso_id_empty = {
}
};
+bool dso__needs_improve_id(const struct dso *dso, const struct dso_id *id)
+{
+ const struct dso_id *dso_id = dso__id_const(dso);
+
+ if (!id || build_id__is_defined(&dso_id->build_id))
+ return false;
+
+ if (build_id__is_defined(&id->build_id))
+ return true;
+
+ return (id->mmap2_valid && !dso_id->mmap2_valid) ||
+ (id->mmap2_ino_generation_valid && !dso_id->mmap2_ino_generation_valid);
+}
+
void __dso__improve_id(struct dso *dso, const struct dso_id *id)
{
struct dsos *dsos = dso__dsos(dso);
@@ -1692,22 +1706,25 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id)
bool changed = false;
/* dsos write lock held by caller. */
+ if (!id || build_id__is_defined(&dso_id->build_id))
+ return;
- if (id->mmap2_valid && !dso_id->mmap2_valid) {
- dso_id->maj = id->maj;
- dso_id->min = id->min;
- dso_id->ino = id->ino;
- dso_id->mmap2_valid = true;
- changed = true;
- }
- if (id->mmap2_ino_generation_valid && !dso_id->mmap2_ino_generation_valid) {
- dso_id->ino_generation = id->ino_generation;
- dso_id->mmap2_ino_generation_valid = true;
- changed = true;
- }
- if (build_id__is_defined(&id->build_id) && !build_id__is_defined(&dso_id->build_id)) {
+ if (build_id__is_defined(&id->build_id)) {
dso_id->build_id = id->build_id;
changed = true;
+ } else {
+ if (id->mmap2_valid && !dso_id->mmap2_valid) {
+ dso_id->maj = id->maj;
+ dso_id->min = id->min;
+ dso_id->ino = id->ino;
+ dso_id->mmap2_valid = true;
+ changed = true;
+ }
+ if (id->mmap2_ino_generation_valid && !dso_id->mmap2_ino_generation_valid) {
+ dso_id->ino_generation = id->ino_generation;
+ dso_id->mmap2_ino_generation_valid = true;
+ changed = true;
+ }
}
if (changed && dsos)
dsos->sorted = false;
@@ -1715,7 +1732,7 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id)
int dso_id__cmp(const struct dso_id *a, const struct dso_id *b)
{
- if (a == &dso_id_empty || b == &dso_id_empty) {
+ if (!a || !b || a == &dso_id_empty || b == &dso_id_empty) {
/* There is no valid data to compare so the comparison always returns identical. */
return 0;
}
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index e8cd13c101a6..bb887d10a9ee 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -802,6 +802,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);
+bool dso__needs_improve_id(const struct dso *dso, const struct dso_id *id);
void __dso__improve_id(struct dso *dso, const struct dso_id *id);
int dso__name_len(const struct dso *dso);
diff --git a/tools/perf/util/dsos.c b/tools/perf/util/dsos.c
index a7f6a98acbaf..4ff38cb5e2cb 100644
--- a/tools/perf/util/dsos.c
+++ b/tools/perf/util/dsos.c
@@ -349,6 +349,16 @@ static struct dso *__dsos__findnew_id(struct dsos *dsos, const char *name, const
struct dso *dsos__findnew_id(struct dsos *dsos, const char *name, const struct dso_id *id)
{
struct dso *dso;
+
+ down_read(&dsos->lock);
+ dso = __dsos__find_id(dsos, name, id, false, /*write_locked=*/false);
+ if (dso && !dso__needs_improve_id(dso, id)) {
+ up_read(&dsos->lock);
+ return dso;
+ }
+ up_read(&dsos->lock);
+ dso__put(dso);
+
down_write(&dsos->lock);
dso = __dsos__findnew_id(dsos, name, id);
up_write(&dsos->lock);
--
2.56.1.750.gf70dc682cf-goog
next prev parent reply other threads:[~2026-11-21 6:59 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-21 6:57 [PATCH v15 00/23] tools/perf: Adopt kernel compiler-context-analysis.h annotations Ian Rogers
2026-11-21 6:57 ` [PATCH v15 01/23] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias() Ian Rogers
2026-11-21 6:57 ` [PATCH v15 02/23] tools headers compiler: Synchronize compiler_types.h with the kernel sources Ian Rogers
2026-11-21 6:57 ` [PATCH v15 03/23] tools headers: Synchronize linux/compiler-context-analysis.h " Ian Rogers
2026-11-21 6:57 ` [PATCH v15 04/23] perf mutex: Use kernel style compiler-context-analysis.h annotations Ian Rogers
2026-11-21 6:57 ` [PATCH v15 05/23] perf build: Enable context analysis and Clang thread-safety flags Ian Rogers
2026-11-21 6:57 ` [PATCH v15 06/23] perf comm: Add __guarded_by annotations to struct comm_strs Ian Rogers
2026-11-21 6:57 ` [PATCH v15 07/23] perf vdso: Fix unlocked __dsos__add() and race in __machine__addnew_vdso() Ian Rogers
2026-11-21 6:57 ` [PATCH v15 08/23] perf dsos: Skip BPF and OOL DSOs in dsos__find_kernel_dso() Ian Rogers
2026-11-21 6:57 ` [PATCH v15 09/23] perf dsos: Ensure DSOs in auxtrace, machine, and symbol are in dsos Ian Rogers
2026-11-21 6:57 ` [PATCH v15 10/23] perf dso: Pass dso_data to close_data_fd() and dso__list_del() Ian Rogers
2026-11-21 6:58 ` [PATCH v15 11/23] perf dso: Use DEFINE_MUTEX for dso__data_open_lock Ian Rogers
2026-11-21 6:58 ` Ian Rogers [this message]
2026-11-21 6:58 ` [PATCH v15 13/23] perf dso: Expand context analysis annotations Ian Rogers
2026-11-21 6:58 ` [PATCH v15 14/23] perf thread: Expand context analysis annotations to threads and namespaces_lock Ian Rogers
2026-11-21 6:58 ` [PATCH v15 15/23] perf intel-tpebs: Fix race in tpebs_stop() and tpebs_cmd.out fd handling Ian Rogers
2026-11-21 6:58 ` [PATCH v15 16/23] perf intel-tpebs: Use DEFINE_MUTEX for tpebs_mtx and add lock annotations Ian Rogers
2026-11-21 6:58 ` [PATCH v15 17/23] perf config: Add __guarded_by and __must_hold annotations Ian Rogers
2026-11-21 6:58 ` [PATCH v15 18/23] perf env: " Ian Rogers
2026-11-21 6:58 ` [PATCH v15 19/23] perf maps: Remove unused maps__load_first() Ian Rogers
2026-11-21 6:58 ` [PATCH v15 20/23] perf maps: Fix map index lookup fallback and removal Ian Rogers
2026-11-21 6:58 ` [PATCH v15 21/23] perf maps: Add context analysis annotations Ian Rogers
2026-11-21 6:58 ` [PATCH v15 22/23] perf machine: Hold machines->lock for remaining guests rbtree accesses Ian Rogers
2026-11-21 6:58 ` [PATCH v15 23/23] perf machine: Add __guarded_by annotation to machines->guests Ian Rogers
2026-11-21 7:15 ` [PATCH v15 00/23] tools/perf: Adopt kernel compiler-context-analysis.h annotations 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=20261121065813.4143649-13-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=justinstitt@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=mingo@redhat.com \
--cc=morbo@google.com \
--cc=namhyung@kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.