From nobody Sun Apr 26 09:30:43 2026 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3EF5292911 for ; Thu, 24 Apr 2025 19:58:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524719; cv=none; b=OERWPiaNFEqzQPMQ9/zKgg2foTUCrICHzDj4DyHtBUFxNmjVc+JA4laA4EVulVfrWD/FjFbX3g+CsKZUzB3/TLaCxGd49IPHdfp97Pw2uB7Y1M/uoKFJT3sW+brTnuBkiay1XXgUTRzW1I7gPz9FC5DEqL4l7TB22oR+zrLUCNw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524719; c=relaxed/simple; bh=ob+vXbABBfhrdypjS1HSeY991+kz1LnzmwQMh3Kc2b4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=VjkBVjSLnH73QLxatFMjspAt4/CjziysOojrlLNbx3KfDh8ktu+/00h2K1w7Wutzth3pj5YfyVpR7vA7A0x1JuMs1TNkxQNJD/QX++LrLkyX2kua5pZjKdIB5IfxMWrsNIjsoYkxeBJVsdzQkYtLwSkfCSr5SgsyfDJyaYdyL8Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Rnm2tn9m; arc=none smtp.client-ip=209.85.216.73 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.b="Rnm2tn9m" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3032f4eca83so1396108a91.3 for ; Thu, 24 Apr 2025 12:58:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745524717; x=1746129517; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=MNKAqqBiOSqd4vHBoC37W60RbEBy/zjFFL7hnjZJfH0=; b=Rnm2tn9m55If0b+g4zZpNVAYgKbIZpuqZCzjQ3B2xIV1uG1qiAIyL2b9YLDE/myu1g iV6C9XL23t6L3/Ecuv3hfdMkB+w1YAniWcNp1FsDJ7B+bX8tbR+3g3/Lz/NwrV3WEzIm c6ijVDPD2JT+3mn5oBdptZDOrOBPcstkIcOPe+t87Wyxb1uhGNAY9MHEtYFJsOdR11Il ccponj3Dxc6gSQG2hNZSaESX5lR4TWhevjAxTb7uCiGz7vEuh8gb80KhG8Fqdl0yz3Zp c5Kwl02eWd1EJ+uCvB69K3l8qBS4pSZpbLIXezXZjUTpZ88xrh7DhfZftuKQwKVUhV1h K5EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745524717; x=1746129517; h=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; bh=MNKAqqBiOSqd4vHBoC37W60RbEBy/zjFFL7hnjZJfH0=; b=CHdj8irmWhjVO8y6iLm7N5b1FXYhv0lY8ynQmGtufV+RDuZWsPwID5MYEyn+a4UKLf I6B6Xe3uJsZ6AodVdSCM8JqWw4xCpQSGz03VyG/cTF2xsZRsN3Gkqial5BYEnHc/PL/y nX794cUv0x2kBHecmCyQDuZm7U3ti8mOlVcKfy3+D4nr/ybMt3mM80qUAo3PriEH984W nXqE+KhqDddDHkKh7od4Rz0GrjoE5EC+e/4B0R/LNEp/VKeuPnEhcV8zVR9MTBvy05u5 /5ZhrqTl5BIb++tbCSyAM4GEjhlT8+VRby7eFQcbd/Fh8Rfdr2bwVUq7QAOrzSrqnjys fPPQ== X-Forwarded-Encrypted: i=1; AJvYcCUW67dZ1B+0GQ7LJ5WAUNWG+WmzIgh7M0ieQFDgQieZMyZ3706fTCPi/d4aazsE03L6bYpb9OCI8yRqWBI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8UCJjZh9nrO2tJW+q8Ov4Oq0or4jEzYEa4MKXca5F1fewL3RK s5Bh/EwgkjODIja/CTNkdhKzM8huS2CXdlxbIMjS+xlgrYc79A++R8C6U7KEMZ0jxHAazUHovFi dsFs5hw== X-Google-Smtp-Source: AGHT+IHfiZUcwKsYvkHpGq/KBVlYIbJaMYYoxJQdeAugMt3sVxDTytgOHhfXbnbxKTbar8Cp+xAAA1aorH1i X-Received: from pjbqj3.prod.google.com ([2002:a17:90b:28c3:b0:305:2d68:2be6]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4ec3:b0:2fa:1e3e:9be5 with SMTP id 98e67ed59e1d1-309f547d239mr1626676a91.0.1745524717216; Thu, 24 Apr 2025 12:58:37 -0700 (PDT) Date: Thu, 24 Apr 2025 12:58:24 -0700 In-Reply-To: <20250424195831.1767457-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250424195831.1767457-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.850.g28803427d3-goog Message-ID: <20250424195831.1767457-2-irogers@google.com> Subject: [PATCH v2 1/8] perf callchain: Always populate the addr_location map when adding IP From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Rajeev , Kajol Jain , Li Huafei , "Steinar H. Gunderson" , James Clark , Stephen Brennan , Andi Kleen , Dmitry Vyukov , Zhongqiu Han , Yicong Yang , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , "Dr. David Alan Gilbert" , Zixian Cai , Steve Clevenger , Thomas Falcon , Martin Liska , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , Song Liu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Dropping symbols also meant the callchain maps wasn't populated, but the callchain map is needed to find the DSO. Plumb the symbols option better, falling back to thread__find_map rather than thread__find_symbol when symbols are disabled. Fixes: 02b2705017d2 ("perf callchain: Allow symbols to be optional when res= olving a callchain") Signed-off-by: Ian Rogers --- tools/perf/util/machine.c | 6 ++++-- tools/perf/util/thread.c | 8 ++++++-- tools/perf/util/thread.h | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 2531b373f2cf..b048165b10c1 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1976,7 +1976,7 @@ static void ip__resolve_ams(struct thread *thread, * Thus, we have to try consecutively until we find a match * or else, the symbol is unknown */ - thread__find_cpumode_addr_location(thread, ip, &al); + thread__find_cpumode_addr_location(thread, ip, /*symbols=3D*/true, &al); =20 ams->addr =3D ip; ams->al_addr =3D al.addr; @@ -2078,7 +2078,7 @@ static int add_callchain_ip(struct thread *thread, al.sym =3D NULL; al.srcline =3D NULL; if (!cpumode) { - thread__find_cpumode_addr_location(thread, ip, &al); + thread__find_cpumode_addr_location(thread, ip, symbols, &al); } else { if (ip >=3D PERF_CONTEXT_MAX) { switch (ip) { @@ -2106,6 +2106,8 @@ static int add_callchain_ip(struct thread *thread, } if (symbols) thread__find_symbol(thread, *cpumode, ip, &al); + else + thread__find_map(thread, *cpumode, ip, &al); } =20 if (al.sym !=3D NULL) { diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c index 89585f53c1d5..10a01f8fbd40 100644 --- a/tools/perf/util/thread.c +++ b/tools/perf/util/thread.c @@ -410,7 +410,7 @@ int thread__fork(struct thread *thread, struct thread *= parent, u64 timestamp, bo } =20 void thread__find_cpumode_addr_location(struct thread *thread, u64 addr, - struct addr_location *al) + bool symbols, struct addr_location *al) { size_t i; const u8 cpumodes[] =3D { @@ -421,7 +421,11 @@ void thread__find_cpumode_addr_location(struct thread = *thread, u64 addr, }; =20 for (i =3D 0; i < ARRAY_SIZE(cpumodes); i++) { - thread__find_symbol(thread, cpumodes[i], addr, al); + if (symbols) + thread__find_symbol(thread, cpumodes[i], addr, al); + else + thread__find_map(thread, cpumodes[i], addr, al); + if (al->map) break; } diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h index cd574a896418..2b90bbed7a61 100644 --- a/tools/perf/util/thread.h +++ b/tools/perf/util/thread.h @@ -126,7 +126,7 @@ struct symbol *thread__find_symbol_fb(struct thread *th= read, u8 cpumode, u64 addr, struct addr_location *al); =20 void thread__find_cpumode_addr_location(struct thread *thread, u64 addr, - struct addr_location *al); + bool symbols, struct addr_location *al); =20 int thread__memcpy(struct thread *thread, struct machine *machine, void *buf, u64 ip, int len, bool *is64bit); --=20 2.49.0.850.g28803427d3-goog From nobody Sun Apr 26 09:30:43 2026 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C6A11293B44 for ; Thu, 24 Apr 2025 19:58:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524721; cv=none; b=G23WmVyfCc0CP2Ex5p7AVie1WdJd2wmK1i4NgMDTAXj/Xy1cxY2cK/TiDc3Mn9hHAeG9jWNPwMGiRfFXKgOKnnfTTFyZ8BfkJwh5/dG4yDqGs/eTInFRkIX4jd7PZgfkVGUaATX1bTPotnG/KUpGT3QvsGhlmKwE7iyefmhdKgg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524721; c=relaxed/simple; bh=V/+YIeqXyWe+VtI2AkO9avaTu+8PfbklD7Z5gyGY4Uw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=H0ewCyYJK28UkArvcB+WJ8FgPrcDrbvU4pMZs26bHHZyiSY+gfDnvv4g7uV1uLppN5nG+pWum8oZ9K7VRCQQAO6IujXXXvfA21G+haVo2+HfNYUNHhG0noO1xleiiNz3AuGPPMLklFFBzPzPIcbHaS1sfrKjWXnDWKTjjzVfiqU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Ee5m52VV; arc=none smtp.client-ip=209.85.216.74 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.b="Ee5m52VV" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3087a704c6bso1452205a91.2 for ; Thu, 24 Apr 2025 12:58:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745524719; x=1746129519; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=DIKGPOJtNTYeYYPtYxV7HNqMQQDAOFZ9Hntv87mu0iI=; b=Ee5m52VV4vdlbSeryeq2ihHrqGZNj8soB0jRLmUwWjoWdP3hJp1gg5en2nv8nmdNIF Doo7vId/eMBhE2Auvsjtzb4ka9ciPMfECzm3DxcTLEqRC02lcqFRWh8iaadSrI+W9l/K 06z4vnvbi7H2cDQV+20ZVZOnniF96O3mlDEzFaSzQbsPEST53+W42addKjOE/FhbUiAS ysd1n4XhZX2PQ8O+Lkl6ZoDO3H9GDrpQlem7trtzo9AWvjv1GThN9FJizWN8SXEM9DJ5 fPRPfVzR/g7Jg1Ks5mysKCRfnJLtUlmf5zgTRj3bVgvE1iCGp/6x335IYCnoIiN3rfF1 h9kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745524719; x=1746129519; h=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; bh=DIKGPOJtNTYeYYPtYxV7HNqMQQDAOFZ9Hntv87mu0iI=; b=NoLQVhfP0fKdBYF9qUm7GIaQAuUIbJGaL8ICYddrOwuvEuiwmFPE0mEQdH19pdTePT CC0u7N1h85Rg3Vr6OeKmAkS/C19TWwXMNma6QVrrK4dCFp5nP8vNt3KHUl2B5is+98iw ZX2xdgjZVZKfHmBRBWNuu3fxH3PO3NqdEJdUwA8tSzo61gG0liQglQv3PI/gJ8ODunkS 9JNgVTwHGl8YlKM925ECAB5aXdqiwB9WQykcjzJIf8JOmCQtvc6M4kRZO9tl1QMHNzaV EC0HfcvkKl+TN4/ShVAhEzdJQ6GxcvKmFqxEC29bS8R5kvqAKSG+mcgA44EDbxV4loGC Sn6Q== X-Forwarded-Encrypted: i=1; AJvYcCURBl8HpqhKN5TnVgsDMLQjhBHoMpuXQiRAs38g8XQeE+QTGlgOwDfedVJW59sK0NijNnbuozeMQfqYD4U=@vger.kernel.org X-Gm-Message-State: AOJu0YzBE4d7FQjCmQCdmoINsbOrSK15CG16VhmsnXxgcyxKnc541b+C ZX9qQirHyE7tPtZ6/y57IbzPvpS28rUMeH9LRJt6S4guMTsMYWKwMnlKwSUPvwE1nreGJxTYDZA qlpXuOQ== X-Google-Smtp-Source: AGHT+IHpI6N+hwPdiWTusoFuXWW6V5bErVcbyPVk7quV9c2Ci3OtmV1wT+h5SXqQ734pFr5OlPEeRufAxah9 X-Received: from pjbsf8.prod.google.com ([2002:a17:90b:51c8:b0:2ef:9b30:69d3]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:50cf:b0:2ff:6e72:b8e9 with SMTP id 98e67ed59e1d1-309f56b55cfmr1220579a91.25.1745524719071; Thu, 24 Apr 2025 12:58:39 -0700 (PDT) Date: Thu, 24 Apr 2025 12:58:25 -0700 In-Reply-To: <20250424195831.1767457-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250424195831.1767457-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.850.g28803427d3-goog Message-ID: <20250424195831.1767457-3-irogers@google.com> Subject: [PATCH v2 2/8] perf jitdump: Directly mark the jitdump DSO From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Rajeev , Kajol Jain , Li Huafei , "Steinar H. Gunderson" , James Clark , Stephen Brennan , Andi Kleen , Dmitry Vyukov , Zhongqiu Han , Yicong Yang , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , "Dr. David Alan Gilbert" , Zixian Cai , Steve Clevenger , Thomas Falcon , Martin Liska , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , Song Liu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The DSO being generated was being accessed through a thread's maps, this is unnecessary as the dso can just be directly found. This avoids problems with passing a NULL evsel which may be inspected to determine properties of a callchain when using the buildid DSO marking code. Signed-off-by: Ian Rogers --- tools/perf/util/jitdump.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/jitdump.c b/tools/perf/util/jitdump.c index 624964f01b5f..b062b1f234b6 100644 --- a/tools/perf/util/jitdump.c +++ b/tools/perf/util/jitdump.c @@ -14,9 +14,9 @@ #include #include =20 -#include "build-id.h" #include "event.h" #include "debug.h" +#include "dso.h" #include "evlist.h" #include "namespaces.h" #include "symbol.h" @@ -531,9 +531,22 @@ static int jit_repipe_code_load(struct jit_buf_desc *j= d, union jr_entry *jr) /* * mark dso as use to generate buildid in the header */ - if (!ret) - build_id__mark_dso_hit(tool, event, &sample, NULL, jd->machine); - + if (!ret) { + struct dso_id dso_id =3D { + { + .maj =3D event->mmap2.maj, + .min =3D event->mmap2.min, + .ino =3D event->mmap2.ino, + .ino_generation =3D event->mmap2.ino_generation, + }, + .mmap2_valid =3D true, + .mmap2_ino_generation_valid =3D true, + }; + struct dso *dso =3D machine__findnew_dso_id(jd->machine, filename, &dso_= id); + + if (dso) + dso__set_hit(dso); + } out: perf_sample__exit(&sample); free(event); --=20 2.49.0.850.g28803427d3-goog From nobody Sun Apr 26 09:30:43 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 062F12949F7 for ; Thu, 24 Apr 2025 19:58:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524723; cv=none; b=QURyzaAnjWu+njJuG46Qx/ri88AkBfxQdybt+yA1B0a70HCQ1hJR6VC4AEM4nhQMwjz9rtFiLzrGq1wW6OO1OK4h8zGqe+CJ1xIWmMg/BHUUBilh8VWkY/yt/wrAgVuBNbso3s+mq4ZJ0JzkOaR6WWLcMQ3fYK1ddT+KM7hp4mk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524723; c=relaxed/simple; bh=ZrmbJv1wP81Ikb37sNi/fSdxIlGOQqzFBl/SHVNr6I8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=azXDYUp2ZHpAnlkb/XhG0yudRElnlpA0UdcjyylJyf9uqoWWULaRwLx8w50VH8A8WU8Ic9XP3ikNekp8V+sFr/J7CBAhBI0uOb5jl5HXYzFJg2br7CoSZGGZQuKP5U7u+QC0Q7/KfpVMQRxEjlOUICh7+no1GPgBDukfHdtaFvw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=UdtFgrVH; arc=none smtp.client-ip=209.85.210.202 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.b="UdtFgrVH" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-736b5f9279cso1269534b3a.2 for ; Thu, 24 Apr 2025 12:58:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745524721; x=1746129521; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=o0PZ2/PZJEEEZcnWaKrTZF4YzFQpgxmEtQRIBYWzhA0=; b=UdtFgrVHFmnk2O71FEXa8K/BUBvuUak0z1oozwFAtv2G/s01z6GlnroH0raO6eUyQr y3Okdmx861hzzdZUF7VaozgN/54n9hu4cgBAAstQgVEfLXMavpQ7SeosuifatDLhYzxT qX+PY0TzXVqdENq4XjtlScgZ+46CJu75jaPXnjjdtVR/QTPbpR9kE+dNCe4wYcKzYseI tCbBKo8qUNGuDLg3RFCX7Mvl7zxxDCf0YMUZwr/ncFYZNmKyxfze7PfuknJhh9VIeAY5 6ofsEVL6Nqkpzzx1u4P7HTlUew4YeUb5GdojIt04uUY9bbOMkYGtfjqjBQ9gGX4TJqzr ZTKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745524721; x=1746129521; h=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; bh=o0PZ2/PZJEEEZcnWaKrTZF4YzFQpgxmEtQRIBYWzhA0=; b=cQ9aN88nwmtK0u3P7tBWGpVmZQEkusQm8w4IDRZpF9iDiZJa+s5r9ELRsoEcdLooz0 j+UnFkCgqaYN+EoXCUTbT0hlM4+qeJhTST4BrgZFuQqe/dZTQYZZVeD0mDsitfYwgUT7 7rb7ZkfAyc2UoR+0ppHdtUh5PqSyuQJUSq22HYKLcCLB7sAiJTWqr4G+AjIVyOZe/poD zz9vtP5XS+fRH3GnBPXtpz050rlcmtN91qHP+mOY3ACSjSXuscaodNPmT1FhHnx2OD8H +wx10HLO6otSbSGLJ+VU50gC1GEwFyGU9h6qRpbTBZtJkXnDCchaZC2Ug+yfWOZM5itm 50aA== X-Forwarded-Encrypted: i=1; AJvYcCUuhqsapNie3yGEkBC27ybSiX7hIJ2+gO//T3X//zyVDtD49yxY1RdnvKEOHhcujRCrWDV8ZRcDnU/mD9Y=@vger.kernel.org X-Gm-Message-State: AOJu0YzalV/CHyDUiIRTBXJo2aA1s4TP5+JgLqZY7SfTGXrl9Q03t9gm mQLrJsYQMIDqbEIP1ZdArTSPzYJYFjhDZqzs7f17LGlnEvLxJxAnalInYtj/M2Q345mg9rxk6g4 RB8qyaw== X-Google-Smtp-Source: AGHT+IGL3ZNrz1pe1MwYmQZuoc8g3pcu2bGBqpUvU3O7qAcD+2gzoKVbqzHg1t9Z+jFrCzyjP6JaAGIuv2Z6 X-Received: from pfbhm3.prod.google.com ([2002:a05:6a00:6703:b0:73d:b1c6:c137]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2e1b:b0:736:5dc6:a14b with SMTP id d2e1a72fcca58-73e32fe68c5mr1203043b3a.13.1745524721144; Thu, 24 Apr 2025 12:58:41 -0700 (PDT) Date: Thu, 24 Apr 2025 12:58:26 -0700 In-Reply-To: <20250424195831.1767457-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250424195831.1767457-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.850.g28803427d3-goog Message-ID: <20250424195831.1767457-4-irogers@google.com> Subject: [PATCH v2 3/8] perf build-id: Reduce size of "size" variable From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Rajeev , Kajol Jain , Li Huafei , "Steinar H. Gunderson" , James Clark , Stephen Brennan , Andi Kleen , Dmitry Vyukov , Zhongqiu Han , Yicong Yang , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , "Dr. David Alan Gilbert" , Zixian Cai , Steve Clevenger , Thomas Falcon , Martin Liska , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , Song Liu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Later clean up of the dso_id to include a build_id will suffer from alignment and size issues. The size can only hold up to a value of BUILD_ID_SIZE (20) and the mmap2 event uses a byte for the value. Signed-off-by: Ian Rogers --- tools/perf/util/build-id.h | 2 +- tools/perf/util/synthetic-events.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h index a212497bfdb0..e3e0a446ff0c 100644 --- a/tools/perf/util/build-id.h +++ b/tools/perf/util/build-id.h @@ -13,7 +13,7 @@ =20 struct build_id { u8 data[BUILD_ID_SIZE]; - size_t size; + u8 size; }; =20 struct dso; diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index 2fc4d0537840..68bb7c5fe1b1 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -2248,7 +2248,9 @@ int perf_event__synthesize_build_id(const struct perf= _tool *tool, =20 memset(&ev, 0, len); =20 - ev.build_id.size =3D min(bid->size, sizeof(ev.build_id.build_id)); + ev.build_id.size =3D bid->size; + if (ev.build_id.size > sizeof(ev.build_id.build_id)) + ev.build_id.size =3D sizeof(ev.build_id.build_id); memcpy(ev.build_id.build_id, bid->data, ev.build_id.size); ev.build_id.header.type =3D PERF_RECORD_HEADER_BUILD_ID; ev.build_id.header.misc =3D misc | PERF_RECORD_MISC_BUILD_ID_SIZE; @@ -2308,7 +2310,9 @@ int perf_event__synthesize_mmap2_build_id(const struc= t perf_tool *tool, ev.mmap2.len =3D len; ev.mmap2.pgoff =3D pgoff; =20 - ev.mmap2.build_id_size =3D min(bid->size, sizeof(ev.mmap2.build_id)); + ev.mmap2.build_id_size =3D bid->size; + if (ev.mmap2.build_id_size > sizeof(ev.mmap2.build_id)) + ev.build_id.size =3D sizeof(ev.mmap2.build_id); memcpy(ev.mmap2.build_id, bid->data, ev.mmap2.build_id_size); =20 ev.mmap2.prot =3D prot; --=20 2.49.0.850.g28803427d3-goog From nobody Sun Apr 26 09:30:43 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02FC8294A12 for ; Thu, 24 Apr 2025 19:58:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524725; cv=none; b=mTyS0VmdHbCMjlLZzrrVz/L8twvbxiV2zVg3t4t1mFzPtBzva1aw31p24oa2LIYSEP0kWnYLjs2oloeXQeidFcmsAWlKshYnWGWT2xEZ37iNo6M0ToSoY2HlTNe0pg/OicAoLND1jT2YVh8dL2xEkux0n2QA958uaxQR0XnpgcA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524725; c=relaxed/simple; bh=Qa7/NWnNAbbvspFXvntiqb8JE6R610NDMEjZ2+RCtsI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=n2mCC0ygJwpz7va3XdQv5YRXx4OSa+8dtYizdgRGCnPoZc0CFNMUdsNbM1uLbBnCAXbYY4qgYR/URWpvxuWdPKUBw7cagenLMsFPcEeRqb3l1DsUBmzWf8MFy31NXwx9AKwosOKjssnKmJdukFa6UUt1zXt3tjG0QEpsIYIfXKI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=hTttOamX; arc=none smtp.client-ip=209.85.210.201 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.b="hTttOamX" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-736d30d2570so1296295b3a.1 for ; Thu, 24 Apr 2025 12:58:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745524723; x=1746129523; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=J+5lHcPlqDn1PtKKI7aRSOFbGSO3/XuDLrZF/cxUnH8=; b=hTttOamXBM7orBVyAfxZi+GeA1GBGY8R0Z1TuJKblUN38HTkGNry9lyBv0JEH3JoPF Z2TAFDRzoyLlc1WpQeRzYYPDLjrBytrYASzJLapznN10I+eoi4RHqyQD1ov5x+4V4Pzi iVEASMoBZk6ar5dxJksJm0SUlaw7lAZM+LbVkAftGhr62xseuZnT/I9k3yIai53jG4oj HLPbUwGiPHvo0qCiRvHc6i1r/QSZ37C/N+cjVN+ZWyG/y8UE6bHoguWp7pBpuG1SLp03 rtofTTZmm1ce0wPI8HdU8NJkG/OrU6GusqYofx53XvQ/mpVxhCQzwZBAb4rgnuE/V2+b w5tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745524723; x=1746129523; h=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; bh=J+5lHcPlqDn1PtKKI7aRSOFbGSO3/XuDLrZF/cxUnH8=; b=eX9Bg/uF3iLavzlxtWbL0KSKGW8bUrmu4Q6FrIY52moqD7hkGF8GQrISy9LG6R8RO+ RskT3Dp7MCsCab4yeEcNdVhkmd5uwYKTtF8/0B1oUU3s923zACSlUhVYTOa73iIwwG5R Z4i0YlqryWcij6fodRnBtiup2cp8cNtz7odH7vNpfnrNIZBNxu0Uixx1P0dERSyPZ123 yQlqW/hOxMIebScJy2IRHQVo7IuJ5JO/PGp1VyYj7O8h5bTVdi0xnzCJ1TIHWdUp/gXE Dqk1MMEb8TcaN7/GtUnxiJL4u2fZw9E9MCWSm5XbYembeHZiXP8m7sewcyaURSKLxtst S7Lw== X-Forwarded-Encrypted: i=1; AJvYcCUC1iaCsyVdJPchn4SQjx0wxYaef7LFuwubLwCBrQRgRClRM/hfwCa+0hWg+gUyEHnI6JxCWPNunAQbQrg=@vger.kernel.org X-Gm-Message-State: AOJu0YwgYlKWz7jiIdJDpORU0HHHfTYinbc6oAgvJWpRh+MZ3vagybcz AFWq5r0J5ZMwM+4IatfSTVMJbiNF/p4Zw+OQoJxw7A/ZzHg8aICSKuIkrPQ5E77T/FeRbDrIyit gNKwbxQ== X-Google-Smtp-Source: AGHT+IHbY+skXPkqzN4tXonepKOsEquu2RdmRcb5i3vEvMDiDPwT/zO4+SFRTK7fVeGl+4ZG6qcfy5nHPoJ2 X-Received: from pgbee14.prod.google.com ([2002:a05:6a02:458e:b0:af2:681:e27a]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:ce44:b0:1fe:6bbf:af22 with SMTP id adf61e73a8af0-20444e6925dmr5081834637.1.1745524723187; Thu, 24 Apr 2025 12:58:43 -0700 (PDT) Date: Thu, 24 Apr 2025 12:58:27 -0700 In-Reply-To: <20250424195831.1767457-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250424195831.1767457-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.850.g28803427d3-goog Message-ID: <20250424195831.1767457-5-irogers@google.com> Subject: [PATCH v2 4/8] perf build-id: Truncate to avoid overflowing the build_id data From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Rajeev , Kajol Jain , Li Huafei , "Steinar H. Gunderson" , James Clark , Stephen Brennan , Andi Kleen , Dmitry Vyukov , Zhongqiu Han , Yicong Yang , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , "Dr. David Alan Gilbert" , Zixian Cai , Steve Clevenger , Thomas Falcon , Martin Liska , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , Song Liu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Warning when the build_id data would be overflowed would lead to memory corruption, switch to truncation. Signed-off-by: Ian Rogers --- tools/perf/util/build-id.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c index e763e8d99a43..5bc2040bdd0d 100644 --- a/tools/perf/util/build-id.c +++ b/tools/perf/util/build-id.c @@ -951,7 +951,10 @@ bool perf_session__read_build_ids(struct perf_session = *session, bool with_hits) =20 void build_id__init(struct build_id *bid, const u8 *data, size_t size) { - WARN_ON(size > BUILD_ID_SIZE); + if (size > BUILD_ID_SIZE) { + pr_debug("Truncating build_id size from %zd\n", size); + size =3D BUILD_ID_SIZE; + } memcpy(bid->data, data, size); bid->size =3D size; } --=20 2.49.0.850.g28803427d3-goog From nobody Sun Apr 26 09:30:43 2026 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 46BD62951B7 for ; Thu, 24 Apr 2025 19:58:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524728; cv=none; b=jwSflktLw7JCT353BoCc5gpN4xW2IadqlMgLdDQaFRPv8SNl3dUk3xpmITT3RDXtRt3k+Ql13OabnZkzDzBudHbH1T1ikMlo7fQsWEFU9WCRnVQwZkBDOYzGeLS9tqW9WEkGII5zXgpbM4TPJ87KV6QQRNsGWdvv6SA03fy+Dkg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524728; c=relaxed/simple; bh=p2eRvTf3rXW3JeWgfkZvmwPCSVSr9bITsVRvAbrY6g0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=BLCZ5yO3E6RYhrtfYJq4BxuJm1C7xrfpgT79UJdEdN+sECHB+g+Lx4CtprILtfe+ZWi61HHX7B9jM6IyC/fd8iGvy60L3dsvLfyIJ/5yjvvtv+Z0wvrsdms/C7aESRTYGF8edTJHevwEh1Cmo+5wDFoY8SaYnC+tXJR1TThQgfI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=J7tzTVJw; arc=none smtp.client-ip=209.85.215.202 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.b="J7tzTVJw" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-af9564001cbso823650a12.3 for ; Thu, 24 Apr 2025 12:58:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745524725; x=1746129525; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=/+MG/VN7W58Ap88hJarc64cBtYdkQn4m07RUIrdQtPQ=; b=J7tzTVJwVvRiz02D+Qx6FTmRuO8rcqtd89jWEQa5EFfN44Bm7b2FGlk676tx/BoBUR 8FjCGN4Acf6I4+MVdsstr1ejIe/orBZl9Hx9qLqZpoYz4hX2N+AZka/dPHEA/usrj5mr beQsDRbn/ueRE++t3jwWwKbm6hx4fH/csajqywDwkQPNjrRGUdHfxZlTw7w0yZ1EmQ1o dPTj1ZCMqB6n5JjJRoh/1thQykdyGQ/zRMnNtJktj7GiokjgcSzESIv+D3TNi19pdi6G 7sfnqDDzYLh/eUm4UdGMoXWLc8QafqtA3ZonTI/zmFvOKdwpR/OoYGsJFUed/6yHbITI Fyuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745524725; x=1746129525; h=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; bh=/+MG/VN7W58Ap88hJarc64cBtYdkQn4m07RUIrdQtPQ=; b=ZUW12JwNQQWJWxUvHO72DxstBRI0DhbAOxJqbgsjjJWC9Ku/a7jqSAt4ALdQMJeSvU AQluqmV1iTyEeJJ6uDGFwJzztLC/rS41ofUIyNYPEAqiNvDvwYi9aEh8sM4Z0roxoe9v lfPqYMi6WVMz+V0oT1DogVeusmBLpXDOBX6YuUVdoachhXet7L/Aba2GCWW9T0xju8mW eieddgcuL1PaDFBiDyauNgteIgBJK59v75l/6d2t1lnV8tQYGnqDtdE8Bf+iixy6ANhK w5bylBNcaBzk3DS7BFGJegpvUgLug0RYJY1DstRSAJyCfbd3LtyjXR65x8kptVMIgz5H JdLg== X-Forwarded-Encrypted: i=1; AJvYcCW/+HQ38ALwVCCmxl6WvLynXsFgARtqr55kW4+gwARRcagFb5nTZCRKKRiELltW2jUbAedOmSQeUwF6drc=@vger.kernel.org X-Gm-Message-State: AOJu0Yyd5HDsDSnqqrDUH1074HdLL+YpgFE+9vGmnHlSPrfbG+mo5FAv DsbCePWDlBj+NDPwGZh/IY7INEveVlkRzBgcPgntX2C0tyKCvWftJWGBaNpX4YJaPxKqkIeXHrA dp37lfw== X-Google-Smtp-Source: AGHT+IE0Oxbsvdq/dVke1i9qzFpunS1FeVO56y3iGCdxfwgLJBy51XpJCk/ba912lhAZQVSYg1B6VVyzK1yO X-Received: from pggg10.prod.google.com ([2002:a63:200a:0:b0:b16:f804:fb1]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:4a4a:b0:1f5:8f65:a6e4 with SMTP id adf61e73a8af0-2045657e27fmr967228637.7.1745524725442; Thu, 24 Apr 2025 12:58:45 -0700 (PDT) Date: Thu, 24 Apr 2025 12:58:28 -0700 In-Reply-To: <20250424195831.1767457-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250424195831.1767457-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.850.g28803427d3-goog Message-ID: <20250424195831.1767457-6-irogers@google.com> Subject: [PATCH v2 5/8] perf build-id: Change sprintf functions to snprintf From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Rajeev , Kajol Jain , Li Huafei , "Steinar H. Gunderson" , James Clark , Stephen Brennan , Andi Kleen , Dmitry Vyukov , Zhongqiu Han , Yicong Yang , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , "Dr. David Alan Gilbert" , Zixian Cai , Steve Clevenger , Thomas Falcon , Martin Liska , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , Song Liu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Pass in a size argument rather than implying all build id strings must be SBUILD_ID_SIZE. Signed-off-by: Ian Rogers --- tools/perf/builtin-buildid-cache.c | 12 +++---- tools/perf/builtin-buildid-list.c | 6 ++-- tools/perf/util/build-id.c | 33 ++++++++----------- tools/perf/util/build-id.h | 6 ++-- tools/perf/util/disasm.c | 2 +- tools/perf/util/dso.c | 4 +-- tools/perf/util/dsos.c | 2 +- tools/perf/util/event.c | 2 +- tools/perf/util/header.c | 2 +- tools/perf/util/map.c | 2 +- tools/perf/util/probe-file.c | 4 +-- .../scripting-engines/trace-event-python.c | 7 ++-- tools/perf/util/symbol.c | 2 +- 13 files changed, 38 insertions(+), 46 deletions(-) diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildi= d-cache.c index b0511d16aeb6..3f7739b21148 100644 --- a/tools/perf/builtin-buildid-cache.c +++ b/tools/perf/builtin-buildid-cache.c @@ -31,7 +31,7 @@ #include #include =20 -static int build_id_cache__kcore_buildid(const char *proc_dir, char *sbuil= did) +static int build_id_cache__kcore_buildid(const char *proc_dir, char *sbuil= did, size_t sbuildid_size) { char root_dir[PATH_MAX]; char *p; @@ -42,7 +42,7 @@ static int build_id_cache__kcore_buildid(const char *proc= _dir, char *sbuildid) if (!p) return -1; *p =3D '\0'; - return sysfs__sprintf_build_id(root_dir, sbuildid); + return sysfs__snprintf_build_id(root_dir, sbuildid, sbuildid_size); } =20 static int build_id_cache__kcore_dir(char *dir, size_t sz) @@ -128,7 +128,7 @@ static int build_id_cache__add_kcore(const char *filena= me, bool force) return -1; *p =3D '\0'; =20 - if (build_id_cache__kcore_buildid(from_dir, sbuildid) < 0) + if (build_id_cache__kcore_buildid(from_dir, sbuildid, sizeof(sbuildid)) <= 0) return -1; =20 scnprintf(to_dir, sizeof(to_dir), "%s/%s/%s", @@ -187,7 +187,7 @@ static int build_id_cache__add_file(const char *filenam= e, struct nsinfo *nsi) return -1; } =20 - build_id__sprintf(&bid, sbuild_id); + build_id__snprintf(&bid, sbuild_id, sizeof(sbuild_id)); err =3D build_id_cache__add_s(sbuild_id, filename, nsi, false, false); pr_debug("Adding %s %s: %s\n", sbuild_id, filename, @@ -211,7 +211,7 @@ static int build_id_cache__remove_file(const char *file= name, struct nsinfo *nsi) return -1; } =20 - build_id__sprintf(&bid, sbuild_id); + build_id__snprintf(&bid, sbuild_id, sizeof(sbuild_id)); err =3D build_id_cache__remove_s(sbuild_id); pr_debug("Removing %s %s: %s\n", sbuild_id, filename, err ? "FAIL" : "Ok"); @@ -317,7 +317,7 @@ static int build_id_cache__update_file(const char *file= name, struct nsinfo *nsi) } err =3D 0; =20 - build_id__sprintf(&bid, sbuild_id); + build_id__snprintf(&bid, sbuild_id, sizeof(sbuild_id)); if (build_id_cache__cached(sbuild_id)) err =3D build_id_cache__remove_s(sbuild_id); =20 diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid= -list.c index 52dfacaff8e3..ba8ba0303920 100644 --- a/tools/perf/builtin-buildid-list.c +++ b/tools/perf/builtin-buildid-list.c @@ -31,7 +31,7 @@ static int buildid__map_cb(struct map *map, void *arg __m= aybe_unused) =20 memset(bid_buf, 0, sizeof(bid_buf)); if (dso__has_build_id(dso)) - build_id__sprintf(dso__bid_const(dso), bid_buf); + build_id__snprintf(dso__bid_const(dso), bid_buf, sizeof(bid_buf)); printf("%s %16" PRIx64 " %16" PRIx64, bid_buf, map__start(map), map__end(= map)); if (dso_long_name !=3D NULL) printf(" %s", dso_long_name); @@ -57,7 +57,7 @@ static int sysfs__fprintf_build_id(FILE *fp) char sbuild_id[SBUILD_ID_SIZE]; int ret; =20 - ret =3D sysfs__sprintf_build_id("/", sbuild_id); + ret =3D sysfs__snprintf_build_id("/", sbuild_id, sizeof(sbuild_id)); if (ret !=3D sizeof(sbuild_id)) return ret < 0 ? ret : -EINVAL; =20 @@ -69,7 +69,7 @@ static int filename__fprintf_build_id(const char *name, F= ILE *fp) char sbuild_id[SBUILD_ID_SIZE]; int ret; =20 - ret =3D filename__sprintf_build_id(name, sbuild_id); + ret =3D filename__snprintf_build_id(name, sbuild_id, sizeof(sbuild_id)); if (ret !=3D sizeof(sbuild_id)) return ret < 0 ? ret : -EINVAL; =20 diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c index 5bc2040bdd0d..aa35dceace90 100644 --- a/tools/perf/util/build-id.c +++ b/tools/perf/util/build-id.c @@ -67,24 +67,17 @@ int build_id__mark_dso_hit(const struct perf_tool *tool= __maybe_unused, return 0; } =20 -int build_id__sprintf(const struct build_id *build_id, char *bf) +int build_id__snprintf(const struct build_id *build_id, char *bf, size_t b= f_size) { - char *bid =3D bf; - const u8 *raw =3D build_id->data; - size_t i; - - bf[0] =3D 0x0; + size_t offs =3D 0; =20 - for (i =3D 0; i < build_id->size; ++i) { - sprintf(bid, "%02x", *raw); - ++raw; - bid +=3D 2; - } + for (size_t i =3D 0; i < build_id->size && offs < bf_size; ++i) + offs +=3D snprintf(bf + offs, bf_size - offs, "%02x", build_id->data[i]); =20 - return (bid - bf) + 1; + return offs; } =20 -int sysfs__sprintf_build_id(const char *root_dir, char *sbuild_id) +int sysfs__snprintf_build_id(const char *root_dir, char *sbuild_id, size_t= sbuild_id_size) { char notes[PATH_MAX]; struct build_id bid; @@ -99,10 +92,10 @@ int sysfs__sprintf_build_id(const char *root_dir, char = *sbuild_id) if (ret < 0) return ret; =20 - return build_id__sprintf(&bid, sbuild_id); + return build_id__snprintf(&bid, sbuild_id, sbuild_id_size); } =20 -int filename__sprintf_build_id(const char *pathname, char *sbuild_id) +int filename__snprintf_build_id(const char *pathname, char *sbuild_id, siz= e_t sbuild_id_size) { struct build_id bid; int ret; @@ -111,7 +104,7 @@ int filename__sprintf_build_id(const char *pathname, ch= ar *sbuild_id) if (ret < 0) return ret; =20 - return build_id__sprintf(&bid, sbuild_id); + return build_id__snprintf(&bid, sbuild_id, sbuild_id_size); } =20 /* asnprintf consolidates asprintf and snprintf */ @@ -212,9 +205,9 @@ static bool build_id_cache__valid_id(char *sbuild_id) return false; =20 if (!strcmp(pathname, DSO__NAME_KALLSYMS)) - ret =3D sysfs__sprintf_build_id("/", real_sbuild_id); + ret =3D sysfs__snprintf_build_id("/", real_sbuild_id, sizeof(real_sbuild= _id)); else if (pathname[0] =3D=3D '/') - ret =3D filename__sprintf_build_id(pathname, real_sbuild_id); + ret =3D filename__snprintf_build_id(pathname, real_sbuild_id, sizeof(rea= l_sbuild_id)); else ret =3D -EINVAL; /* Should we support other special DSO cache? */ if (ret >=3D 0) @@ -243,7 +236,7 @@ char *__dso__build_id_filename(const struct dso *dso, c= har *bf, size_t size, if (!dso__has_build_id(dso)) return NULL; =20 - build_id__sprintf(dso__bid_const(dso), sbuild_id); + build_id__snprintf(dso__bid_const(dso), sbuild_id, sizeof(sbuild_id)); linkname =3D build_id_cache__linkname(sbuild_id, NULL, 0); if (!linkname) return NULL; @@ -769,7 +762,7 @@ static int build_id_cache__add_b(const struct build_id = *bid, { char sbuild_id[SBUILD_ID_SIZE]; =20 - build_id__sprintf(bid, sbuild_id); + build_id__snprintf(bid, sbuild_id, sizeof(sbuild_id)); =20 return __build_id_cache__add_s(sbuild_id, name, nsi, is_kallsyms, is_vdso, proper_name, root_dir); diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h index e3e0a446ff0c..47e621cebe1b 100644 --- a/tools/perf/util/build-id.h +++ b/tools/perf/util/build-id.h @@ -21,10 +21,10 @@ struct feat_fd; struct nsinfo; =20 void build_id__init(struct build_id *bid, const u8 *data, size_t size); -int build_id__sprintf(const struct build_id *build_id, char *bf); +int build_id__snprintf(const struct build_id *build_id, char *bf, size_t b= f_size); bool build_id__is_defined(const struct build_id *bid); -int sysfs__sprintf_build_id(const char *root_dir, char *sbuild_id); -int filename__sprintf_build_id(const char *pathname, char *sbuild_id); +int sysfs__snprintf_build_id(const char *root_dir, char *sbuild_id, size_t= sbuild_id_size); +int filename__snprintf_build_id(const char *pathname, char *sbuild_id, siz= e_t sbuild_id_size); char *build_id_cache__kallsyms_path(const char *sbuild_id, char *bf, size_t size); =20 diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index 73343ae5fc96..9aa032aae69c 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -1219,7 +1219,7 @@ int symbol__strerror_disassemble(struct map_symbol *m= s, int errnum, char *buf, s char *build_id_msg =3D NULL; =20 if (dso__has_build_id(dso)) { - build_id__sprintf(dso__bid(dso), bf + 15); + build_id__snprintf(dso__bid(dso), bf + 15, sizeof(bf) - 15); build_id_msg =3D bf; } scnprintf(buf, buflen, diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 8619b6eea62d..776506b93b8b 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -217,7 +217,7 @@ int dso__read_binary_type_filename(const struct dso *ds= o, break; } =20 - build_id__sprintf(dso__bid_const(dso), build_id_hex); + build_id__snprintf(dso__bid_const(dso), build_id_hex, sizeof(build_id_he= x)); len =3D __symbol__join_symfs(filename, size, "/usr/lib/debug/.build-id/"= ); snprintf(filename + len, size - len, "%.2s/%s.debug", build_id_hex, build_id_hex + 2); @@ -1697,7 +1697,7 @@ static size_t dso__fprintf_buildid(struct dso *dso, F= ILE *fp) { char sbuild_id[SBUILD_ID_SIZE]; =20 - build_id__sprintf(dso__bid(dso), sbuild_id); + build_id__snprintf(dso__bid(dso), sbuild_id, sizeof(sbuild_id)); return fprintf(fp, "%s", sbuild_id); } =20 diff --git a/tools/perf/util/dsos.c b/tools/perf/util/dsos.c index e0998e2a7c4e..b2172632b3cd 100644 --- a/tools/perf/util/dsos.c +++ b/tools/perf/util/dsos.c @@ -370,7 +370,7 @@ static int dsos__fprintf_buildid_cb(struct dso *dso, vo= id *data) =20 if (args->skip && args->skip(dso, args->parm)) return 0; - build_id__sprintf(dso__bid(dso), sbuild_id); + build_id__snprintf(dso__bid(dso), sbuild_id, sizeof(sbuild_id)); args->ret +=3D fprintf(args->fp, "%-40s %s\n", sbuild_id, dso__long_name(= dso)); return 0; } diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index c23b77f8f854..34176050ebac 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -329,7 +329,7 @@ size_t perf_event__fprintf_mmap2(union perf_event *even= t, FILE *fp) =20 build_id__init(&bid, event->mmap2.build_id, event->mmap2.build_id_size); - build_id__sprintf(&bid, sbuild_id); + build_id__snprintf(&bid, sbuild_id, sizeof(sbuild_id)); =20 return fprintf(fp, " %d/%d: [%#" PRI_lx64 "(%#" PRI_lx64 ") @ %#" PRI_lx= 64 " <%s>]: %c%c%c%c %s\n", diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index e3cdc3b7b4ab..38e903307e8e 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -2291,7 +2291,7 @@ static int __event_process_build_id(struct perf_recor= d_header_build_id *bev, free(m.name); } =20 - build_id__sprintf(dso__bid(dso), sbuild_id); + build_id__snprintf(dso__bid(dso), sbuild_id, sizeof(sbuild_id)); pr_debug("build id event received for %s: %s [%zu]\n", dso__long_name(dso), sbuild_id, size); dso__put(dso); diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index a22a423792d7..8858520c16f4 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -354,7 +354,7 @@ int map__load(struct map *map) if (dso__has_build_id(dso)) { char sbuild_id[SBUILD_ID_SIZE]; =20 - build_id__sprintf(dso__bid(dso), sbuild_id); + build_id__snprintf(dso__bid(dso), sbuild_id, sizeof(sbuild_id)); pr_debug("%s with build id %s not found", name, sbuild_id); } else pr_debug("Failed to open %s", name); diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c index ec8ac242fedb..5069fb61f48c 100644 --- a/tools/perf/util/probe-file.c +++ b/tools/perf/util/probe-file.c @@ -448,10 +448,10 @@ static int probe_cache__open(struct probe_cache *pcac= he, const char *target, if (!target || !strcmp(target, DSO__NAME_KALLSYMS)) { target =3D DSO__NAME_KALLSYMS; is_kallsyms =3D true; - ret =3D sysfs__sprintf_build_id("/", sbuildid); + ret =3D sysfs__snprintf_build_id("/", sbuildid, sizeof(sbuildid)); } else { nsinfo__mountns_enter(nsi, &nsc); - ret =3D filename__sprintf_build_id(target, sbuildid); + ret =3D filename__snprintf_build_id(target, sbuildid, sizeof(sbuildid)); nsinfo__mountns_exit(&nsc); } =20 diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools= /perf/util/scripting-engines/trace-event-python.c index 520729e78965..68e92552d954 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -780,14 +780,13 @@ static void set_sym_in_dict(PyObject *dict, struct ad= dr_location *al, const char *sym_field, const char *symoff_field, const char *map_pgoff) { - char sbuild_id[SBUILD_ID_SIZE]; - if (al->map) { + char sbuild_id[SBUILD_ID_SIZE]; struct dso *dso =3D map__dso(al->map); =20 pydict_set_item_string_decref(dict, dso_field, _PyUnicode_FromString(dso__name(dso))); - build_id__sprintf(dso__bid(dso), sbuild_id); + build_id__snprintf(dso__bid(dso), sbuild_id, sizeof(sbuild_id)); pydict_set_item_string_decref(dict, dso_bid_field, _PyUnicode_FromString(sbuild_id)); pydict_set_item_string_decref(dict, dso_map_start, @@ -1238,7 +1237,7 @@ static int python_export_dso(struct db_export *dbe, s= truct dso *dso, char sbuild_id[SBUILD_ID_SIZE]; PyObject *t; =20 - build_id__sprintf(dso__bid(dso), sbuild_id); + build_id__snprintf(dso__bid(dso), sbuild_id, sizeof(sbuild_id)); =20 t =3D tuple_new(5); =20 diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 11540219481b..30750ed313ca 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -2143,7 +2143,7 @@ static char *dso__find_kallsyms(struct dso *dso, stru= ct map *map) goto proc_kallsyms; } =20 - build_id__sprintf(dso__bid(dso), sbuild_id); + build_id__snprintf(dso__bid(dso), sbuild_id, sizeof(sbuild_id)); =20 /* Find kallsyms in build-id cache with kcore */ scnprintf(path, sizeof(path), "%s/%s/%s", --=20 2.49.0.850.g28803427d3-goog From nobody Sun Apr 26 09:30:43 2026 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5DBD292903 for ; Thu, 24 Apr 2025 19:58:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524729; cv=none; b=obIYQHJylUose8Mgt/fc9VzV2rO0qsDzC6V8W8UcsXPKgdPBnSOuYXKaiZRkhQK3uJuQIMH028gPOfJ7qapslgwib3bbQ0zV6aI+Lz4O+BNBuGh/feLa2sB6dh/jadQKZtW4oglQ9PzgbGaHHwaUGYIpA6/aM/yj6iWiPTFFUYk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524729; c=relaxed/simple; bh=OaLxK4NLbXyEfAebTw11HHE5mdZMWIyyvPjgkEfRWm8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=vFCrdbPcf6TPUtbXC9Wkv4COupFzck4YiKo42BQ/rOaqrtNMAfeuHuEHbiIcRqds54CpGqAHq8lkWiNd0abUj+KGEq5XkQDMivWuKjpI++FZtAtRM3EWvwati+Uq3G7KxHVxQLfjgddjv2G9wzn1IHdHxphlMu3YxVoPdMYJsgg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=uCVx8LHu; arc=none smtp.client-ip=209.85.216.73 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.b="uCVx8LHu" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3082946f829so2065265a91.0 for ; Thu, 24 Apr 2025 12:58:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745524727; x=1746129527; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=f6EGtFLa98WxK5zCboj+6ZTniMk5Dl/euWdE2ssUAQs=; b=uCVx8LHuOC3ACf9c8vDjdsQUONB/SMsQEc7WZRlvOI5r5Kvd/UrKuG1gbolFkl9uMa C7EPNTCKoTLSb3nj4T49qdNKxvoR6bQ/7m+VGfvWLgxDWnxj1s/HqNqWO0o4fuhlsO5+ DDgwEak7WALozpJNz9m/s2UrST8yfg+ZrUHHQoVCVNldECYmtT4Avs4Pf7q218+2KM3d 5Kfq56nKfRDiiYo2kGi9o4jZk1kfzVbiUdEhBKmYKG4mkPvTPV7LTDd7B92j6BkhjmnH fEztFw6679UOuXpKXq5M7i3Tm8UhsIJYzkbX6mTUPHxaSu51phNN6vv5U2J3GnWJB3rX jwnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745524727; x=1746129527; h=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; bh=f6EGtFLa98WxK5zCboj+6ZTniMk5Dl/euWdE2ssUAQs=; b=TsIwn95XPRtC39Zxlx3r6NaaytiHHA5FU8MhMM5Sx2yl6DGLOMkX9zGRzpYAgBhlQ/ nZHEqijkHSpYbJIpaWswkj1YfJxGgIhoJeD167YaVZrmRnqgQiYsCGwBKO8iVIRTb+4I 6lAysgqTDeAbfqojFj1aXzsBytRZCxq1N3YR3nwb+8HSjEZPZknfdbbCM7DXb/CqD8jD SY3U+GUvdYxFr5aMSCufKbmYPyY+lcM7zZ+y1JETFjwK9GlAPoeYiqtSFkFArWNxPYwJ J8My2utEEKe5Oonrk8qIgt48PRrZB/+Zd+RpNC0JxJ9wd6JpRJf8XqtCJTZBd92TmOpD 1yMQ== X-Forwarded-Encrypted: i=1; AJvYcCW0/KG8BwvWLsC18PXXjb/n2gYXWCsJwfCxPuCXihI1p50PygkEt2CeLun/a99xBmwlnRcTMUlq0JhHOhE=@vger.kernel.org X-Gm-Message-State: AOJu0YwMWZD5qoaw55M7StSm7dbGUjOKVLx6Acsm2ChqfhinYiYJjEjo WCR2CwCO3dKRzLatb2cYWFqbBiUUB0W3EqwtR8Xc/eImYetlnmGW3VpROGs+1010T+YzPSDsDX2 kUhw9Bg== X-Google-Smtp-Source: AGHT+IErnjW8J+G6I95oLXzVEkKCdON5M0MwKECmLZsiPhxu3n6KAp9BtXdppA02RaXscM/Sq/sPrm4dIg3F X-Received: from pjbqn3.prod.google.com ([2002:a17:90b:3d43:b0:308:64af:7bb9]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2c8e:b0:306:b65e:13a8 with SMTP id 98e67ed59e1d1-309ed26dbaemr5523150a91.8.1745524727133; Thu, 24 Apr 2025 12:58:47 -0700 (PDT) Date: Thu, 24 Apr 2025 12:58:29 -0700 In-Reply-To: <20250424195831.1767457-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250424195831.1767457-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.850.g28803427d3-goog Message-ID: <20250424195831.1767457-7-irogers@google.com> Subject: [PATCH v2 6/8] perf build-id: Mark DSO in sample callchains From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Rajeev , Kajol Jain , Li Huafei , "Steinar H. Gunderson" , James Clark , Stephen Brennan , Andi Kleen , Dmitry Vyukov , Zhongqiu Han , Yicong Yang , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , "Dr. David Alan Gilbert" , Zixian Cai , Steve Clevenger , Thomas Falcon , Martin Liska , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , Song Liu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Previously only the sample IP's map DSO would be marked hit for the purposes of populating the build ID cache. Walk the call chain to mark all IPs and DSOs. Signed-off-by: Ian Rogers --- tools/perf/util/build-id.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c index aa35dceace90..3386fa8e1e7e 100644 --- a/tools/perf/util/build-id.c +++ b/tools/perf/util/build-id.c @@ -42,10 +42,20 @@ =20 static bool no_buildid_cache; =20 +static int mark_dso_hit_callback(struct callchain_cursor_node *node, void = *data __maybe_unused) +{ + struct map *map =3D node->ms.map; + + if (map) + dso__set_hit(map__dso(map)); + + return 0; +} + int build_id__mark_dso_hit(const struct perf_tool *tool __maybe_unused, union perf_event *event, struct perf_sample *sample, - struct evsel *evsel __maybe_unused, + struct evsel *evsel, struct machine *machine) { struct addr_location al; @@ -63,6 +73,11 @@ int build_id__mark_dso_hit(const struct perf_tool *tool = __maybe_unused, dso__set_hit(map__dso(al.map)); =20 addr_location__exit(&al); + + sample__for_each_callchain_node(thread, evsel, sample, PERF_MAX_STACK_DEP= TH, + /*symbols=3D*/false, mark_dso_hit_callback, /*data=3D*/NULL); + + thread__put(thread); return 0; } --=20 2.49.0.850.g28803427d3-goog From nobody Sun Apr 26 09:30:43 2026 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 931742951C2 for ; Thu, 24 Apr 2025 19:58:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524733; cv=none; b=LA45J1byzA6Uq1cObkUmk34uolRP7bYhfnvofC78qs3N1lqEo6v4H5InE7y4nmdYerm8QuXoRC+KQbvdvfnlSYb6yVh4/jy46+Y06XjrKhNDheTonYn2uXg1YfmrNJGRgZLhVR7jVT++w0gu8/x8n4aFzlrvPWBC6xZcE7aRaZ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524733; c=relaxed/simple; bh=FUxkNSBQwPvwI3DK+3JFd2kvbAYE2XqIDCvtAGCpUBs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=cv4VS4L9hX1PWPOrLl2Vrq5G2LTkp7jbd25pabx53w1lwE03pSMYKxvtAQ9PifIrSCgeiKnLlzE7AM0AE7djh4sVrypgWOp72/3B2SYRcCJRHU/r7DBjBhE/RvS2ZkTWDyQhyHW6z+fkLek+KeUD/weHqGbUdcrD7qFIsXE9nV4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=WfSmb60a; arc=none smtp.client-ip=209.85.215.202 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.b="WfSmb60a" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-af534e796baso768731a12.3 for ; Thu, 24 Apr 2025 12:58:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745524729; x=1746129529; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=iN0z0PcQkJmC5+SkQ0XkHWi4VMzjfgAlXTq02Q2bWcY=; b=WfSmb60aKnRzbMO5EBTdHGTGlCjFnMo6QmJUPO2BeTRFTPzCk/D4f3wEiLtTsy04Rj oDxzko761YK1nTLSLjV7evAGZW7kxIYkxW2VgksmrTw2jzYnzV/EOnl356+p/6eN6ZYj uiMumBX0dulmGZTJyqqe6xMsqmbRFl63UgAohYEpRRbpBoebXF5bFuFe6Tv8+0ViRWQu CuKI+0NrAWeEyKLp9lrGwRnRuG5fwqGBwvSQ54iwY2mOUzuehC5+o0FervKpecqgPB3T pcMqBre4uKldBABpRpf6RZM0w4ZvMhKyeUlK7U+YDgX2fBFOxq2CAKgGjIa6nD/91qvl 8MTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745524729; x=1746129529; h=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; bh=iN0z0PcQkJmC5+SkQ0XkHWi4VMzjfgAlXTq02Q2bWcY=; b=S8AVKG3LHu18A6qR1BkIyNF4uS+m2tZpOfE+zIGSn7y1Ip+9FEKTI55jvNFvrmHhmX CLpSgWnhouTQpDKj7u33UhwzA1pwqSs6NQCcq0AtC61yogrymnarlNlKLo1Didg8nF1n FGpEzm8Ho72aG6eTcwsGYq0H7OqVHyRYChQshyqmqSXT2ulkltZ/LsqK3ZHYzwF1KNeu z0df84VDd8wUP7khBXKbHIxgZh5N+1xxySUKPsROAeJSb3DgewAqIJw5RcEsD9W3+0Qv 8luGlqAQis3n+J5Zu8kGPHeuByDAbHtv8uRzfFB5jOMu1RvA5KU0le0KhxvOuCBZ2pN6 uGog== X-Forwarded-Encrypted: i=1; AJvYcCV3vZQJtwRPsDmnSQrvVp2zFarrBERfORTQo5OLWcYgLZhDrwQ7dMgub0eU3J5dedvnZRyVMonEx6haiqE=@vger.kernel.org X-Gm-Message-State: AOJu0YwcNZijZ/Z2cVZtLAO3EB7krdgptg3u30ul6PO2JkwJwNKGadB2 msS1/N76aRBa6qf5Tx4Gwbx7QoaKHLyaGzPXG7TkUQz9/SuoZotuCkWNnfQtBjbgGk0Dqg/RaGG JWTVRWQ== X-Google-Smtp-Source: AGHT+IEGmSHlwze/Im0v9HLZ859wIfp5l3hnjrdOh0YqXLcxxflTH6jxVLnmJQnhuv8OVuZ7B2cr/42DpYHr X-Received: from pfbff10.prod.google.com ([2002:a05:6a00:2f4a:b0:730:8e17:ed13]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:3d8e:b0:1f5:8da5:ffe9 with SMTP id adf61e73a8af0-204565e6a5emr822092637.12.1745524728696; Thu, 24 Apr 2025 12:58:48 -0700 (PDT) Date: Thu, 24 Apr 2025 12:58:30 -0700 In-Reply-To: <20250424195831.1767457-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250424195831.1767457-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.850.g28803427d3-goog Message-ID: <20250424195831.1767457-8-irogers@google.com> Subject: [PATCH v2 7/8] perf dso: Move build_id to dso_id From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Rajeev , Kajol Jain , Li Huafei , "Steinar H. Gunderson" , James Clark , Stephen Brennan , Andi Kleen , Dmitry Vyukov , Zhongqiu Han , Yicong Yang , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , "Dr. David Alan Gilbert" , Zixian Cai , Steve Clevenger , Thomas Falcon , Martin Liska , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , Song Liu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The dso_id previously contained the major, minor, inode and inode generation information from a mmap2 event - the inode generation would be zero when reading from /proc/pid/maps. The build_id was in the dso. With build ID mmap2 events these fields wouldn't be initialized which would largely mean the special empty case where any dso would match for equality. This isn't desirable as if a dso is replaced we want the comparison to yield a difference. To support detecting the difference between DSOs based on build_id, move the build_id out of the DSO and into the dso_id. The dso_id is also stored in the DSO so nothing is lost. Capture in the dso_id what parts have been initialized and rename dso_id__inject to dso_id__improve_id so that it is clear the dso_id is being improved upon with additional information. With the build_id in the dso_id, use memcmp to compare for equality. Signed-off-by: Ian Rogers --- tools/perf/builtin-buildid-list.c | 2 +- tools/perf/builtin-inject.c | 32 ++++--- tools/perf/builtin-report.c | 11 ++- tools/perf/include/perf/perf_dlfilter.h | 2 +- tools/perf/tests/symbols.c | 4 +- tools/perf/util/build-id.c | 4 +- tools/perf/util/dso.c | 109 +++++++++++++----------- tools/perf/util/dso.h | 75 ++++++++-------- tools/perf/util/dsos.c | 18 ++-- tools/perf/util/machine.c | 28 +++--- tools/perf/util/map.c | 13 ++- tools/perf/util/map.h | 5 +- tools/perf/util/sort.c | 27 +++--- tools/perf/util/synthetic-events.c | 18 ++-- 14 files changed, 194 insertions(+), 154 deletions(-) diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid= -list.c index ba8ba0303920..151cd84b6dfe 100644 --- a/tools/perf/builtin-buildid-list.c +++ b/tools/perf/builtin-buildid-list.c @@ -31,7 +31,7 @@ static int buildid__map_cb(struct map *map, void *arg __m= aybe_unused) =20 memset(bid_buf, 0, sizeof(bid_buf)); if (dso__has_build_id(dso)) - build_id__snprintf(dso__bid_const(dso), bid_buf, sizeof(bid_buf)); + build_id__snprintf(dso__bid(dso), bid_buf, sizeof(bid_buf)); printf("%s %16" PRIx64 " %16" PRIx64, bid_buf, map__start(map), map__end(= map)); if (dso_long_name !=3D NULL) printf(" %s", dso_long_name); diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 11e49cafa3af..e74a3a70ff6f 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -587,15 +587,17 @@ static int perf_event__repipe_mmap2(const struct perf= _tool *tool, struct perf_sample *sample, struct machine *machine) { - struct dso_id id; - struct dso_id *dso_id =3D NULL; + struct dso_id id =3D dso_id_empty; =20 - if (!(event->header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID)) { + if (event->header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) { + build_id__init(&id.build_id, event->mmap2.build_id, event->mmap2.build_i= d_size); + } else { id.maj =3D event->mmap2.maj; id.min =3D event->mmap2.min; id.ino =3D event->mmap2.ino; id.ino_generation =3D event->mmap2.ino_generation; - dso_id =3D &id; + id.mmap2_valid =3D true; + id.mmap2_ino_generation_valid =3D true; } =20 return perf_event__repipe_common_mmap( @@ -603,7 +605,7 @@ static int perf_event__repipe_mmap2(const struct perf_t= ool *tool, event->mmap2.pid, event->mmap2.tid, event->mmap2.start, event->mmap2.len, event->mmap2.pgoff, event->mmap2.flags, event->mmap2.prot, - event->mmap2.filename, dso_id, + event->mmap2.filename, &id, perf_event__process_mmap2); } =20 @@ -671,19 +673,20 @@ static int perf_event__repipe_tracing_data(struct per= f_session *session, static int dso__read_build_id(struct dso *dso) { struct nscookie nsc; + struct build_id bid; =20 if (dso__has_build_id(dso)) return 0; =20 mutex_lock(dso__lock(dso)); nsinfo__mountns_enter(dso__nsinfo(dso), &nsc); - if (filename__read_build_id(dso__long_name(dso), dso__bid(dso)) > 0) - dso__set_has_build_id(dso); + if (filename__read_build_id(dso__long_name(dso), &bid) > 0) + dso__set_build_id(dso, &bid); else if (dso__nsinfo(dso)) { char *new_name =3D dso__filename_with_chroot(dso, dso__long_name(dso)); =20 - if (new_name && filename__read_build_id(new_name, dso__bid(dso)) > 0) - dso__set_has_build_id(dso); + if (new_name && filename__read_build_id(new_name, &bid) > 0) + dso__set_build_id(dso, &bid); free(new_name); } nsinfo__mountns_exit(&nsc); @@ -732,10 +735,11 @@ static bool perf_inject__lookup_known_build_id(struct= perf_inject *inject, struct dso *dso) { struct str_node *pos; - int bid_len; + struct build_id bid; =20 strlist__for_each_entry(pos, inject->known_build_ids) { const char *build_id, *dso_name; + int bid_len; =20 build_id =3D skip_spaces(pos->s); dso_name =3D strchr(build_id, ' '); @@ -744,11 +748,11 @@ static bool perf_inject__lookup_known_build_id(struct= perf_inject *inject, if (strcmp(dso__long_name(dso), dso_name)) continue; for (int ix =3D 0; 2 * ix + 1 < bid_len; ++ix) { - dso__bid(dso)->data[ix] =3D (hex(build_id[2 * ix]) << 4 | - hex(build_id[2 * ix + 1])); + bid.data[ix] =3D (hex(build_id[2 * ix]) << 4 | + hex(build_id[2 * ix + 1])); } - dso__bid(dso)->size =3D bid_len / 2; - dso__set_has_build_id(dso); + bid.size =3D bid_len / 2; + dso__set_build_id(dso, &bid); return true; } return false; diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index f0299c7ee025..98b1f73c28da 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -858,17 +858,24 @@ static int maps__fprintf_task_cb(struct map *map, voi= d *data) struct maps__fprintf_task_args *args =3D data; const struct dso *dso =3D map__dso(map); u32 prot =3D map__prot(map); + const struct dso_id *dso_id =3D dso__id_const(dso); int ret; + char buf[SBUILD_ID_SIZE]; + + if (dso_id->mmap2_valid) + snprintf(buf, sizeof(buf), "%" PRIu64, dso_id->ino); + else + build_id__snprintf(&dso_id->build_id, buf, sizeof(buf)); =20 ret =3D fprintf(args->fp, - "%*s %" PRIx64 "-%" PRIx64 " %c%c%c%c %08" PRIx64 " %" PRIu64 " %s\n", + "%*s %" PRIx64 "-%" PRIx64 " %c%c%c%c %08" PRIx64 " %s %s\n", args->indent, "", map__start(map), map__end(map), prot & PROT_READ ? 'r' : '-', prot & PROT_WRITE ? 'w' : '-', prot & PROT_EXEC ? 'x' : '-', map__flags(map) ? 's' : 'p', map__pgoff(map), - dso__id_const(dso)->ino, dso__name(dso)); + buf, dso__name(dso)); =20 if (ret < 0) return ret; diff --git a/tools/perf/include/perf/perf_dlfilter.h b/tools/perf/include/p= erf/perf_dlfilter.h index 16fc4568ac53..2d3540ed3c58 100644 --- a/tools/perf/include/perf/perf_dlfilter.h +++ b/tools/perf/include/perf/perf_dlfilter.h @@ -87,7 +87,7 @@ struct perf_dlfilter_al { __u8 is_64_bit; /* Only valid if dso is not NULL */ __u8 is_kernel_ip; /* True if in kernel space */ __u32 buildid_size; - __u8 *buildid; + const __u8 *buildid; /* Below members are only populated by resolve_ip() */ __u8 filtered; /* True if this sample event will be filtered out */ const char *comm; diff --git a/tools/perf/tests/symbols.c b/tools/perf/tests/symbols.c index ee20a366f32f..b07fdf831868 100644 --- a/tools/perf/tests/symbols.c +++ b/tools/perf/tests/symbols.c @@ -96,8 +96,8 @@ static int create_map(struct test_info *ti, char *filenam= e, struct map **map_p) dso__put(dso); =20 /* Create a dummy map at 0x100000 */ - *map_p =3D map__new(ti->machine, 0x100000, 0xffffffff, 0, NULL, - PROT_EXEC, 0, NULL, filename, ti->thread); + *map_p =3D map__new(ti->machine, 0x100000, 0xffffffff, 0, &dso_id_empty, + PROT_EXEC, /*flags=3D*/0, filename, ti->thread); if (!*map_p) { pr_debug("Failed to create map!"); return TEST_FAIL; diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c index 3386fa8e1e7e..b8d784120f20 100644 --- a/tools/perf/util/build-id.c +++ b/tools/perf/util/build-id.c @@ -251,7 +251,7 @@ char *__dso__build_id_filename(const struct dso *dso, c= har *bf, size_t size, if (!dso__has_build_id(dso)) return NULL; =20 - build_id__snprintf(dso__bid_const(dso), sbuild_id, sizeof(sbuild_id)); + build_id__snprintf(dso__bid(dso), sbuild_id, sizeof(sbuild_id)); linkname =3D build_id_cache__linkname(sbuild_id, NULL, 0); if (!linkname) return NULL; @@ -334,7 +334,7 @@ static int machine__write_buildid_table_cb(struct dso *= dso, void *data) } =20 in_kernel =3D dso__kernel(dso) || is_kernel_module(name, PERF_RECORD_MISC= _CPUMODE_UNKNOWN); - return write_buildid(name, name_len, dso__bid(dso), args->machine->pid, + return write_buildid(name, name_len, &dso__id(dso)->build_id, args->machi= ne->pid, in_kernel ? args->kmisc : args->umisc, args->fd); } =20 diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 776506b93b8b..493750142de7 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -217,7 +217,7 @@ int dso__read_binary_type_filename(const struct dso *ds= o, break; } =20 - build_id__snprintf(dso__bid_const(dso), build_id_hex, sizeof(build_id_he= x)); + build_id__snprintf(dso__bid(dso), build_id_hex, sizeof(build_id_hex)); len =3D __symbol__join_symfs(filename, size, "/usr/lib/debug/.build-id/"= ); snprintf(filename + len, size - len, "%.2s/%s.debug", build_id_hex, build_id_hex + 2); @@ -1379,64 +1379,76 @@ static void dso__set_long_name_id(struct dso *dso, = const char *name, bool name_a =20 static int __dso_id__cmp(const struct dso_id *a, const struct dso_id *b) { - if (a->maj > b->maj) return -1; - if (a->maj < b->maj) return 1; + if (a->mmap2_valid && b->mmap2_valid) { + if (a->maj > b->maj) return -1; + if (a->maj < b->maj) return 1; =20 - if (a->min > b->min) return -1; - if (a->min < b->min) return 1; + if (a->min > b->min) return -1; + if (a->min < b->min) return 1; =20 - if (a->ino > b->ino) return -1; - if (a->ino < b->ino) return 1; - - /* - * Synthesized MMAP events have zero ino_generation, avoid comparing - * them with MMAP events with actual ino_generation. - * - * I found it harmful because the mismatch resulted in a new - * dso that did not have a build ID whereas the original dso did have a - * build ID. The build ID was essential because the object was not found - * otherwise. - Adrian - */ - if (a->ino_generation && b->ino_generation) { + if (a->ino > b->ino) return -1; + if (a->ino < b->ino) return 1; + } + if (a->mmap2_ino_generation_valid && b->mmap2_ino_generation_valid) { if (a->ino_generation > b->ino_generation) return -1; if (a->ino_generation < b->ino_generation) return 1; } - + if (build_id__is_defined(&a->build_id) && build_id__is_defined(&b->build_= id)) { + if (a->build_id.size !=3D b->build_id.size) + return a->build_id.size < b->build_id.size ? -1 : 1; + return memcmp(a->build_id.data, b->build_id.data, a->build_id.size); + } return 0; } =20 -bool dso_id__empty(const struct dso_id *id) -{ - if (!id) - return true; - - return !id->maj && !id->min && !id->ino && !id->ino_generation; -} +const struct dso_id dso_id_empty =3D { + { + .maj =3D 0, + .min =3D 0, + .ino =3D 0, + .ino_generation =3D 0, + }, + .mmap2_valid =3D false, + .mmap2_ino_generation_valid =3D false, + { + .size =3D 0, + } +}; =20 -void __dso__inject_id(struct dso *dso, const struct dso_id *id) +void __dso__improve_id(struct dso *dso, const struct dso_id *id) { struct dsos *dsos =3D dso__dsos(dso); struct dso_id *dso_id =3D dso__id(dso); + bool changed =3D false; =20 /* dsos write lock held by caller. */ =20 - dso_id->maj =3D id->maj; - dso_id->min =3D id->min; - dso_id->ino =3D id->ino; - dso_id->ino_generation =3D id->ino_generation; - - if (dsos) + if (id->mmap2_valid && !dso_id->mmap2_valid) { + dso_id->maj =3D id->maj; + dso_id->min =3D id->min; + dso_id->ino =3D id->ino; + dso_id->mmap2_valid =3D true; + changed =3D true; + } + if (id->mmap2_ino_generation_valid && !dso_id->mmap2_ino_generation_valid= ) { + dso_id->ino_generation =3D id->ino_generation; + dso_id->mmap2_ino_generation_valid =3D true; + changed =3D true; + } + if (build_id__is_defined(&id->build_id) && !build_id__is_defined(&dso_id-= >build_id)) { + dso_id->build_id =3D id->build_id; + changed =3D true; + } + if (changed && dsos) dsos->sorted =3D false; } =20 int dso_id__cmp(const struct dso_id *a, const struct dso_id *b) { - /* - * The second is always dso->id, so zeroes if not set, assume passing - * NULL for a means a zeroed id - */ - if (dso_id__empty(a) || dso_id__empty(b)) + if (a =3D=3D &dso_id_empty || b =3D=3D &dso_id_empty) { + /* There is no valid data to compare so the comparison always returns id= entical. */ return 0; + } =20 return __dso_id__cmp(a, b); } @@ -1533,7 +1545,6 @@ struct dso *dso__new_id(const char *name, const struc= t dso_id *id) dso->loaded =3D 0; dso->rel =3D 0; dso->sorted_by_name =3D 0; - dso->has_build_id =3D 0; dso->has_srcline =3D 1; dso->a2l_fails =3D 1; dso->kernel =3D DSO_SPACE__USER; @@ -1638,15 +1649,14 @@ int dso__swap_init(struct dso *dso, unsigned char e= idata) return 0; } =20 -void dso__set_build_id(struct dso *dso, struct build_id *bid) +void dso__set_build_id(struct dso *dso, const struct build_id *bid) { - RC_CHK_ACCESS(dso)->bid =3D *bid; - RC_CHK_ACCESS(dso)->has_build_id =3D 1; + dso__id(dso)->build_id =3D *bid; } =20 -bool dso__build_id_equal(const struct dso *dso, struct build_id *bid) +bool dso__build_id_equal(const struct dso *dso, const struct build_id *bid) { - const struct build_id *dso_bid =3D dso__bid_const(dso); + const struct build_id *dso_bid =3D dso__bid(dso); =20 if (dso_bid->size > bid->size && dso_bid->size =3D=3D BUILD_ID_SIZE) { /* @@ -1665,18 +1675,20 @@ bool dso__build_id_equal(const struct dso *dso, str= uct build_id *bid) void dso__read_running_kernel_build_id(struct dso *dso, struct machine *ma= chine) { char path[PATH_MAX]; + struct build_id bid; =20 if (machine__is_default_guest(machine)) return; sprintf(path, "%s/sys/kernel/notes", machine->root_dir); - if (sysfs__read_build_id(path, dso__bid(dso)) =3D=3D 0) - dso__set_has_build_id(dso); + sysfs__read_build_id(path, &bid); + dso__set_build_id(dso, &bid); } =20 int dso__kernel_module_get_build_id(struct dso *dso, const char *root_dir) { char filename[PATH_MAX]; + struct build_id bid; /* * kernel module short names are of the form "[module]" and * we need just "module" here. @@ -1687,9 +1699,8 @@ int dso__kernel_module_get_build_id(struct dso *dso, "%s/sys/module/%.*s/notes/.note.gnu.build-id", root_dir, (int)strlen(name) - 1, name); =20 - if (sysfs__read_build_id(filename, dso__bid(dso)) =3D=3D 0) - dso__set_has_build_id(dso); - + sysfs__read_build_id(filename, &bid); + dso__set_build_id(dso, &bid); return 0; } =20 diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index c87564471f9b..3457d713d3c5 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -185,14 +185,33 @@ enum dso_load_errno { #define DSO__DATA_CACHE_SIZE 4096 #define DSO__DATA_CACHE_MASK ~(DSO__DATA_CACHE_SIZE - 1) =20 -/* - * Data about backing storage DSO, comes from PERF_RECORD_MMAP2 meta events +/** + * struct dso_id + * + * Data about backing storage DSO, comes from PERF_RECORD_MMAP2 meta event= s, + * reading from /proc/pid/maps or synthesis of build_ids from DSOs. Possib= ly + * incomplete at any particular use. */ struct dso_id { - u32 maj; - u32 min; - u64 ino; - u64 ino_generation; + /* Data related to the mmap2 event or read from /proc/pid/maps. */ + struct { + u32 maj; + u32 min; + u64 ino; + u64 ino_generation; + }; + /** @mmap2_valid: Are the maj, min and ino fields valid? */ + bool mmap2_valid; + /** + * @mmap2_ino_generation_valid: Is the ino_generation valid? Generally + * false for /proc/pid/maps mmap event. + */ + bool mmap2_ino_generation_valid; + /** + * @build_id: A possibly populated build_id. build_id__is_defined checks + * whether it is populated. + */ + struct build_id build_id; }; =20 struct dso_cache { @@ -243,7 +262,6 @@ DECLARE_RC_STRUCT(dso) { u64 addr; struct symbol *symbol; } last_find_result; - struct build_id bid; u64 text_offset; u64 text_end; const char *short_name; @@ -276,7 +294,6 @@ DECLARE_RC_STRUCT(dso) { enum dso_swap_type needs_swap:2; bool is_kmod:1; u8 adjust_symbols:1; - u8 has_build_id:1; u8 header_build_id:1; u8 has_srcline:1; u8 hit:1; @@ -292,6 +309,9 @@ DECLARE_RC_STRUCT(dso) { }; =20 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); =20 /* dso__for_each_symbol - iterate over the symbols of given type * @@ -362,31 +382,11 @@ static inline void dso__set_auxtrace_cache(struct dso= *dso, struct auxtrace_cach RC_CHK_ACCESS(dso)->auxtrace_cache =3D cache; } =20 -static inline struct build_id *dso__bid(struct dso *dso) -{ - return &RC_CHK_ACCESS(dso)->bid; -} - -static inline const struct build_id *dso__bid_const(const struct dso *dso) -{ - return &RC_CHK_ACCESS(dso)->bid; -} - static inline struct dso_bpf_prog *dso__bpf_prog(struct dso *dso) { return &RC_CHK_ACCESS(dso)->bpf_prog; } =20 -static inline bool dso__has_build_id(const struct dso *dso) -{ - return RC_CHK_ACCESS(dso)->has_build_id; -} - -static inline void dso__set_has_build_id(struct dso *dso) -{ - RC_CHK_ACCESS(dso)->has_build_id =3D true; -} - static inline bool dso__has_srcline(const struct dso *dso) { return RC_CHK_ACCESS(dso)->has_srcline; @@ -462,6 +462,16 @@ static inline const struct dso_id *dso__id_const(const= struct dso *dso) return &RC_CHK_ACCESS(dso)->id; } =20 +static inline const struct build_id *dso__bid(const struct dso *dso) +{ + return &dso__id_const(dso)->build_id; +} + +static inline bool dso__has_build_id(const struct dso *dso) +{ + return build_id__is_defined(dso__bid(dso)); +} + static inline struct rb_root_cached *dso__inlined_nodes(struct dso *dso) { return &RC_CHK_ACCESS(dso)->inlined_nodes; @@ -699,9 +709,6 @@ static inline void dso__set_text_offset(struct dso *dso= , u64 val) RC_CHK_ACCESS(dso)->text_offset =3D val; } =20 -int dso_id__cmp(const struct dso_id *a, const struct dso_id *b); -bool dso_id__empty(const struct dso_id *id); - struct dso *dso__new_id(const char *name, const struct dso_id *id); struct dso *dso__new(const char *name); void dso__delete(struct dso *dso); @@ -709,7 +716,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_allo= cated); void dso__set_long_name(struct dso *dso, const char *name, bool name_alloc= ated); -void __dso__inject_id(struct dso *dso, const struct dso_id *id); +void __dso__improve_id(struct dso *dso, const struct dso_id *id); =20 int dso__name_len(const struct dso *dso); =20 @@ -739,8 +746,8 @@ void dso__sort_by_name(struct dso *dso); =20 int dso__swap_init(struct dso *dso, unsigned char eidata); =20 -void dso__set_build_id(struct dso *dso, struct build_id *bid); -bool dso__build_id_equal(const struct dso *dso, struct build_id *bid); +void dso__set_build_id(struct dso *dso, const struct build_id *bid); +bool dso__build_id_equal(const struct dso *dso, const struct build_id *bid= ); void dso__read_running_kernel_build_id(struct dso *dso, struct machine *machine); int dso__kernel_module_get_build_id(struct dso *dso, const char *root_dir); diff --git a/tools/perf/util/dsos.c b/tools/perf/util/dsos.c index b2172632b3cd..ad919ed28ba4 100644 --- a/tools/perf/util/dsos.c +++ b/tools/perf/util/dsos.c @@ -72,6 +72,7 @@ static int dsos__read_build_ids_cb(struct dso *dso, void = *data) { struct dsos__read_build_ids_cb_args *args =3D data; struct nscookie nsc; + struct build_id bid; =20 if (args->with_hits && !dso__hit(dso) && !dso__is_vdso(dso)) return 0; @@ -80,15 +81,15 @@ static int dsos__read_build_ids_cb(struct dso *dso, voi= d *data) return 0; } nsinfo__mountns_enter(dso__nsinfo(dso), &nsc); - if (filename__read_build_id(dso__long_name(dso), dso__bid(dso)) > 0) { + if (filename__read_build_id(dso__long_name(dso), &bid) > 0) { + dso__set_build_id(dso, &bid); args->have_build_id =3D true; - dso__set_has_build_id(dso); } else if (errno =3D=3D ENOENT && dso__nsinfo(dso)) { char *new_name =3D dso__filename_with_chroot(dso, dso__long_name(dso)); =20 - if (new_name && filename__read_build_id(new_name, dso__bid(dso)) > 0) { + if (new_name && filename__read_build_id(new_name, &bid) > 0) { + dso__set_build_id(dso, &bid); args->have_build_id =3D true; - dso__set_has_build_id(dso); } free(new_name); } @@ -284,7 +285,7 @@ struct dso *dsos__find(struct dsos *dsos, const char *n= ame, bool cmp_short) struct dso *res; =20 down_read(&dsos->lock); - res =3D __dsos__find_id(dsos, name, NULL, cmp_short, /*write_locked=3D*/f= alse); + res =3D __dsos__find_id(dsos, name, &dso_id_empty, cmp_short, /*write_loc= ked=3D*/false); up_read(&dsos->lock); return res; } @@ -341,8 +342,8 @@ static struct dso *__dsos__findnew_id(struct dsos *dsos= , const char *name, const { struct dso *dso =3D __dsos__find_id(dsos, name, id, false, /*write_locked= =3D*/true); =20 - if (dso && dso_id__empty(dso__id(dso)) && !dso_id__empty(id)) - __dso__inject_id(dso, id); + if (dso) + __dso__improve_id(dso, id); =20 return dso ? dso : __dsos__addnew_id(dsos, name, id); } @@ -433,7 +434,8 @@ struct dso *dsos__findnew_module_dso(struct dsos *dsos, =20 down_write(&dsos->lock); =20 - dso =3D __dsos__find_id(dsos, m->name, NULL, /*cmp_short=3D*/true, /*writ= e_locked=3D*/true); + dso =3D __dsos__find_id(dsos, m->name, &dso_id_empty, /*cmp_short=3D*/tru= e, + /*write_locked=3D*/true); if (dso) { up_write(&dsos->lock); return dso; diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index b048165b10c1..04062148a9ec 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1696,21 +1696,21 @@ int machine__process_mmap2_event(struct machine *ma= chine, { struct thread *thread; struct map *map; - struct dso_id dso_id =3D { - .maj =3D event->mmap2.maj, - .min =3D event->mmap2.min, - .ino =3D event->mmap2.ino, - .ino_generation =3D event->mmap2.ino_generation, - }; - struct build_id __bid, *bid =3D NULL; + struct dso_id dso_id =3D dso_id_empty; int ret =3D 0; =20 if (dump_trace) perf_event__fprintf_mmap2(event, stdout); =20 if (event->header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) { - bid =3D &__bid; - build_id__init(bid, event->mmap2.build_id, event->mmap2.build_id_size); + build_id__init(&dso_id.build_id, event->mmap2.build_id, event->mmap2.bui= ld_id_size); + } else { + dso_id.maj =3D event->mmap2.maj; + dso_id.min =3D event->mmap2.min; + dso_id.ino =3D event->mmap2.ino; + dso_id.ino_generation =3D event->mmap2.ino_generation; + dso_id.mmap2_valid =3D true; + dso_id.mmap2_ino_generation_valid =3D true; } =20 if (sample->cpumode =3D=3D PERF_RECORD_MISC_GUEST_KERNEL || @@ -1722,7 +1722,7 @@ int machine__process_mmap2_event(struct machine *mach= ine, }; =20 strlcpy(xm.name, event->mmap2.filename, KMAP_NAME_LEN); - ret =3D machine__process_kernel_mmap_event(machine, &xm, bid); + ret =3D machine__process_kernel_mmap_event(machine, &xm, &dso_id.build_i= d); if (ret < 0) goto out_problem; return 0; @@ -1736,7 +1736,7 @@ int machine__process_mmap2_event(struct machine *mach= ine, map =3D map__new(machine, event->mmap2.start, event->mmap2.len, event->mmap2.pgoff, &dso_id, event->mmap2.prot, - event->mmap2.flags, bid, + event->mmap2.flags, event->mmap2.filename, thread); =20 if (map =3D=3D NULL) @@ -1794,8 +1794,8 @@ int machine__process_mmap_event(struct machine *machi= ne, union perf_event *event prot =3D PROT_EXEC; =20 map =3D map__new(machine, event->mmap.start, - event->mmap.len, event->mmap.pgoff, - NULL, prot, 0, NULL, event->mmap.filename, thread); + event->mmap.len, event->mmap.pgoff, + &dso_id_empty, prot, /*flags=3D*/0, event->mmap.filename, thread); =20 if (map =3D=3D NULL) goto out_problem_map; @@ -3157,7 +3157,7 @@ struct dso *machine__findnew_dso_id(struct machine *m= achine, const char *filenam =20 struct dso *machine__findnew_dso(struct machine *machine, const char *file= name) { - return machine__findnew_dso_id(machine, filename, NULL); + return machine__findnew_dso_id(machine, filename, &dso_id_empty); } =20 char *machine__resolve_kernel_addr(void *vmachine, unsigned long long *add= rp, char **modp) diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 8858520c16f4..41cdddc987ee 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -120,8 +120,8 @@ static void map__init(struct map *map, u64 start, u64 e= nd, u64 pgoff, } =20 struct map *map__new(struct machine *machine, u64 start, u64 len, - u64 pgoff, struct dso_id *id, - u32 prot, u32 flags, struct build_id *bid, + u64 pgoff, const struct dso_id *id, + u32 prot, u32 flags, char *filename, struct thread *thread) { struct map *result; @@ -132,7 +132,7 @@ struct map *map__new(struct machine *machine, u64 start= , u64 len, map =3D zalloc(sizeof(*map)); if (ADD_RC_CHK(result, map)) { char newfilename[PATH_MAX]; - struct dso *dso, *header_bid_dso; + struct dso *dso; int anon, no_dso, vdso, android; =20 android =3D is_android_lib(filename); @@ -189,16 +189,15 @@ struct map *map__new(struct machine *machine, u64 sta= rt, u64 len, dso__set_nsinfo(dso, nsi); mutex_unlock(dso__lock(dso)); =20 - if (build_id__is_defined(bid)) { - dso__set_build_id(dso, bid); - } else { + if (!build_id__is_defined(&id->build_id)) { /* * If the mmap event had no build ID, search for an existing dso from t= he * build ID header by name. Otherwise only the dso loaded at the time of * reading the header will have the build ID set and all future mmaps w= ill * have it missing. */ - header_bid_dso =3D dsos__find(&machine->dsos, filename, false); + struct dso *header_bid_dso =3D dsos__find(&machine->dsos, filename, fal= se); + if (header_bid_dso && dso__header_build_id(header_bid_dso)) { dso__set_build_id(dso, dso__bid(header_bid_dso)); dso__set_header_build_id(dso, 1); diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h index 768501eec70e..979b3e11b9bc 100644 --- a/tools/perf/util/map.h +++ b/tools/perf/util/map.h @@ -173,11 +173,10 @@ struct thread; __map__for_each_symbol_by_name(map, sym_name, (pos), idx) =20 struct dso_id; -struct build_id; =20 struct map *map__new(struct machine *machine, u64 start, u64 len, - u64 pgoff, struct dso_id *id, u32 prot, u32 flags, - struct build_id *bid, char *filename, struct thread *thread); + u64 pgoff, const struct dso_id *id, u32 prot, u32 flags, + char *filename, struct thread *thread); struct map *map__new2(u64 start, struct dso *dso); void map__delete(struct map *map); struct map *map__clone(struct map *map); diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 594b75ca95bf..d20b980d5052 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -1709,22 +1709,27 @@ sort__dcacheline_cmp(struct hist_entry *left, struc= t hist_entry *right) if (rc) return rc; /* - * Addresses with no major/minor numbers are assumed to be + * Addresses with no major/minor numbers or build ID are assumed to be * anonymous in userspace. Sort those on pid then address. * * The kernel and non-zero major/minor mapped areas are * assumed to be unity mapped. Sort those on address. */ + if (left->cpumode !=3D PERF_RECORD_MISC_KERNEL && (map__flags(l_map) & MA= P_SHARED) =3D=3D 0) { + const struct dso_id *dso_id =3D dso__id_const(l_dso); =20 - if ((left->cpumode !=3D PERF_RECORD_MISC_KERNEL) && - (!(map__flags(l_map) & MAP_SHARED)) && !dso__id(l_dso)->maj && !dso__= id(l_dso)->min && - !dso__id(l_dso)->ino && !dso__id(l_dso)->ino_generation) { - /* userspace anonymous */ + if (!dso_id->mmap2_valid) + dso_id =3D dso__id_const(r_dso); =20 - if (thread__pid(left->thread) > thread__pid(right->thread)) - return -1; - if (thread__pid(left->thread) < thread__pid(right->thread)) - return 1; + if (!build_id__is_defined(&dso_id->build_id) && + (!dso_id->mmap2_valid || (dso_id->maj =3D=3D 0 && dso_id->min =3D=3D= 0))) { + /* userspace anonymous */ + + if (thread__pid(left->thread) > thread__pid(right->thread)) + return -1; + if (thread__pid(left->thread) < thread__pid(right->thread)) + return 1; + } } =20 addr: @@ -1749,6 +1754,7 @@ static int hist_entry__dcacheline_snprintf(struct his= t_entry *he, char *bf, if (he->mem_info) { struct map *map =3D mem_info__daddr(he->mem_info)->ms.map; struct dso *dso =3D map ? map__dso(map) : NULL; + const struct dso_id *dso_id =3D dso ? dso__id_const(dso) : &dso_id_empty; =20 addr =3D cl_address(mem_info__daddr(he->mem_info)->al_addr, chk_double_c= l); ms =3D &mem_info__daddr(he->mem_info)->ms; @@ -1757,8 +1763,7 @@ static int hist_entry__dcacheline_snprintf(struct his= t_entry *he, char *bf, if ((he->cpumode !=3D PERF_RECORD_MISC_KERNEL) && map && !(map__prot(map) & PROT_EXEC) && (map__flags(map) & MAP_SHARED) && - (dso__id(dso)->maj || dso__id(dso)->min || dso__id(dso)->ino || - dso__id(dso)->ino_generation)) + (!dso_id->mmap2_valid || (dso_id->maj =3D=3D 0 && dso_id->min =3D= =3D 0))) level =3D 's'; else if (!map) level =3D 'X'; diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index 68bb7c5fe1b1..8fb2ea544d3a 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -372,7 +372,7 @@ static void perf_record_mmap2__read_build_id(struct per= f_record_mmap2 *event, struct nsinfo *nsi; struct nscookie nc; struct dso *dso =3D NULL; - struct dso_id id; + struct dso_id dso_id =3D dso_id_empty; int rc; =20 if (is_kernel) { @@ -380,12 +380,18 @@ static void perf_record_mmap2__read_build_id(struct p= erf_record_mmap2 *event, goto out; } =20 - id.maj =3D event->maj; - id.min =3D event->min; - id.ino =3D event->ino; - id.ino_generation =3D event->ino_generation; + if (event->header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) { + build_id__init(&dso_id.build_id, event->build_id, event->build_id_size); + } else { + dso_id.maj =3D event->maj; + dso_id.min =3D event->min; + dso_id.ino =3D event->ino; + dso_id.ino_generation =3D event->ino_generation; + dso_id.mmap2_valid =3D true; + dso_id.mmap2_ino_generation_valid =3D true; + }; =20 - dso =3D dsos__findnew_id(&machine->dsos, event->filename, &id); + dso =3D dsos__findnew_id(&machine->dsos, event->filename, &dso_id); if (dso && dso__has_build_id(dso)) { bid =3D *dso__bid(dso); rc =3D 0; --=20 2.49.0.850.g28803427d3-goog From nobody Sun Apr 26 09:30:43 2026 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1B6C29347C for ; Thu, 24 Apr 2025 19:58:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524733; cv=none; b=Cu5d8OEgqpYFvDC+X5ZU1i4hPgq7pyXfvsMg6mH/KN+gGD8irVHKkY/Qz036KMnWXBwCHieFYdEaNYyy7cB5nz136Fwi2VULpljQ5Htk5/DIL29D34KRIYSGl71/bjBZw3v5G3Ma49+jPTN7UmmKW7H3EJcGoWhBgM7ReAHCv8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745524733; c=relaxed/simple; bh=3mET9+njEz0Qqs0rjagQZqg2H0OJF9kLeZvRZQFAVGo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=sKzoucQqnr3EBkCa/nucy+SHtNE5cujjInPRObkm9ofe1QUeDdln9v1cBL2NIQ9RN4SGPWbKXqY9nhRwHDP0OwXpLTVr0/vUgDnDIy7MFI+OKd9Wl7S69ctlwGja8ZmZ+QQWfaUbul3kk2MlQMdCTuPA1+y65vZeh7JQtyzq43Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=3XTlBtxF; arc=none smtp.client-ip=209.85.216.73 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.b="3XTlBtxF" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2ff798e8c3bso1105613a91.2 for ; Thu, 24 Apr 2025 12:58:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745524731; x=1746129531; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=FsW7ntgrEiteL6+NRyYkKnb+c0cF8to6DMFvVFkK9wk=; b=3XTlBtxFMYyhKKjP2GYgKESbwCgAI3i1JyuuVtXoqI9AIRtXex9dVMCVG4eRku+6OX J31Fyjz6XcYCHF5Fi4glC5ghyP/jZTrKAsNXFKapokHBCxBQ9hRNrNNeAaYJJlHgwqii RiAkvtL4ZgajJlvSJYn5cm/rN8lc0QAX2M+VEHbzrLCvEA859Ra1RjBJ911sVnT2J4Rl gaPpmd/27AgMgJlDm2FCw6VKly+kyKuNH25px8fpOtCmVYdBsdpOvZWhUidXCB+GQmEE PT7ciKT3FmJOdhEoo1jQ5rbTuPwQMETUgexU7fHRK5o2V3wzVzg3uN+0SwzW48Jps4UU d57w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745524731; x=1746129531; h=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; bh=FsW7ntgrEiteL6+NRyYkKnb+c0cF8to6DMFvVFkK9wk=; b=kVMxmM88zRUWpRy5Rwb9lSjpL2OqIaVzEGciB70v6bKajuxO74bB3yz7CwYf7UFc9F PyEm2axpTaCrwt90Y569SIb+AKA0U9ZLGgeS1V6lRM5hYeyVP2Ptdr6PsnV/q3IrxeBw eAKcCbkVyBJBjP3yAFnAGKsw2tAwXUHgvATpwexR9LvXP8lULqcytbr0zHZ1bpXP3MSy WgVpfcU+aC7ErNUiP76waJxZ3ocByP8TYxEQ/uq9jRxA9bst/mTc9iHUV5wi/UCiEHhz tMKR5JpX/83f0urQwwNyzmo3RZOIPZ0LC1nefsmZRdQDaXihznlmEIS1jq5Aq412ckEB NmfA== X-Forwarded-Encrypted: i=1; AJvYcCXIvqXHcN87A1EnO6rjEgLaO3l34L1GFlr9SmlQImGoKlQlP/upntr1QMbPywMAMJJLz4ItwYHTPhgwy2c=@vger.kernel.org X-Gm-Message-State: AOJu0YwGmk2HHlgyNxFdXcYIYNVRYXsnTt8bjx0RlSd+WbFZDQdY2VQM fCdGpKwQM99UQMYm0nG5k7/8I715ZSllu8MyZP+WeAojj9fyrVagnoizM1PHJHcDIWRLWLcdtAH l1tWw/Q== X-Google-Smtp-Source: AGHT+IF61i443moqQRGbCyMTbCxXjQRC0vDLWqpkI7uiwvfyhgS5AvqN7qVyEWF4SUVt4tzWu/5uC98s2k/Q X-Received: from pjkk11.prod.google.com ([2002:a17:90b:57eb:b0:2fa:2661:76ac]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:da90:b0:2fa:f8d:65de with SMTP id 98e67ed59e1d1-309f56c67c7mr997471a91.22.1745524730623; Thu, 24 Apr 2025 12:58:50 -0700 (PDT) Date: Thu, 24 Apr 2025 12:58:31 -0700 In-Reply-To: <20250424195831.1767457-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250424195831.1767457-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.850.g28803427d3-goog Message-ID: <20250424195831.1767457-9-irogers@google.com> Subject: [PATCH v2 8/8] perf record: Make --buildid-mmap the default From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Rajeev , Kajol Jain , Li Huafei , "Steinar H. Gunderson" , James Clark , Stephen Brennan , Andi Kleen , Dmitry Vyukov , Zhongqiu Han , Yicong Yang , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , "Dr. David Alan Gilbert" , Zixian Cai , Steve Clevenger , Thomas Falcon , Martin Liska , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , Song Liu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Support for build IDs in mmap2 perf events has been present since Linux v5.12: https://lore.kernel.org/lkml/20210219194619.1780437-1-acme@kernel.org/ Build ID mmap events don't avoid the need to inject build IDs for DSO touched by samples as the build ID cache is populated by perf record. They can avoid some cases of symbol mis-resolution caused by the file system changing from when a sample occurred and when the DSO is sought. To disable build ID scanning Unlike the --buildid-mmap option, this doesn't disable the build ID cache but it does disable the processing of samples looking for DSOs to inject build IDs for. To disable the build ID cache the -B (--no-buildid) option should be used. Making this option the default was raised on the list in: https://lore.kernel.org/linux-perf-users/CAP-5=3DfXP7jN_QrGUcd55_QH5J-Y-FCa= J6=3DNaHVtyx0oyNh8_-Q@mail.gmail.com/ Signed-off-by: Ian Rogers --- tools/perf/builtin-record.c | 33 +++++++++++++++++++----------- tools/perf/util/symbol_conf.h | 2 +- tools/perf/util/synthetic-events.c | 16 +++++++-------- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index ba20bf7c011d..7b64013ba8c0 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -169,6 +169,7 @@ struct record { bool no_buildid_cache_set; bool buildid_all; bool buildid_mmap; + bool buildid_mmap_set; bool timestamp_filename; bool timestamp_boundary; bool off_cpu; @@ -1795,6 +1796,7 @@ record__finish_output(struct record *rec) data->dir.files[i].size =3D lseek(data->dir.files[i].fd, 0, SEEK_CUR); } =20 + /* Buildid scanning disabled or build ID in kernel and synthesized map ev= ents. */ if (!rec->no_buildid) { process_buildids(rec); =20 @@ -2966,6 +2968,8 @@ static int perf_record_config(const char *var, const = char *value, void *cb) rec->no_buildid =3D true; else if (!strcmp(value, "mmap")) rec->buildid_mmap =3D true; + else if (!strcmp(value, "no-mmap")) + rec->buildid_mmap =3D false; else return -1; return 0; @@ -3349,6 +3353,7 @@ static struct record record =3D { .ctl_fd_ack =3D -1, .synth =3D PERF_SYNTH_ALL, }, + .buildid_mmap =3D true, }; =20 const char record_callchain_help[] =3D CALLCHAIN_RECORD_HELP @@ -3514,8 +3519,8 @@ static struct option __record_options[] =3D { "file", "vmlinux pathname"), OPT_BOOLEAN(0, "buildid-all", &record.buildid_all, "Record build-id of all DSOs regardless of hits"), - OPT_BOOLEAN(0, "buildid-mmap", &record.buildid_mmap, - "Record build-id in map events"), + OPT_BOOLEAN_SET(0, "buildid-mmap", &record.buildid_mmap, &record.buildid_= mmap_set, + "Legacy record build-id in map events option which is now the default. = Behaves indentically to --no-buildid. Disable with --no-buildid-mmap"), OPT_BOOLEAN(0, "timestamp-filename", &record.timestamp_filename, "append timestamp to output filename"), OPT_BOOLEAN(0, "timestamp-boundary", &record.timestamp_boundary, @@ -4042,19 +4047,23 @@ int cmd_record(int argc, const char **argv) record.opts.record_switch_events =3D true; } =20 + if (!rec->buildid_mmap) { + pr_debug("Disabling build id in synthesized mmap2 events.\n"); + symbol_conf.no_buildid_mmap2 =3D true; + } else if (rec->buildid_mmap_set) { + /* + * Explicitly passing --buildid-mmap disables buildid processing + * and cache generation. + */ + rec->no_buildid =3D true; + } + if (rec->buildid_mmap && !perf_can_record_build_id()) { + pr_warning("Missing support for build id in kernel mmap events. Disable = this warning with --no-buildid-mmap\n"); + rec->buildid_mmap =3D false; + } if (rec->buildid_mmap) { - if (!perf_can_record_build_id()) { - pr_err("Failed: no support to record build id in mmap events, update yo= ur kernel.\n"); - err =3D -EINVAL; - goto out_opts; - } - pr_debug("Enabling build id in mmap2 events.\n"); - /* Enable mmap build id synthesizing. */ - symbol_conf.buildid_mmap2 =3D true; /* Enable perf_event_attr::build_id bit. */ rec->opts.build_id =3D true; - /* Disable build id cache. */ - rec->no_buildid =3D true; } =20 if (rec->opts.record_cgroup && !perf_can_record_cgroup()) { diff --git a/tools/perf/util/symbol_conf.h b/tools/perf/util/symbol_conf.h index cd9aa82c7d5a..7a80d2c14d9b 100644 --- a/tools/perf/util/symbol_conf.h +++ b/tools/perf/util/symbol_conf.h @@ -43,7 +43,7 @@ struct symbol_conf { report_individual_block, inline_name, disable_add2line_warn, - buildid_mmap2, + no_buildid_mmap2, guest_code, lazy_load_kernel_maps, keep_exited_threads, diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index 8fb2ea544d3a..f48109c14235 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -532,7 +532,7 @@ int perf_event__synthesize_mmap_events(const struct per= f_tool *tool, event->mmap2.pid =3D tgid; event->mmap2.tid =3D pid; =20 - if (symbol_conf.buildid_mmap2) + if (!symbol_conf.no_buildid_mmap2) perf_record_mmap2__read_build_id(&event->mmap2, machine, false); =20 if (perf_tool__process_synth_event(tool, event, machine, process) !=3D 0= ) { @@ -690,7 +690,7 @@ static int perf_event__synthesize_modules_maps_cb(struc= t map *map, void *data) return 0; =20 dso =3D map__dso(map); - if (symbol_conf.buildid_mmap2) { + if (!symbol_conf.no_buildid_mmap2) { size =3D PERF_ALIGN(dso__long_name_len(dso) + 1, sizeof(u64)); event->mmap2.header.type =3D PERF_RECORD_MMAP2; event->mmap2.header.size =3D (sizeof(event->mmap2) - @@ -734,9 +734,9 @@ int perf_event__synthesize_modules(const struct perf_to= ol *tool, perf_event__han .process =3D process, .machine =3D machine, }; - size_t size =3D symbol_conf.buildid_mmap2 - ? sizeof(args.event->mmap2) - : sizeof(args.event->mmap); + size_t size =3D symbol_conf.no_buildid_mmap2 + ? sizeof(args.event->mmap) + : sizeof(args.event->mmap2); =20 args.event =3D zalloc(size + machine->id_hdr_size); if (args.event =3D=3D NULL) { @@ -1124,8 +1124,8 @@ static int __perf_event__synthesize_kernel_mmap(const= struct perf_tool *tool, struct machine *machine) { union perf_event *event; - size_t size =3D symbol_conf.buildid_mmap2 ? - sizeof(event->mmap2) : sizeof(event->mmap); + size_t size =3D symbol_conf.no_buildid_mmap2 ? + sizeof(event->mmap) : sizeof(event->mmap2); struct map *map =3D machine__kernel_map(machine); struct kmap *kmap; int err; @@ -1159,7 +1159,7 @@ static int __perf_event__synthesize_kernel_mmap(const= struct perf_tool *tool, event->header.misc =3D PERF_RECORD_MISC_GUEST_KERNEL; } =20 - if (symbol_conf.buildid_mmap2) { + if (!symbol_conf.no_buildid_mmap2) { size =3D snprintf(event->mmap2.filename, sizeof(event->mmap2.filename), "%s%s", machine->mmap_name, kmap->ref_reloc_sym->name) + 1; size =3D PERF_ALIGN(size, sizeof(u64)); --=20 2.49.0.850.g28803427d3-goog