From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.199 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792602718; b=3wyfVOHnPHfRZ2YIJRMYW13NHlU4UwJxnrFxf5tI0HPMf21dGFT1FHV8TzjRlXYYxzRT baVCrVmQuoYRWmTFSVZBsAfUXbyAySASO0dtOpZiuS1vUFwRhTmzFbsFBzsllHfZ1ZhXU EAkHptqEUAwArLHP/M3m0cVk6Mv/Cfb2S0A1HlIqAv2xFs/PmOBGBvKtQWJNYHz1oRdQT srP6sj/u+aos1YltxY1vX+P+RjjbjWIbHLA/Sjp0jqKo/gVuni3ftljoL724HYUHQiJF6 dw3mqETzDH2sKDd6KfwlS6B2SJfF09yykbwh5E7VPBJNGCA9pBFAIcCxUC81c8fe9Pw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792602718; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=r4xZM05fPg6K3mxtPAQZIFHOn//K/uz75vM+M83u43k=; b=2NolGgAn9slYvVzdbeha3BMiJIFgSiQqx4ZsiWz79d1Tp3gSOhrmspatQafqrYf85NC3 7p3KjezHKytJcGnGzdnn5bjdPgpio/U6gYfYgXuNVejitRIIiY+CuG/g9AYJTg9oxn90N ct6EvXdv1l8EJzLqEhAXAr26Y3coXn1NZQNSoaFl7t2HYV5a6mMMwbID9wghmSDW56UDG urZ+bivjkIdoyVyNkS57MSlrMxQLkNAoCf7RId9BFhX2vqNLkfoO/Mc0w9Yi01YD0xFTW iv9ijK55pt2awfTYkMBXe/eP2qg8DJ+qY2DWNew60elDIzAYijXT4G7gMky5UwO8Ljw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20251104 header.b=CzfLza6t; arc=none smtp.remote-ip=74.125.82.199 Received: from mail-dy1-f199.google.com (mail-dy1-f199.google.com [74.125.82.199]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D08860A263A for ; Wed, 21 Oct 2026 17:11:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 4D08860A263A Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20251104 header.b=CzfLza6t Received: by mail-dy1-f199.google.com with SMTP id 5a478bee46e88-359b81ad4e8so1628515eec.0 for ; Wed, 21 Oct 2026 10:11:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1792602716; x=1793207516; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=r4xZM05fPg6K3mxtPAQZIFHOn//K/uz75vM+M83u43k=; b=CzfLza6tx4tnwrHmYQwigEETm35MeNACJAfYxPGnDM6PzBjLx9SqLj7nNzTD9A/H0P YVpuYU40fIVesoWurui+jbmgyYEVeWcTxjYxWF7ojolb9iFI6na7CR7hq52ggYXpFAqG EwPT+Ilchr5DTQabmOFr3t9xRj08aIEu714VWDkqdDnHo7nOg1NfAqROTgAMwo4P/YY0 Bh9leRx1pqrbJ7RT5ibiDKovEWvC2QJ++MjNjBkJ6iQxXHLMN8u9+0VEsr/0JSuIRI// rW0kpWDxT2qGu+7xvGJVJx4z9YmFFsVHwbCRlxSLu8mPxpgwXK/+sxfNtmkWTk/qK7ab l/uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792602716; x=1793207516; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=r4xZM05fPg6K3mxtPAQZIFHOn//K/uz75vM+M83u43k=; b=xMFtDRDtKlUYT5ycxUuT/YIbXy8rmFgFLK/6j6umvAr3dhIBe4yFBI5MbO8X7R08K9 sDvAcNX18YpUhJsag1rRNr9UN7Q3BePVU4eWD7eyEPzyjouegBS6JuQMyNRU4blSfDJF yKfPBxUyAETxsS7wWqmY7vlXxh9abYwk9/VO7cIIiKBpvooroZpbB7azKO+R4kZ4ICR/ Hp4elUg2VsnUqQSYHRH8Uha/gwJ65Rd4vYTWeFnqbEYr/OqceDnZuJSSuSWXEenfMXLC ASTS2tD04+G1ovvp/l53e3xIYHqFEwaiswNUZDcRpNhtfIdejjlCfCqRDeqw6BLFFWwq QoAg== X-Forwarded-Encrypted: i=1; AKwUvBzRr5DXT/AyaXn3ctWdg5YQ4M3pVCKINSwpqABaka4bVXUXQq4lU5HD86E9NfP86hvZG0HmgyFyARNshas=@vger.kernel.org X-Gm-Message-State: AFq9FYJeRcVoeACQvho5KHSsvJ0b3xwLSEfBtajh8sDCQzLNmK8zDUTG 5gaGVTb3io2IXxdvDFbYsTtEgo84e2s1bDnJgXVMWrsvnrKC+8n+4SfpyiODp8PPVnzgdtrA1dn jaFXhUdDrJg== X-Received: from dldnz13.prod.google.com ([2002:a05:701a:ca0d:b0:168:9e52:72b9]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:701b:4344:b0:187:c940:21b7 with SMTP id a92af1059eb24-190a44718a7mr3193890c88.9.1792602715990; Wed, 21 Oct 2026 10:11:55 -0700 (PDT) Date: Wed, 21 Oct 2026 10:10:37 -0700 In-Reply-To: <20261021171044.155240-1-irogers@google.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261020163640.746159-1-irogers@google.com> <20261021171044.155240-1-irogers@google.com> X-Mailer: git-send-email 2.56.0.218.g1ec904b173-goog Message-ID: <20261021171044.155240-12-irogers@google.com> Subject: [PATCH v6 11/17] perf dso: Expand context analysis annotations From: Ian Rogers To: irogers@google.com, acme@kernel.org, elver@google.com, namhyung@kernel.org Cc: adrian.hunter@intel.com, james.clark@linaro.org, jolsa@kernel.org, justinstitt@google.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, ljs@kernel.org, llvm@lists.linux.dev, mingo@redhat.com, morbo@google.com, nathan@kernel.org, ndesaulniers@google.com, peterz@infradead.org Content-Type: text/plain; charset="UTF-8" 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 --- tools/perf/tests/dso-data.c | 4 ++++ tools/perf/util/dso.c | 14 +++++++++----- tools/perf/util/dsos.c | 10 ++++++++-- tools/perf/util/dsos.h | 13 +++++++------ tools/perf/util/vdso.c | 1 + 5 files changed, 29 insertions(+), 13 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 4dc518f7cb7d..5f4b4cd9a089 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) @@ -1723,8 +1725,10 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id) dso_id->build_id = id->build_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 b5c8086941d5..f8e4395d9b1b 100644 --- a/tools/perf/util/dsos.c +++ b/tools/perf/util/dsos.c @@ -12,6 +12,7 @@ #include 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; @@ -285,6 +289,7 @@ static struct dso *__dsos__find_id(struct dsos *dsos, const char *name, const st } struct dso *__dsos__find(struct dsos *dsos, const char *name, bool cmp_short, bool write_locked) + __must_hold_shared(&dsos->lock) { return __dsos__find_id(dsos, name, &dso_id_empty, cmp_short, write_locked); } @@ -319,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); @@ -335,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 857a79fd8805..cc7e3a42f9cb 100644 --- a/tools/perf/util/dsos.h +++ b/tools/perf/util/dsos.h @@ -19,18 +19,19 @@ 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); +struct dso *__dsos__find(struct dsos *dsos, const char *name, bool cmp_short, bool write_locked) + __must_hold_shared(&dsos->lock); struct dso *dsos__find(struct dsos *dsos, const char *name, bool cmp_short); struct dso *dsos__findnew_id(struct dsos *dsos, const char *name, const struct dso_id *id); diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c index 93828e660672..fc75c0cf372f 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.0.218.g1ec904b173-goog