From nobody Fri Dec 26 21:32:42 2025 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.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 7B59D199C5 for ; Wed, 3 Jan 2024 05:07:24 +0000 (UTC) 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="QWIvUVNC" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dbdac466edcso9615393276.2 for ; Tue, 02 Jan 2024 21:07:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1704258443; x=1704863243; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=o5RW6C4QLlKb0JTE6SUzx9NkbdG8GLD5Go3ZjoyQj1I=; b=QWIvUVNC8io+GBiLMKamE1O6DsOpqKM5CLYCUV227u0zTQSbeyQoPZQtIsjIpHdRay Z4MZnoA98f+1xACA/6hRbfMYdKg5Y8lZsmPX+opAS1MFHJpgf8NB1xYbo0u+nk3r9/C4 EYR82pwmk/drh+BeYwzqyGdyjAyAb4TaHakqVYnmm5DUrejtBZWkT9d1/CzlKbHlV+ns Fdb3uSSiKwCzy6djYdDNSeM7JwKAzh0YbG+/nX5lDjprJVDlm4soBoNZTiOdrc7Nj8mj hJnuhU96DSln++VqhIvae1Kb/ms2RR3b23swGafCye1zD+1rHqJmjQzGPhBVBEsStAaa VFGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704258443; x=1704863243; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=o5RW6C4QLlKb0JTE6SUzx9NkbdG8GLD5Go3ZjoyQj1I=; b=LgqkfugHEZNCMsWTFZyfZr8tx2P1vvq/a4s0mrryLcAomLXAkFXhe3h7elOJNlCH5X j6v6gPmZR+/nizcd5G38l6xmWFOodV7siQw0p89QQxv3zA/i0zCgjRNRkPChyccnp1o1 7KakMx/HdeaGy++TqHnFK2lEfCCWNnOCfIEIR0RY5/eePxIgeyU0q9W5GZMaoh18fz/s X5mQQfKglFQKnMvfdgS42VRDzSRPbh6YhV5Fb7XaKsaSH0ABOnuE9aosKwBb3Fc/sBAO jgOnl4NDVIwxjYYTj7XyobfTXB8xBPNHLf4RnR4CdNcztvJ/TnFwxBHzM+8YPbwqYeSs Slqg== X-Gm-Message-State: AOJu0YySnEWaLWQKIsqpAGj83VjHCcen7t3DN895rDaZYcSEvHMxFWGu TVixyt15Hu+EGV4vMgFSOWpNxGwByc43S9XeeEk= X-Google-Smtp-Source: AGHT+IF2NvIxFKJPHwA+mNbn55izav/7/2GUPnqmjVEjVirGYQyGVvhBV2ElZjF5KCi8lv5Yp7vgmShwQ2V2 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:e2bd:f1f6:8ea6:8d6c]) (user=irogers job=sendgmr) by 2002:a25:b9c1:0:b0:dbd:b7cb:8a6b with SMTP id y1-20020a25b9c1000000b00dbdb7cb8a6bmr520882ybj.1.1704258443525; Tue, 02 Jan 2024 21:07:23 -0800 (PST) Date: Tue, 2 Jan 2024 21:06:26 -0800 In-Reply-To: <20240103050635.391888-1-irogers@google.com> Message-Id: <20240103050635.391888-17-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240103050635.391888-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Subject: [PATCH v7 16/25] perf dsos: Add dsos__for_each_dso From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Nick Terrell , Kan Liang , Andi Kleen , Kajol Jain , Athira Rajeev , Huacai Chen , Masami Hiramatsu , Vincent Whitchurch , "Steinar H. Gunderson" , Liam Howlett , Miguel Ojeda , Colin Ian King , Dmitrii Dolgov <9erthalion6@gmail.com>, Yang Jihong , Ming Wang , James Clark , K Prateek Nayak , Sean Christopherson , Leo Yan , Ravi Bangoria , German Gomez , Changbin Du , Paolo Bonzini , Li Dong , Sandipan Das , liuwenyu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Guilherme Amadio Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To better abstract the dsos internals, add dsos__for_each_dso that does a callback on each dso. This also means the read lock can be correctly held. Signed-off-by: Ian Rogers --- tools/perf/builtin-inject.c | 25 +++++++----- tools/perf/util/build-id.c | 76 ++++++++++++++++++++----------------- tools/perf/util/dsos.c | 16 ++++++++ tools/perf/util/dsos.h | 8 +--- tools/perf/util/machine.c | 40 +++++++++++-------- 5 files changed, 100 insertions(+), 65 deletions(-) diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index ef73317e6ae7..ce5e28eaad90 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -1187,23 +1187,28 @@ static int synthesize_build_id(struct perf_inject *= inject, struct dso *dso, pid_ process_build_id, machine); } =20 +static int guest_session__add_build_ids_cb(struct dso *dso, void *data) +{ + struct guest_session *gs =3D data; + struct perf_inject *inject =3D container_of(gs, struct perf_inject, guest= _session); + + if (!dso->has_build_id) + return 0; + + return synthesize_build_id(inject, dso, gs->machine_pid); + +} + static int guest_session__add_build_ids(struct guest_session *gs) { struct perf_inject *inject =3D container_of(gs, struct perf_inject, guest= _session); - struct machine *machine =3D &gs->session->machines.host; - struct dso *dso; - int ret; =20 /* Build IDs will be put in the Build ID feature section */ perf_header__set_feat(&inject->session->header, HEADER_BUILD_ID); =20 - dsos__for_each_with_build_id(dso, &machine->dsos.head) { - ret =3D synthesize_build_id(inject, dso, gs->machine_pid); - if (ret) - return ret; - } - - return 0; + return dsos__for_each_dso(&gs->session->machines.host.dsos, + guest_session__add_build_ids_cb, + gs); } =20 static int guest_session__ksymbol_event(struct perf_tool *tool, diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c index a617b1917e6b..a6d3c253f19f 100644 --- a/tools/perf/util/build-id.c +++ b/tools/perf/util/build-id.c @@ -327,48 +327,56 @@ static int write_buildid(const char *name, size_t nam= e_len, struct build_id *bid return write_padded(fd, name, name_len + 1, len); } =20 -static int machine__write_buildid_table(struct machine *machine, - struct feat_fd *fd) +struct machine__write_buildid_table_cb_args { + struct machine *machine; + struct feat_fd *fd; + u16 kmisc, umisc; +}; + +static int machine__write_buildid_table_cb(struct dso *dso, void *data) { - int err =3D 0; - struct dso *pos; - u16 kmisc =3D PERF_RECORD_MISC_KERNEL, - umisc =3D PERF_RECORD_MISC_USER; + struct machine__write_buildid_table_cb_args *args =3D data; + const char *name; + size_t name_len; + bool in_kernel =3D false; =20 - if (!machine__is_host(machine)) { - kmisc =3D PERF_RECORD_MISC_GUEST_KERNEL; - umisc =3D PERF_RECORD_MISC_GUEST_USER; - } + if (!dso->has_build_id) + return 0; =20 - dsos__for_each_with_build_id(pos, &machine->dsos.head) { - const char *name; - size_t name_len; - bool in_kernel =3D false; + if (!dso->hit && !dso__is_vdso(dso)) + return 0; =20 - if (!pos->hit && !dso__is_vdso(pos)) - continue; + if (dso__is_vdso(dso)) { + name =3D dso->short_name; + name_len =3D dso->short_name_len; + } else if (dso__is_kcore(dso)) { + name =3D args->machine->mmap_name; + name_len =3D strlen(name); + } else { + name =3D dso->long_name; + name_len =3D dso->long_name_len; + } =20 - if (dso__is_vdso(pos)) { - name =3D pos->short_name; - name_len =3D pos->short_name_len; - } else if (dso__is_kcore(pos)) { - name =3D machine->mmap_name; - name_len =3D strlen(name); - } else { - name =3D pos->long_name; - name_len =3D pos->long_name_len; - } + in_kernel =3D dso->kernel || is_kernel_module(name, PERF_RECORD_MISC_CPUM= ODE_UNKNOWN); + return write_buildid(name, name_len, &dso->bid, args->machine->pid, + in_kernel ? args->kmisc : args->umisc, args->fd); +} =20 - in_kernel =3D pos->kernel || - is_kernel_module(name, - PERF_RECORD_MISC_CPUMODE_UNKNOWN); - err =3D write_buildid(name, name_len, &pos->bid, machine->pid, - in_kernel ? kmisc : umisc, fd); - if (err) - break; +static int machine__write_buildid_table(struct machine *machine, struct fe= at_fd *fd) +{ + struct machine__write_buildid_table_cb_args args =3D { + .machine =3D machine, + .fd =3D fd, + .kmisc =3D PERF_RECORD_MISC_KERNEL, + .umisc =3D PERF_RECORD_MISC_USER, + }; + + if (!machine__is_host(machine)) { + args.kmisc =3D PERF_RECORD_MISC_GUEST_KERNEL; + args.umisc =3D PERF_RECORD_MISC_GUEST_USER; } =20 - return err; + return dsos__for_each_dso(&machine->dsos, machine__write_buildid_table_cb= , &args); } =20 int perf_session__write_buildid_table(struct perf_session *session, diff --git a/tools/perf/util/dsos.c b/tools/perf/util/dsos.c index d269e09005a7..d43f64939b12 100644 --- a/tools/perf/util/dsos.c +++ b/tools/perf/util/dsos.c @@ -433,3 +433,19 @@ struct dso *dsos__find_kernel_dso(struct dsos *dsos) up_read(&dsos->lock); return res; } + +int dsos__for_each_dso(struct dsos *dsos, int (*cb)(struct dso *dso, void = *data), void *data) +{ + struct dso *dso; + + down_read(&dsos->lock); + list_for_each_entry(dso, &dsos->head, node) { + int err; + + err =3D cb(dso, data); + if (err) + return err; + } + up_read(&dsos->lock); + return 0; +} diff --git a/tools/perf/util/dsos.h b/tools/perf/util/dsos.h index a7c7f723c5ff..317a263f0e37 100644 --- a/tools/perf/util/dsos.h +++ b/tools/perf/util/dsos.h @@ -23,12 +23,6 @@ struct dsos { struct rw_semaphore lock; }; =20 -#define dsos__for_each_with_build_id(pos, head) \ - list_for_each_entry(pos, head, node) \ - if (!pos->has_build_id) \ - continue; \ - else - void dsos__init(struct dsos *dsos); void dsos__exit(struct dsos *dsos); =20 @@ -55,4 +49,6 @@ struct dso *dsos__findnew_module_dso(struct dsos *dsos, s= truct machine *machine, =20 struct dso *dsos__find_kernel_dso(struct dsos *dsos); =20 +int dsos__for_each_dso(struct dsos *dsos, int (*cb)(struct dso *dso, void = *data), void *data); + #endif /* __PERF_DSOS */ diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 8d0ea17e432a..f1186a5bb73c 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1561,16 +1561,14 @@ int machine__create_kernel_maps(struct machine *mac= hine) return ret; } =20 -static bool machine__uses_kcore(struct machine *machine) +static int machine__uses_kcore_cb(struct dso *dso, void *data __maybe_unus= ed) { - struct dso *dso; - - list_for_each_entry(dso, &machine->dsos.head, node) { - if (dso__is_kcore(dso)) - return true; - } + return dso__is_kcore(dso) ? 1 : 0; +} =20 - return false; +static bool machine__uses_kcore(struct machine *machine) +{ + return dsos__for_each_dso(&machine->dsos, machine__uses_kcore_cb, NULL) != =3D 0 ? true : false; } =20 static bool perf_event__is_extra_kernel_mmap(struct machine *machine, @@ -3136,16 +3134,28 @@ char *machine__resolve_kernel_addr(void *vmachine, = unsigned long long *addrp, ch return sym->name; } =20 +struct machine__for_each_dso_cb_args { + struct machine *machine; + machine__dso_t fn; + void *priv; +}; + +static int machine__for_each_dso_cb(struct dso *dso, void *data) +{ + struct machine__for_each_dso_cb_args *args =3D data; + + return args->fn(dso, args->machine, args->priv); +} + int machine__for_each_dso(struct machine *machine, machine__dso_t fn, void= *priv) { - struct dso *pos; - int err =3D 0; + struct machine__for_each_dso_cb_args args =3D { + .machine =3D machine, + .fn =3D fn, + .priv =3D priv, + }; =20 - list_for_each_entry(pos, &machine->dsos.head, node) { - if (fn(pos, machine, priv)) - err =3D -1; - } - return err; + return dsos__for_each_dso(&machine->dsos, machine__for_each_dso_cb, &args= ); } =20 int machine__for_each_kernel_map(struct machine *machine, machine__map_t f= n, void *priv) --=20 2.43.0.472.g3155946c3a-goog