From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.198 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792602707; b=J7yMCOqKTSj6rG6FZwtYPGB8lwXQ4WFEP1oKOrxTL24QODohNnEFOF8sJXIlaR/L7i2q nPe2/ChUQO2PeYGZCRZmtCDo+sARkyOj5E1+TqMCpToROiEPmR1r8+aREaxlsGd19aTD9 007r4kPuRqtsFoS9K/xggkY5mF6Jgh5sHo247hiDyIYr+X8KiOoumbqVGkaXs6+SCmPH4 AlP3HAekUjVOXfT3t44Wb1H3EsREqOrTLggJbZNdb9qQqlqwAiL2Xe33cZ10RD5tjO+wl o4lUitfR+4pmc2n/YgZAYsyBRGAVRPp3QgzPb3pGppeIcyBrkLHewn+k7AZJ95MeLRw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792602707; 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=FmxiS67Hr291LmIWLu0BMRbxrbckR+O4anGab72uZ7U=; b=lXE7oEwvFVVrtEY9qI0YAD68krPLvCQcvoOifBaL2Hl7uG+UAY1xdINaSIcjlDZIt8+5 jvmmzTgDHTtdWbrsDXcFnvyiR3Itpyx9meZoXcleGJVwLUTcgdGVzOIUaEBAYuKJPG4R+ 15j035XAu2Yuv3SVjbeDpmVe4z7izQB3yMl1rgkcb3PriZcSpNDH/PoULh4jgBMjmIRNN zw2BtXADI1lCiZsqvtX+Nv/HZjC9tgV/M4jDSai0OSe7tjrH9QLdOjQ7zTbZ3J9QBf7z7 G0QZ0uORJWLbBYqKbgFgCa1ySG6YwM231zwE/tfQK6bA9A/VInuGJgm31E6ZHjXxRGg== 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=kRUTPCzt; arc=none smtp.remote-ip=74.125.82.198 Received: from mail-dy1-f198.google.com (mail-dy1-f198.google.com [74.125.82.198]) (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 D1CFC606A31E for ; Wed, 21 Oct 2026 17:11:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org D1CFC606A31E 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=kRUTPCzt Received: by mail-dy1-f198.google.com with SMTP id 5a478bee46e88-3662e7a9299so3770867eec.1 for ; Wed, 21 Oct 2026 10:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1792602706; x=1793207506; 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=FmxiS67Hr291LmIWLu0BMRbxrbckR+O4anGab72uZ7U=; b=kRUTPCztqyKpMPH8rNkfr63ar9HXViGf5qfFkfWcx+4cvmhExtBybMOoxpHucvPwNH ykhQEc6WKQnh6MTjN2IB5JfF/FobCGAuAze2qd8YkFbRNIBWb9skHF9cgfbF7jrGqO6x Abi493yb7q3o2MWNs72bNyA/M3XtfGp74hKqVmayh7MnM3I0qwfu1avMK5OLKnwTRbSg h6+mSLKPHDtMT49xcgA3uBdHE95KlF2zbgYAtOxPajFhAFUio0HVgrrr8vKrvJJAhDPN dIrmrKi+ktJ/0p/FAIskIi70nVcj5+8xHGVRIUio7EdDz1uLiywUpQeQbuZsxTTpLKXZ +6WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792602706; x=1793207506; 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=FmxiS67Hr291LmIWLu0BMRbxrbckR+O4anGab72uZ7U=; b=c5tPFFaOt+DPPibj1M6eqF9ymF0Xvcsps/Kn4+ZnhUUFlbF+7vE4pBSTQLEgLy+pN6 pD4wbZKaSIgiJ3lpF4O6ZrA31cW7nNMzshMpnBttCz1BdQ2vj1GJCuy8pE04es9FMU6+ ZawY+IlLoyAOsL+u1vQvj8REEzSTv9sFZkXlct8bml+1DqOAU8JD1rVR+ZPYrtX6rHxe XkdXmuAt9+s5q/B8cwAP0Gu36D3X7HQJqJItTpCP9TjqFFxRmNV+6Io8QlQ4SyPNyADD Mu3GOfcYkteuAawoCkj81be+2yYs/1kqkIDLXTjRSm+fjs3Kq3rpdbd6jb8hNk7O9ecc T1cA== X-Forwarded-Encrypted: i=1; AKwUvBw+EF0SyeyWDX7mIIpV/kFOwC5eUUiZi/0FalfW+CPsdXszMYmJV5sPNm7A88MB/PDfekHJtN5WQ4lbbQY=@vger.kernel.org X-Gm-Message-State: AFq9FYI2jRX3dbwj0PwNJhIEvN3+QnokcFjEEtoZQHbSk1nYBfDFaPVy 5A/FmPsNHInC56qBdqlr/g1gcy1eIhJxbtA41Spu2NOpO1p0S4yGAL8mWoNwfK5/azF8BT6DD0e KS/0VpVZrwQ== X-Received: from dlbsv14.prod.google.com ([2002:a05:7022:3a0e:b0:167:1ca1:a37d]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:701b:2307:b0:144:eb46:c3f with SMTP id a92af1059eb24-190a04292cbmr3339334c88.2.1792602705589; Wed, 21 Oct 2026 10:11:45 -0700 (PDT) Date: Wed, 21 Oct 2026 10:10:35 -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-10-irogers@google.com> Subject: [PATCH v6 09/17] perf dso: Use DEFINE_MUTEX for dso__data_open_lock 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" Replace _dso__data_open_lock and its pthread_once() initialization wrapper dso__data_open_lock() with DEFINE_MUTEX(dso__data_open_lock). Signed-off-by: Ian Rogers --- tools/perf/util/dso.c | 68 +++++++++++++++++-------------------------- tools/perf/util/dso.h | 10 +++---- 2 files changed, 32 insertions(+), 46 deletions(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index cbc4f30e7f23..f0e02062c09c 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -524,25 +524,11 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m, /* * Global list of open DSOs and the counter. */ -struct mutex _dso__data_open_lock; +DEFINE_MUTEX(dso__data_open_lock); static LIST_HEAD(dso__data_open); -static long dso__data_open_cnt __guarded_by(&_dso__data_open_lock); +static long dso__data_open_cnt __guarded_by(&dso__data_open_lock); -static void dso__data_open_lock_init(void) -{ - mutex_init(&_dso__data_open_lock); -} - -static struct mutex *dso__data_open_lock(void) __returns_ctx_lock(&_dso__data_open_lock) -{ - static pthread_once_t data_open_lock_once = PTHREAD_ONCE_INIT; - - pthread_once(&data_open_lock_once, dso__data_open_lock_init); - - return &_dso__data_open_lock; -} - -static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) +static void dso__list_add(struct dso *dso) __must_hold(&dso__data_open_lock) { list_add_tail(&dso__data(dso)->open_entry, &dso__data_open); /* Assume the dso is part of dsos, holding it live while on dso__data_open. */ @@ -550,7 +536,7 @@ static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) dso__data_open_cnt++; } -static void dso__list_del(struct dso_data *dso_data) __must_hold(&_dso__data_open_lock) +static void dso__list_del(struct dso_data *dso_data) __must_hold(&dso__data_open_lock) { list_del_init(&dso_data->open_entry); WARN_ONCE(dso__data_open_cnt <= 0, @@ -560,7 +546,7 @@ static void dso__list_del(struct dso_data *dso_data) __must_hold(&_dso__data_ope static void close_first_dso(void); -static int do_open(char *name) __must_hold(&_dso__data_open_lock) +static int do_open(char *name) __must_hold(&dso__data_open_lock) { do { int fd = open(name, O_RDONLY|O_CLOEXEC); @@ -663,7 +649,7 @@ void dso__put_filename(struct dso *dso __maybe_unused, char *filename, bool deco } static int __open_dso(struct dso *dso, struct machine *machine) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock) { int fd = -EINVAL; char *name; @@ -696,7 +682,7 @@ static void check_data_close(void); * list/count of open DSO objects. */ static int open_dso(struct dso *dso, struct machine *machine) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock) { int fd; struct nscookie nsc; @@ -722,7 +708,7 @@ static int open_dso(struct dso *dso, struct machine *machine) return fd; } -static void close_data_fd(struct dso_data *dso_data) __must_hold(&_dso__data_open_lock) +static void close_data_fd(struct dso_data *dso_data) __must_hold(&dso__data_open_lock) { if (dso_data->fd >= 0) { close(dso_data->fd); @@ -739,12 +725,12 @@ static void close_data_fd(struct dso_data *dso_data) __must_hold(&_dso__data_ope * Close @dso's data file descriptor and updates * list/count of open DSO objects. */ -static void close_dso(struct dso *dso) __must_hold(&_dso__data_open_lock) +static void close_dso(struct dso *dso) __must_hold(&dso__data_open_lock) { close_data_fd(dso__data(dso)); } -static void close_first_dso(void) __must_hold(&_dso__data_open_lock) +static void close_first_dso(void) __must_hold(&dso__data_open_lock) { struct dso_data *dso_data; @@ -783,7 +769,7 @@ void reset_fd_limit(void) fd_limit = 0; } -static bool may_cache_fd(void) __must_hold(&_dso__data_open_lock) +static bool may_cache_fd(void) __must_hold(&dso__data_open_lock) { if (!fd_limit) fd_limit = get_fd_limit(); @@ -799,7 +785,7 @@ static bool may_cache_fd(void) __must_hold(&_dso__data_open_lock) * for opened dso file descriptors. The limit is half * of the RLIMIT_NOFILE files opened. */ -static void check_data_close(void) __must_hold(&_dso__data_open_lock) +static void check_data_close(void) __must_hold(&dso__data_open_lock) { bool cache_fd = may_cache_fd(); @@ -815,9 +801,9 @@ static void check_data_close(void) __must_hold(&_dso__data_open_lock) */ void dso__data_close(struct dso *dso) { - mutex_lock(dso__data_open_lock()); + mutex_lock(&dso__data_open_lock); close_dso(dso); - mutex_unlock(dso__data_open_lock()); + mutex_unlock(&dso__data_open_lock); } static int dso__find_binary_type_locked(struct dso *dso) @@ -913,7 +899,7 @@ static int dso__find_binary_type_locked(struct dso *dso) #define FIND_MAX_RETRY 3 static int __dso__find_binary_type(struct dso *dso) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock) { int ret; int retry = 0; @@ -945,15 +931,15 @@ enum dso_binary_type dso__find_binary_type(struct dso *dso) { int ret; - mutex_lock(dso__data_open_lock()); + mutex_lock(&dso__data_open_lock); ret = __dso__find_binary_type(dso); - mutex_unlock(dso__data_open_lock()); + mutex_unlock(&dso__data_open_lock); return ret; } static void try_to_open_dso(struct dso *dso, struct machine *machine) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock) { struct dso_data *dso_data = dso__data(dso); @@ -984,7 +970,7 @@ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd) if (dso__data(dso)->status == DSO_DATA_STATUS_ERROR) return false; - mutex_lock(dso__data_open_lock()); + mutex_lock(&dso__data_open_lock); try_to_open_dso(dso, machine); @@ -992,13 +978,13 @@ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd) if (*fd >= 0) return true; - mutex_unlock(dso__data_open_lock()); + mutex_unlock(&dso__data_open_lock); return false; } void dso__data_put_fd(struct dso *dso __maybe_unused) { - mutex_unlock(dso__data_open_lock()); + mutex_unlock(&dso__data_open_lock); } bool dso__data_status_seen(struct dso *dso, enum dso_data_status_seen by) @@ -1169,7 +1155,7 @@ static ssize_t file_read(struct dso *dso, struct machine *machine, { ssize_t ret; - mutex_lock(dso__data_open_lock()); + mutex_lock(&dso__data_open_lock); /* * dso__data(dso)->fd might be closed if other thread opened another @@ -1185,7 +1171,7 @@ static ssize_t file_read(struct dso *dso, struct machine *machine, ret = pread(dso__data(dso)->fd, data, DSO__DATA_CACHE_SIZE, offset); out: - mutex_unlock(dso__data_open_lock()); + mutex_unlock(&dso__data_open_lock); return ret; } @@ -1292,7 +1278,7 @@ static int file_size(struct dso *dso, struct machine *machine) int ret = 0; struct stat st; - mutex_lock(dso__data_open_lock()); + mutex_lock(&dso__data_open_lock); /* * dso__data(dso)->fd might be closed if other thread opened another @@ -1315,7 +1301,7 @@ static int file_size(struct dso *dso, struct machine *machine) dso__data(dso)->file_size = st.st_size; out: - mutex_unlock(dso__data_open_lock()); + mutex_unlock(&dso__data_open_lock); return ret; } @@ -1520,7 +1506,7 @@ uint16_t dso__e_machine_endian(struct dso *dso, struct machine *machine, uint32_ return EM_NONE; } - mutex_lock(dso__data_open_lock()); + mutex_lock(&dso__data_open_lock); /* * dso__data(dso)->fd might be closed if other thread opened another @@ -1533,7 +1519,7 @@ uint16_t dso__e_machine_endian(struct dso *dso, struct machine *machine, uint32_ else if (e_flags) *e_flags = 0; - mutex_unlock(dso__data_open_lock()); + mutex_unlock(&dso__data_open_lock); return e_machine; } diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index d6b0a1a4dac9..9f026ccb0eb6 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -354,7 +354,7 @@ DECLARE_RC_STRUCT(dso) { char name[]; }; -extern struct mutex _dso__data_open_lock; +extern struct mutex dso__data_open_lock; extern const struct dso_id dso_id_empty; int dso_id__cmp(const struct dso_id *a, const struct dso_id *b); @@ -807,7 +807,7 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id); int dso__name_len(const struct dso *dso); struct dso *dso__get(struct dso *dso); -void dso__put(struct dso *dso) __must_not_hold(&_dso__data_open_lock); +void dso__put(struct dso *dso) __must_not_hold(&dso__data_open_lock); static inline void __dso__zput(struct dso **dso) { @@ -917,9 +917,9 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m, * TODO */ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd) - __cond_acquires(true, &_dso__data_open_lock); -void dso__data_put_fd(struct dso *dso) __releases(&_dso__data_open_lock); -void dso__data_close(struct dso *dso) __must_not_hold(&_dso__data_open_lock); + __cond_acquires(true, &dso__data_open_lock); +void dso__data_put_fd(struct dso *dso) __releases(&dso__data_open_lock); +void dso__data_close(struct dso *dso) __must_not_hold(&dso__data_open_lock); int dso__data_file_size(struct dso *dso, struct machine *machine); off_t dso__data_size(struct dso *dso, struct machine *machine); -- 2.56.0.218.g1ec904b173-goog