From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.216.70 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795244356; b=iqnOdfMON2lewQlMVmBUK4Rgmtpij+ifWNvRRLv4TfZVwxmFIv8H2Fs/xyXrd6oiqD9r y2SsNUVrCNxtkMg1G84DAJ8LdDSHkujozOgoEGnv6E7nIoaUsBqP/62KtzKrR8upZIhFm TghoePT7bBhLXGR/uLey5e/oRcAxy6vrYdCSLBhIZo+St+kufhhLLZHBe0zQIZMxUFc37 6PF50OiKyj+M8yATkWCAcbXigl39iT6ouZkDJbuefDw8gqb/c2fK8Wm+iLVwcsOLSuiIp Tba/ecYc9rb7XsFJAfHZsfoGLZgC/YY7meeodWYydFLy7U0jmGkkdPwbrBceorYHfrQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795244356; 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=eypqNFLgLpXUHRcqXnjliravXE92Pjb7dAJMkh1LWac=; b=y8OurOGQXPNXraJJbp4qhPDrVtwxzPARiDqZ8hhhXRlL9RTk2jB3JMjWivF/E5U3oLyN FI+mKemNuP5FQ8qTTWL0caVWzSGvlYhOxgWyA3hSEYpZ5rUKrCF7iUdydknEFt+subWZ+ lpE4D200KKUx1Vyc0ElrHWkeSxKbGd2RRwzFPYbVjlmzIEgfqFre17q+Zyqs04+CqIrKl BVPUAdtdOTKPdvzpWJ1ah7hOQTw8yF5NTSHIBOPsJSQIrozffFW7ySfSmKXsOWJrqTiHy r7GeIRIGV3qLX6RO9m5Qz4o5qyxsVojkOaPurBDFhhrR3QRRGLjRDdgsuaQbpQ5WGsw== 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=20260707 header.b=dCYimgCo; arc=none smtp.remote-ip=209.85.216.70 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (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 12D08606A685 for ; Sat, 21 Nov 2026 06:59:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 12D08606A685 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) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=dCYimgCo Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-3b427e5a37dso1198618a91.2 for ; Fri, 20 Nov 2026 22:59:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795244354; x=1795849154; 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=eypqNFLgLpXUHRcqXnjliravXE92Pjb7dAJMkh1LWac=; b=dCYimgCoyuiyDHRGkwM6x9RkgC17CbJLvAC6uxqbGEjDMPHn6Z8IfZg71tjuLPYCfY hKrc+gfR+UuycuntKOrMy6LuHzmN9AiQVDIfbQjRXAR4BvvYfQpcOA5qiGx91sMZbvSZ mU/ecwp4U+ha13CoQYObaxIzuaX36p7BKtYpQQGbPZ3qvLAFjOca+YK5oNuGC2jw3Oyw dKEIgNIjXdX7oep5I0o4u2X0oOIW8dB3QUfYY9ceUS/qS++Hlsz0+no8TkxDTua0cwrF 5Pv1/QD0AC5k9oXsMiSVfcuEK6TDAqa542+jIJu5Bqzbi7QUsaHXGit87JJHICAM2pdB bKzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795244354; x=1795849154; 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=eypqNFLgLpXUHRcqXnjliravXE92Pjb7dAJMkh1LWac=; b=HnrGLEfbUNeERb5+XeTlMZ3c3x1zyTclm3jhNW2QMJKM2JrADmlZZ70u7OqUbqB7vF cuj7/R36z6KTGUxt7YSKsau3fikf/srj5PoT3BqkrjF4QHIkKl7ch1SXTLxD1Q1qZ4hm poVehPdq6L2Sth1n5OdinjrFe8m32hBkYo3QsFwKVeUNpNaoOkVoOsGtzRA/6sd//m83 oY93W0B8SU0z6MXxoqSXN63E20q7TUmRDXJo0Q4qPIPawKf4KJ92ROIavj0WG9jcNbls ss8qrHUliZplwl9uktcKNvdYukGrU+LOfP7g58pR8GH/82rCKYidjYIEJMCHa9vOUDXp Qy5A== X-Forwarded-Encrypted: i=1; AL+hErH/Sg2cw0vOzjcHlGKOx509+FHfej4lw5vP72jvZkDox73u/MlDIEl9dpfl45alMsM/YXg=@vger.kernel.org X-Gm-Message-State: APuU4Z90NwWjYYprkE1KwMadvOixwcziQ8x2sgXZVDvhTPAb7umvYn37 Zf/TrZ2bAS1a9UvRabjuer0gVNwwVsFXfdf8HXZXT3KLD77IJhNiFGtBcg3dirjhfcm7GdF/9U6 ZJkK8HIEfRQ== X-Received: from pjbrm1.prod.google.com ([2002:a17:90b:3ec1:b0:3b3:f9ba:d0b5]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4483:b0:3ac:bc3d:6fe8 with SMTP id 98e67ed59e1d1-3b41c92f8f9mr4652569a91.34.1795244354221; Fri, 20 Nov 2026 22:59:14 -0800 (PST) Date: Fri, 20 Nov 2026 22:58:01 -0800 In-Reply-To: <20261121065813.4143649-1-irogers@google.com> X-Mailing-List: bpf@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261121065813.4143649-1-irogers@google.com> X-Mailer: git-send-email 2.56.1.750.gf70dc682cf-goog Message-ID: <20261121065813.4143649-13-irogers@google.com> Subject: [PATCH v15 12/23] perf dsos: Use read lock fast path in dsos__findnew_id() From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Marco Elver Cc: Bart Van Assche , Jiri Olsa , Adrian Hunter , James Clark , Weilin Wang , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , linux-perf-users@vger.kernel.org, llvm@lists.linux.dev, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Ian Rogers Content-Type: text/plain; charset="UTF-8" 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 --- 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