From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.69 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794941370; b=FclgFIwmj1RmKRhmUfXTf1SReMGrvuXAuz+oNnfkc4JfbGRVABQ53KH1peCL4bAYVRWF NXPliQevCHrwaeO1i5lkzCctY2fA4ATMU4ZESx9Ve8dnRQRLyPZuZEZ8wQP6XMZpKKb6s wykZaP/QG5nKP2+j8vkuqnwqNOSuMNCqVVLkL8ofnnNWeR05mYHMQFui/wIMqJiwdLHLg gMBSU8YiKauo1RunLdpU5+Bs28wGDSpBqfeIfqEvQYcU2C043y5Yx38Wnld0U5OZVcmi0 70btB7iHVCr2z52alb6prkmVSpmURl5uzWJSSlmi2N0KiSPkRuPp77Nby1GPrDve35A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794941370; 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=hG1u1rwgLbGB3LPp4aSvH6eD6mJFKquRJ00BiqMbKNQ=; b=1PN7QEuXshV1k49j4PJz7tQqTRk+eEMPGpq9igQZKpDvve05P3uLirwZVKS7PgU0QxBj b62pr4gJpLv+hvoI9qhVDifApUQ3OJtgc1FPudfPUcGqGAsWqbFFPQUNcq+sLhE+QNLvE S6MJ0d9vbQGlC9qKl9mPM3s6gtkPixYuvQqFRKO8qQkhv5uV9UUn72sanyAFTiaGX2+Ik digniZiTWncq8xODnkQ3lwP7fE3Kv8mB/EtL2JAXzx36HhOaBmg8AkXZp9sAE1x0F3U+V 9LIHUKWBMF40zM81iUNHMrgAqKqYxglglyAkvICBFrhDCckI23KO8tX+PnRiEvWWvJA== 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=VbiaFUxS; arc=none smtp.remote-ip=74.125.82.69 Received: from mail-dl1-f69.google.com (mail-dl1-f69.google.com [74.125.82.69]) (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 5AA5B606A33E for ; Tue, 17 Nov 2026 18:49:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 5AA5B606A33E 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=VbiaFUxS Received: by mail-dl1-f69.google.com with SMTP id a92af1059eb24-1383723dfddso82093c88.0 for ; Tue, 17 Nov 2026 10:49:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794941368; x=1795546168; darn=lists.linux.dev; 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=hG1u1rwgLbGB3LPp4aSvH6eD6mJFKquRJ00BiqMbKNQ=; b=VbiaFUxSfhvFbZAeIDm28Mt4tdOlVKQgtel8I8siAQ0KhiyxxACHnv9U7cuM+Y6WhZ bgG3HbpxZW/ZuKpPca3yGEV4Jn+/1RCfBCzIwDtg8EEXaXEeTC+TDQXn5lE69lru3EnP P+jH5c3h9ZWZWzmXUvF1cegxMQxE44RUTYmOkUxq41+75fVoCH3fDYp+8nVjGn9UdGW3 JpRtzxAhCQaPageqRiiDdi9FmYOw0X8KBcrBuNaDz5Cey3NIjBr5i1lQGDVycHXtk/Ez 1bcniOAB8RHJMxIB/DSj3HBkoqcloFZK3GoE9HcdMiiudGFXFPYTT2DZ1r7XE03FdpEY jjog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794941368; x=1795546168; 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=hG1u1rwgLbGB3LPp4aSvH6eD6mJFKquRJ00BiqMbKNQ=; b=DFs86ZXCuVpo/23B0ShryiPard+zV8OI7R3Wrlj/7TqXWBfLDGByI1HcE+YdzdUd3p tQ96TI82/gYgSb5f6ChsVtE00nhrfG/dDRSpkYHq1l6Fhkst4Ti/ZizQmSnyYbvduuWN gbtfm1JICvFM7NpkzuYIvekkjCkoX22VS25CRpRMT46gOOFvC4qIFDAvSTDPPc9P8FfK J8fwJdQM82SXDDN3tTeO8uGdKh5MFmcRxF4oZTHDgl81ZSbDeLmPpU/MoCfmIcXbBY8c rNjnDWtJeVUZcB1JGo2Q3mpwWO89YvVyNxv8QFxVcdPiYPQ6cB0jGlWLCmpILN+479AM AxKg== X-Forwarded-Encrypted: i=1; AL+hErGKjAZjU7rMyBRHNU21mFKwM4Hs0Ql2DrQHRPZh7a0sNXMTUHOHaK9oCVCPF5fQSrOFq5fT@lists.linux.dev X-Gm-Message-State: APuU4Z8KMHHfHzw+Q/iqzlqki2oe2iCdPrpRpCXC8jbzKTrjcf1dhYIf rblT2xUhjCxHgkkG+cszg9WRBGTQ9VqkPXTEorj7g32hHHL94KhaUkGRT41SEUquLIHoFq1gMcN YKiUvT2alkQ== X-Received: from dlbov3.prod.google.com ([2002:a05:7022:1183:b0:1b2:cb3a:f87c]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:ef12:b0:1b5:17c5:9f61 with SMTP id a92af1059eb24-1b543b3301amr536495c88.0.1794941367867; Tue, 17 Nov 2026 10:49:27 -0800 (PST) Date: Tue, 17 Nov 2026 10:48:33 -0800 In-Reply-To: <20261117184844.99889-1-irogers@google.com> X-Mailing-List: llvm@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261117184844.99889-1-irogers@google.com> X-Mailer: git-send-email 2.56.1.703.gf848ed807c-goog Message-ID: <20261117184844.99889-13-irogers@google.com> Subject: [PATCH v14 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 , 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.703.gf848ed807c-goog