From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.200 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792514236; b=NCvzBP1Q+rrEopehlF3Hmlif4UgCEFEEa/avL1AetSAm0z/O5Wvzw6LYA5tGKuxLtHQm 1jVhfECXQ9qlHCv3ycRrNJ89Sa7dOo25u7Yd49rUJFTju1U0F/UQfkMiPPVlP5Km34aQS Ymx9OJZAB2p8Vi+k9Mw5RiD7N+y7KsIVO6CidU0YBFdF/pTTurzASgt1jN9HubsroH7DA xi0MJU+DQs+R+vp5GeDtzgcjQk86p6WjXCLAzyB56IKoUb4Hd8rS/DHJjRhSAR8Md6JYF n7cbelsBokI0ZxaddnKSuWPp/SWLFsUd6HBn0F9UwbJ1Eto08XwPteLwLwLL92bCkxQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792514236; 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=hxCnvxUTZp1il/bb781Ce5TYlehlCEiYcvgLpzeabqc=; b=i2nOsJLD3rYA9hgzbz5l6rbPY/T9d5dK+qTIjPKqEVt+Dsedjfy9xxrsCHVpThVr3T+9 bCIpeuk/5hLgeyhetmUnTeG71tk2XA46CP+NkCKhfEbR/XnuLUzIlgDVKzHeJQsWgggf2 paJB6BPTvmaZ5JZpcrOyyHKRMz54fWHfoVMXe8whC4iN5fUwmTIMTQ0XfLBSoSDasqyNM Z3VR6lXD9EAM/OG8aUHpjcCjm2cRhUYyQgkPF16bLnc5COeeUYGFywQIy0ey166F73AuE oVNXLL5eYXUEfYF/L6E9wKahWqbz1OWTGxsJC8fbMyI8vXZKH8Mc0FFFvScz9jItDQw== 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=uEGesjWD; arc=none smtp.remote-ip=74.125.82.200 Received: from mail-dy1-f200.google.com (mail-dy1-f200.google.com [74.125.82.200]) (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 67ECA60A3832 for ; Tue, 20 Oct 2026 16:37:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 67ECA60A3832 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=uEGesjWD Received: by mail-dy1-f200.google.com with SMTP id 5a478bee46e88-341eff9e381so9679220eec.1 for ; Tue, 20 Oct 2026 09:37:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1792514236; x=1793119036; 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=hxCnvxUTZp1il/bb781Ce5TYlehlCEiYcvgLpzeabqc=; b=uEGesjWDZfGqRynle0v8G7vzwJNMEzjjYM/yCe4Cf+GNG3d2RluQo8jfbpEMDqzMi7 K6BlD6BX2bKtsXZWU6wLOGW5E4jmwo4QS6XLw1vPYk/Ibyt/IqvdfdaEO4UohQucwjWp n+fXW7Ht6xcZ5T+VCvducqz0yUUMfHpdEJuDSrmBpi0QQbNzCS2+/eu9PuCk8lO8lPKT j8v8Yz0NeBTm8EDn3nr2QCJLbGmCD3AUTQ49aZNQjtv/KiUJsvciRk+fYqW8Rc4Le+hD ina6iOjEYq9UGDfKOWURnV5lDZKRU+HwelR+8+W+l9g3foyp0j6Ab16ayjbUSLuPeASL KDWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792514236; x=1793119036; 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=hxCnvxUTZp1il/bb781Ce5TYlehlCEiYcvgLpzeabqc=; b=Lm4Y3UD+PURa1e3HzNw9qZVq6SqTFbTHjAFb2rczYhiY3xFoygw+RSCjFUlsxud9as iEJh0PPOTMAjFAMVS/4x5W5i+2HXGjfAP0VkhvwB9BAJgl8pq6gzKFYWNM+11LZoeU+c LdBUdRgDcZiLiSlgqcL0dcBRtPVONo1PAJksuq6AEQDe9owzO0Oeg0v3i6MoyVG04HFl 6F3uBTR/Qs9DudA9Y3vH15S7VVSg3rCCr1zmYSocIV6phC+ZiJKpsA46jEwTm/dNrARl Emrxerq8pDDTgkEbV605omcCEcopPY3ZK0l1BRdq5PyWdoFW+JNZsgAmlSymPWWWtt+H hG5g== X-Forwarded-Encrypted: i=1; AKwUvBwb51qMOplwxRCJQLNOCthwVasz9bhRCBvL+Juc081CgGE/FGGaRHXrdf9lC42KFU27lGNh1sZW2Gn28a4=@vger.kernel.org X-Gm-Message-State: AFq9FYIPmeSqIwhqOeWreVbrK+ki48oYMgrRXfO8ocF/lO0JjSMIzNPf evvt5Y8wV70sViG3ZDRKeD8XsDFe11oPhoH/EXXL3CybvU3gX/wuWnCVApHurbGBHnV4dpNTLwc st3eWPmszHA== X-Received: from dlai13.prod.google.com ([2002:a05:701b:270d:b0:190:ad1:4d8e]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:701b:4309:b0:168:3243:c91a with SMTP id a92af1059eb24-18511eb6891mr17156154c88.13.1792514234420; Tue, 20 Oct 2026 09:37:14 -0700 (PDT) Date: Tue, 20 Oct 2026 09:36:33 -0700 In-Reply-To: <20261020163640.746159-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: <20261016221700.1282659-1-irogers@google.com> <20261020163640.746159-1-irogers@google.com> X-Mailer: git-send-email 2.56.0.212.g129ede20d9-goog Message-ID: <20261020163640.746159-11-irogers@google.com> Subject: [PATCH v5 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.212.g129ede20d9-goog