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 13/23] perf dso: Expand context analysis annotations
Date: Tue, 17 Nov 2026 10:48:34 -0800 [thread overview]
Message-ID: <20261117184844.99889-14-irogers@google.com> (raw)
In-Reply-To: <20261117184844.99889-1-irogers@google.com>
Annotate struct dsos fields with __guarded_by(&lock), annotate
dso__data_open and fd_limit in util/dso.c with
__guarded_by(&dso__data_open_lock), and tighten __dsos__findnew_id() and
__dsos__addnew_id() from shared to exclusive lock requirements.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/tests/dso-data.c | 4 ++++
tools/perf/util/dso.c | 14 +++++++++-----
tools/perf/util/dsos.c | 9 +++++++--
tools/perf/util/dsos.h | 10 +++++-----
tools/perf/util/vdso.c | 1 +
5 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/tools/perf/tests/dso-data.c b/tools/perf/tests/dso-data.c
index 18b7052a2dc5..6ef59929e6c0 100644
--- a/tools/perf/tests/dso-data.c
+++ b/tools/perf/tests/dso-data.c
@@ -116,12 +116,14 @@ static int dso__data_fd(struct dso *dso, struct machine *machine)
static void dsos__delete(struct dsos *dsos)
{
+ down_write(&dsos->lock);
for (unsigned int i = 0; i < dsos->cnt; i++) {
struct dso *dso = dsos->dsos[i];
dso__data_close(dso);
unlink(dso__name(dso));
}
+ up_write(&dsos->lock);
dsos__exit(dsos);
}
@@ -254,6 +256,7 @@ static int set_fd_limit(int n)
}
static int test__dso_data_cache(struct test_suite *test __maybe_unused, int subtest __maybe_unused)
+ __context_unsafe(/* single-threaded test */)
{
struct machine machine;
long nr_end, nr = open_files_cnt();
@@ -324,6 +327,7 @@ static long new_limit(int count)
}
static int test__dso_data_reopen(struct test_suite *test __maybe_unused, int subtest __maybe_unused)
+ __context_unsafe(/* single-threaded test */)
{
struct machine machine;
long nr_end, nr = open_files_cnt(), lim = new_limit(3);
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 1c938d1b11e9..49813424e4ee 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -525,7 +525,8 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,
* Global list of open DSOs and the counter.
*/
DEFINE_MUTEX(dso__data_open_lock);
-static LIST_HEAD(dso__data_open);
+static struct list_head dso__data_open __guarded_by(&dso__data_open_lock) =
+ LIST_HEAD_INIT(dso__data_open);
static long dso__data_open_cnt __guarded_by(&dso__data_open_lock);
static void dso__list_add(struct dso *dso) __must_hold(&dso__data_open_lock)
@@ -757,7 +758,7 @@ static rlim_t get_fd_limit(void)
return limit;
}
-static rlim_t fd_limit;
+static rlim_t fd_limit __guarded_by(&dso__data_open_lock);
/*
* Used only by tests/dso-data.c to reset the environment
@@ -766,7 +767,8 @@ static rlim_t fd_limit;
*/
void reset_fd_limit(void)
{
- fd_limit = 0;
+ /* Only called by single-threaded test setup. */
+ context_unsafe(fd_limit = 0);
}
static bool may_cache_fd(void) __must_hold(&dso__data_open_lock)
@@ -1726,8 +1728,10 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id)
changed = true;
}
}
- if (changed && dsos)
- dsos->sorted = false;
+ if (changed && dsos) {
+ /* dsos write lock held by caller. */
+ context_unsafe(dsos->sorted = false);
+ }
}
int dso_id__cmp(const struct dso_id *a, const struct dso_id *b)
diff --git a/tools/perf/util/dsos.c b/tools/perf/util/dsos.c
index 4ff38cb5e2cb..7a56577f4ec8 100644
--- a/tools/perf/util/dsos.c
+++ b/tools/perf/util/dsos.c
@@ -12,6 +12,7 @@
#include <unistd.h>
void dsos__init(struct dsos *dsos)
+ __context_unsafe(/* initialization */)
{
init_rwsem(&dsos->lock);
@@ -50,6 +51,7 @@ void dsos__exit(struct dsos *dsos)
static int __dsos__for_each_dso(struct dsos *dsos,
int (*cb)(struct dso *dso, void *data),
void *data)
+ __must_hold_shared(&dsos->lock)
{
for (unsigned int i = 0; i < dsos->cnt; i++) {
struct dso *dso = dsos->dsos[i];
@@ -182,7 +184,8 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos,
}
qsort(dsos->dsos, dsos->cnt, sizeof(struct dso *),
dsos__cmp_long_name_id_short_name);
- dsos->sorted = true;
+ /* write_locked is true, so dsos->lock is held exclusively. */
+ context_unsafe(dsos->sorted = true);
}
res = bsearch(&key, dsos->dsos, dsos->cnt, sizeof(struct dso *),
@@ -194,6 +197,7 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos,
}
int __dsos__add(struct dsos *dsos, struct dso *dso)
+ __must_hold(&dsos->lock)
{
if (!dso)
return -EINVAL;
@@ -320,6 +324,7 @@ static void dso__set_basename(struct dso *dso)
}
static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, const struct dso_id *id)
+ __must_hold(&dsos->lock)
{
struct dso *dso = dso__new_id(name, id);
@@ -336,7 +341,7 @@ static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, const
}
static struct dso *__dsos__findnew_id(struct dsos *dsos, const char *name, const struct dso_id *id)
- __must_hold_shared(&dsos->lock)
+ __must_hold(&dsos->lock)
{
struct dso *dso = __dsos__find_id(dsos, name, id, false, /*write_locked=*/true);
diff --git a/tools/perf/util/dsos.h b/tools/perf/util/dsos.h
index dbd06f420753..cc7e3a42f9cb 100644
--- a/tools/perf/util/dsos.h
+++ b/tools/perf/util/dsos.h
@@ -19,16 +19,16 @@ struct machine;
*/
struct dsos {
struct rw_semaphore lock;
- struct dso **dsos;
- unsigned int cnt;
- unsigned int allocated;
- bool sorted;
+ struct dso **dsos __pt_guarded_by(&lock) __guarded_by(&lock);
+ unsigned int cnt __guarded_by(&lock);
+ unsigned int allocated __guarded_by(&lock);
+ bool sorted __guarded_by(&lock);
};
void dsos__init(struct dsos *dsos);
void dsos__exit(struct dsos *dsos);
-int __dsos__add(struct dsos *dsos, struct dso *dso);
+int __dsos__add(struct dsos *dsos, struct dso *dso) __must_hold(&dsos->lock);
int dsos__add(struct dsos *dsos, struct dso *dso);
struct dso *__dsos__find(struct dsos *dsos, const char *name, bool cmp_short, bool write_locked)
__must_hold_shared(&dsos->lock);
diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c
index 8bf81e2c9e78..fe28e346dc2f 100644
--- a/tools/perf/util/vdso.c
+++ b/tools/perf/util/vdso.c
@@ -126,6 +126,7 @@ void machine__exit_vdso(struct machine *machine)
static struct dso *__machine__addnew_vdso(struct machine *machine, const char *short_name,
const char *long_name)
+ __must_hold(&machine->dsos.lock)
{
struct dso *dso;
--
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 ` [PATCH v14 09/23] perf dsos: Ensure DSOs in auxtrace, machine, and symbol are in dsos Ian Rogers
2026-11-17 19:09 ` 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 ` Ian Rogers [this message]
2026-11-17 18:55 ` [PATCH v14 13/23] perf dso: Expand context analysis annotations 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-14-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 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.