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 17/23] perf config: Add __guarded_by and __must_hold annotations
Date: Fri, 20 Nov 2026 22:58:06 -0800 [thread overview]
Message-ID: <20261121065813.4143649-18-irogers@google.com> (raw)
In-Reply-To: <20261121065813.4143649-1-irogers@google.com>
Add __guarded_by() and __must_hold() annotations to static parser and
config state in util/config.c.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/config.c | 47 +++++++++++++++++++++++++---------------
1 file changed, 29 insertions(+), 18 deletions(-)
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 287401f159e6..0e6b77a0a5e7 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -64,15 +64,29 @@ struct perf_stat_config stat_config = {
char buildid_dir[MAXPATHLEN]; /* root dir for buildid, binary cache */
-static FILE *config_file;
-static const char *config_file_name;
-static int config_linenr;
-static int config_file_eof;
-static struct perf_config_set *config_set;
+/* Parsing and rewriting share the static parser state. */
+static DEFINE_MUTEX(config_mutex);
+
+/* Serializes whole perf_config__set_variable() updates. */
+static DEFINE_MUTEX(config_update_mutex);
+
+/*
+ * Protects the global config_set. Separate from config_mutex because
+ * initializing config_set parses the config files, which acquires
+ * config_mutex.
+ */
+static DEFINE_MUTEX(config_set_mutex);
+
+static FILE *config_file __guarded_by(&config_mutex);
+static const char *config_file_name __guarded_by(&config_mutex);
+static int config_linenr __guarded_by(&config_mutex);
+static int config_file_eof __guarded_by(&config_mutex);
+static struct perf_config_set *config_set __guarded_by(&config_set_mutex);
const char *config_exclusive_filename;
static int get_next_char(void)
+ __must_hold(&config_mutex)
{
int c;
FILE *f;
@@ -99,8 +113,9 @@ static int get_next_char(void)
}
static char *parse_value(void)
+ __must_hold(&config_mutex)
{
- static char value[1024];
+ static char value[1024] __guarded_by(&config_mutex);
int quote = 0, comment = 0, space = 0;
size_t len = 0;
@@ -170,6 +185,7 @@ static inline int iskeychar(int c)
}
static int get_value(config_fn_t fn, void *data, char *name, unsigned int len)
+ __must_hold(&config_mutex)
{
int c;
char *value;
@@ -201,6 +217,7 @@ static int get_value(config_fn_t fn, void *data, char *name, unsigned int len)
}
static int get_extended_base_var(char *name, int baselen, int c)
+ __must_hold(&config_mutex)
{
do {
if (c == '\n')
@@ -237,6 +254,7 @@ static int get_extended_base_var(char *name, int baselen, int c)
}
static int get_base_var(char *name)
+ __must_hold(&config_mutex)
{
int baselen = 0;
@@ -257,10 +275,11 @@ static int get_base_var(char *name)
}
static int perf_parse_file(config_fn_t fn, void *data)
+ __must_hold(&config_mutex)
{
int comment = 0;
int baselen = 0;
- static char var[MAXNAME];
+ static char var[MAXNAME] __guarded_by(&config_mutex);
/* U+FEFF Byte Order Mark in UTF8 */
static const unsigned char *utf8_bom = (unsigned char *) "\xef\xbb\xbf";
@@ -549,12 +568,6 @@ int perf_default_config(const char *var, const char *value,
return 0;
}
-/* Parsing and rewriting share the static parser state. */
-static DEFINE_MUTEX(config_mutex);
-
-/* Serializes whole perf_config__set_variable() updates. */
-static DEFINE_MUTEX(config_update_mutex);
-
static int perf_config_from_file(config_fn_t fn, const char *filename, void *data)
{
int ret;
@@ -737,6 +750,7 @@ static int set_value(struct perf_config_item *item, const char *value)
static int collect_config(const char *var, const char *value,
void *perf_config_set)
+ __must_hold(&config_mutex)
{
int ret = -1;
char *ptr, *key;
@@ -853,11 +867,8 @@ struct perf_config_set *perf_config_set__load_file(const char *file)
return set;
}
-/* Not config_mutex: building the set parses the config files, which takes it. */
-static DEFINE_MUTEX(config_set_mutex);
-
-/* Called with config_set_mutex held. */
static int perf_config__init(void)
+ __must_hold(&config_set_mutex)
{
if (config_set == NULL)
config_set = perf_config_set__new();
@@ -975,7 +986,7 @@ int perf_config__set_variable(const char *var, const char *value)
/* Static: the parser publishes it as config_file_name. */
{
- static char path[PATH_MAX];
+ static char path[PATH_MAX] __guarded_by(&config_update_mutex);
char *user_config = mkpath(path, sizeof(path), "%s/.perfconfig", getenv("HOME"));
config_filename = config_exclusive_filename ?: user_config;
--
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 ` [PATCH v15 12/23] perf dsos: Use read lock fast path in dsos__findnew_id() Ian Rogers
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 ` Ian Rogers [this message]
2026-11-21 6:58 ` [PATCH v15 18/23] perf env: Add __guarded_by and __must_hold annotations 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-18-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.