From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.70 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792602714; b=avWCjgO86kVyizpqae9nK4MYPHDtol4mS2XnZF9VHIT6lfi1p9IRkGpVlbXfKdt48Jqq pgkhTk0PIiELL7IpjIO4t98jXdCF0XsO41RuqObHTY4KeU0ECmVZvmqN6nWNQtzZSEIqC oqAr/0AMiJ0Wxsm2f+SMx8H6PDmbXmciyWR+xdqUcYKMTcLkqBqTmFsrS0sOb0oYEJL3g ZnIioZ9+YZD5vXQ2M6y0PLE4dxh8+DSyLepZoPydFKdx4+Y3pFc0dKtUt3eRHiAGq3zvd yyt2+9F2CFBg/bZRfCcBj6Z3hHnVdyGLMYw0ug/La/CoswNHvvtMj5h9K2jpdI8QgqQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792602714; 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=tais/mmpVOY0wxTi4olaaP5GHUDvOJakQ1sADr4zkQs=; b=hcaCGejE3xE70G+tqwahCWzixU3JlnNduAFJSG0SD2znwqIuq3xlm/YUanilLWne0JxQ i0taOIbIyeFnChAA9qXnyzdHzVMq0QcGHT1c4N2I3rx04ldUoDL/YGhxJVSkEQ/XCcf3P m9jGTwO1okForWc/p2zHkEfttPO4XaUpCSx/UA4tyTiJ/kTB4sP4uz8BJ98VC2WSc2ezs UKBX/dfrp2oiPhweO9eNmZXzCIk4lCvLg195p/IaboAwrpSXvtS4MuoofUaYOv9mOKVfU noQPMJV2XKWfx2hn27JmCNr2h2y2rLjRfZ8Pgw8Fzneg68T54n2+C/TRkbW4ybdj3bQ== 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=sctevxHx; arc=none smtp.remote-ip=74.125.82.70 Received: from mail-dl1-f70.google.com (mail-dl1-f70.google.com [74.125.82.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 4071E606A33A for ; Wed, 21 Oct 2026 17:11:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 4071E606A33A 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=sctevxHx Received: by mail-dl1-f70.google.com with SMTP id a92af1059eb24-1665200f4c2so1343485c88.0 for ; Wed, 21 Oct 2026 10:11:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1792602713; x=1793207513; 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=tais/mmpVOY0wxTi4olaaP5GHUDvOJakQ1sADr4zkQs=; b=sctevxHxYfUdJZUvVaAEMMcW8BewUvn6OU06KSRogcTl6nJZQquGxAd08i5Ht4Sdpt hBLSKQFup9dIpeOsrEixSVU9UOq/ni0Y5hMHYewpzrywkduNV/ayxgeHTANzh+0CaQGd DlI7XoUe/QgeMIdqmo9DiQDyRobmhg2gm6H2Wwoy0rqqeo+c0D/sICA0KwbaNsiwoNBh 44FUkaMSw0Ti9eNB+ZWWlx1CUBsvvWtzyC0EY0d+5j9Jj5lzn+2ols6YnRV4yGjOXWCT jqtgAv6PKtvHEMVIr9enP7GCnbwZkdevCaGgRGPnCWFtYGsXSSjqw5215XRhiLHroZNA vmYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792602713; x=1793207513; 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=tais/mmpVOY0wxTi4olaaP5GHUDvOJakQ1sADr4zkQs=; b=Ji8C9py/F5R1+EPlULIJTx2fXkGIpFoiBdr6Qp+u+wLUNjQoGspz9L/6FUCJXfWAaf eCjFAazRFr4zIJzJUYDjioxyNz90jo0KwXUSui0pAFckp6l0EaqVUa8QhyzDWtgliIXP VwXTBeCUxM+rsn+AyQ7RKUVQpVSkXFoknMdNHefbm2qVcOggaiItme+9GsLF2JM+k4ZR FJuIWMi9tR2/ofmF6vvXwDdlTotrPTGTQCD4xRPKLPWNQ+iRKZJCRfXxbcvVeSicks9B KcvLxlA1UEAp0HtKL2LerzNyPb8+aeiQshMiOP3tw+dBhhKcb77NPJvSI0NRs13QWQLe oRPg== X-Forwarded-Encrypted: i=1; AKwUvBw+7uapKH4XO4F14UAteTjFNqb8jcZ4izI9Xy8Qpry2GWD9Seq6AXpXwraIvoKYZjs89OqHirZ8Dzsi1s7dD77q@vger.kernel.org X-Gm-Message-State: AFq9FYKgBO9RPjqHN3Oubg9WLcWB9VPD8EPDuw93Jskreo8yL/kmKyfN EYrY+00Re6ohbnjh+coFVoYdzsHG+Ghdz8EKKe42mpgvaJgeHKbYspn5vfoERagGPQP07T1a0g8 ggNZeyF/Sug== X-Received: from dlbts17-n2.prod.google.com ([2002:a05:7022:b051:20b0:18f:4e29:3ddd]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:32b:b0:151:f0c5:7a09 with SMTP id a92af1059eb24-190a7c215f6mr4036164c88.43.1792602711852; Wed, 21 Oct 2026 10:11:51 -0700 (PDT) Date: Wed, 21 Oct 2026 10:10:36 -0700 In-Reply-To: <20261021171044.155240-1-irogers@google.com> X-Mailing-List: linux-perf-users@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-11-irogers@google.com> Subject: [PATCH v6 10/17] perf dsos: Use read lock fast path in dsos__findnew_id() 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" 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()). Signed-off-by: Ian Rogers --- tools/perf/util/dso.c | 16 +++++++++++++++- tools/perf/util/dso.h | 1 + tools/perf/util/dsos.c | 10 ++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index f0e02062c09c..4dc518f7cb7d 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -1685,6 +1685,18 @@ 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) + return false; + + return (id->mmap2_valid && !dso_id->mmap2_valid) || + (id->mmap2_ino_generation_valid && !dso_id->mmap2_ino_generation_valid) || + (build_id__is_defined(&id->build_id) && !build_id__is_defined(&dso_id->build_id)); +} + void __dso__improve_id(struct dso *dso, const struct dso_id *id) { struct dsos *dsos = dso__dsos(dso); @@ -1692,6 +1704,8 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id) bool changed = false; /* dsos write lock held by caller. */ + if (!id) + return; if (id->mmap2_valid && !dso_id->mmap2_valid) { dso_id->maj = id->maj; @@ -1715,7 +1729,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 9f026ccb0eb6..394960cd2004 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 40267d3a725d..b5c8086941d5 100644 --- a/tools/perf/util/dsos.c +++ b/tools/perf/util/dsos.c @@ -348,6 +348,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.0.218.g1ec904b173-goog