From nobody Tue Apr 28 02:27:40 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36D7CCCA497 for ; Wed, 8 Jun 2022 01:29:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1387295AbiFHB1R (ORCPT ); Tue, 7 Jun 2022 21:27:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1382485AbiFGWEb (ORCPT ); Tue, 7 Jun 2022 18:04:31 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02E82195908 for ; Tue, 7 Jun 2022 12:16:05 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id e18-20020a170902ef5200b0016153d857a6so9848146plx.5 for ; Tue, 07 Jun 2022 12:16:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=kIErM4k6WhLC0n6Ns2bjZKjlflhoJThht73EacMy2qk=; b=Zg5C6wO5vUcCUbuYsPt4beKzGiXy+rxA2PKUAbTNLJ1rLtk/XsZt+lYpgRva4Oe10/ 5nQlQYM/MhvdUkY8nb+q2tuwUYIhPpfmXFvcRLvF/SqbVk4wbJsASqg7A/OL8NddBONn HjMxCakD8IPiuOWS5hvjzDMkEbwnXK3CJmtCJd4hzVc+BanqXedUNyvu1BXHuXgN0Fnw AScgVGcbFjMhluFiR++2wL759Xqy+6ps85bnotbc5hAa+KlDhRfPBIojz5cXSkIijTzt oFHQLgzeeLN/nTRvxxWogky8oHFQkinuBn/pzl16wkJaRoIKpB2Uhw3MNsrjPiOLBJGM BZ7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=kIErM4k6WhLC0n6Ns2bjZKjlflhoJThht73EacMy2qk=; b=sogrt/8GSu3CkGrdczwrTTl7aIF9FGaP2KNT5yFXL+dPXqgqCkB8ZnLa3FTeCoBBaG qQdj0LMZyzo7RZLbY5ZQAww0HrUyHSrxpJ51IuAGPJS9J2w0j+KUsRr+Ro2PV+cYrr6H 9GeHoE9IiCKe4z0C8FG8qLTeQVJMudewzDptp5VTa30FYXmRFAY/bfscm6HfRdJyBHQ3 6/dfnWVhgaerNmuroJYSjhbhaAsqJJsTWyLGqk0hmF3Gt8PAb5Gmi40KFhSPzjlTUTAz XF3Y+fQlIxEx9p4sL2hHae3K5Y3cl4poj/gDy1U5GDfSIE7bkjUV1UQA4+M/vCBYP0it WddQ== X-Gm-Message-State: AOAM533lJngsECdCUB/66pY6JfvaWctHZStRdNJ5fMBDeppipYLGyS5U p0H+oesA9DlpZVKLjGBgFfNN+Eh9G7f0OPPq X-Google-Smtp-Source: ABdhPJxrSlVvA4MyvWzvWiYXFr65wiAwy6FMhxpeLr/ttpdkEgkeM6++R+P8PeqwXtfBXjHFsgVv6CfX8cSC6EyB X-Received: from blakejones.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:411c]) (user=blakejones job=sendgmr) by 2002:a17:902:e34b:b0:166:342f:82c6 with SMTP id p11-20020a170902e34b00b00166342f82c6mr29823442plc.29.1654629364408; Tue, 07 Jun 2022 12:16:04 -0700 (PDT) Date: Tue, 7 Jun 2022 12:15:50 -0700 Message-Id: <20220607191550.4141024-1-blakejones@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog Subject: [PATCH RESEND] Add a "-m" option to "perf buildid-list". From: Blake Jones To: Arnaldo Carvalho de Melo Cc: Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Peter Zijlstra , Ingo Molnar , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Blake Jones Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This new option displays all of the information needed to do external BuildID-based symbolization of kernel stack traces, such as those collected by bpf_get_stackid(). For each kernel module plus the main kernel, it displays the BuildID, the start and end virtual addresses of that module's text range (rounded out to page boundaries), and the pathname of the module. When run as a non-privileged user, the actual addresses of the modules' text ranges are not available, so the tools displays "0, " for kernel modules and "0, ffffffffffffffff" for the kernel itself. This patch has been rebased as of this afternoon, but is otherwise identical to the version I sent out last month. Sample output: root# perf buildid-list -m cf6df852fd4da122d616153353cc8f560fd12fe0 ffffffffa5400000 ffffffffa6001e27 = [kernel.kallsyms] 1aa7209aa2acb067d66ed6cf7676d65066384d61 ffffffffc0087000 ffffffffc008b000 = /lib/modules/5.15.15-1rodete2-amd64/kernel/crypto/sha512_generic.ko 3857815b5bf0183697b68f8fe0ea06121644041e ffffffffc008c000 ffffffffc0098000 = /lib/modules/5.15.15-1rodete2-amd64/kernel/arch/x86/crypto/sha512-ssse3.ko 4081fde0bca2bc097cb3e9d1efcb836047d485f1 ffffffffc0099000 ffffffffc009f000 = /lib/modules/5.15.15-1rodete2-amd64/kernel/drivers/acpi/button.ko 1ef81ba4890552ea6b0314f9635fc43fc8cef568 ffffffffc00a4000 ffffffffc00aa000 = /lib/modules/5.15.15-1rodete2-amd64/kernel/crypto/cryptd.ko cc5c985506cb240d7d082b55ed260cbb851f983e ffffffffc00af000 ffffffffc00b6000 = /lib/modules/5.15.15-1rodete2-amd64/kernel/drivers/i2c/busses/i2c-piix4.ko [...] Signed-off-by: Blake Jones --- .../perf/Documentation/perf-buildid-list.txt | 3 ++ tools/perf/builtin-buildid-list.c | 33 ++++++++++++++++++- tools/perf/util/dso.c | 23 +++++++++++++ tools/perf/util/dso.h | 2 ++ tools/perf/util/machine.c | 13 ++++++++ tools/perf/util/machine.h | 5 +++ 6 files changed, 78 insertions(+), 1 deletion(-) diff --git a/tools/perf/Documentation/perf-buildid-list.txt b/tools/perf/Do= cumentation/perf-buildid-list.txt index 25c52efcc7f0..a82e92c2667d 100644 --- a/tools/perf/Documentation/perf-buildid-list.txt +++ b/tools/perf/Documentation/perf-buildid-list.txt @@ -33,6 +33,9 @@ OPTIONS -k:: --kernel:: Show running kernel build id. +-m:: +--modules:: + Show buildid, start/end text address, and path of kernel and modules. -v:: --verbose:: Be more verbose. diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid= -list.c index cebadd632234..9a5587de8fd0 100644 --- a/tools/perf/builtin-buildid-list.c +++ b/tools/perf/builtin-buildid-list.c @@ -12,6 +12,7 @@ #include "util/build-id.h" #include "util/debug.h" #include "util/dso.h" +#include "util/map.h" #include #include #include "util/session.h" @@ -20,6 +21,29 @@ #include #include =20 +static int buildid__map_cb(struct map *map, void *arg __maybe_unused) +{ + struct build_id build_id; + char bid_buf[SBUILD_ID_SIZE]; + char modpath[255]; + + dso__get_build_id(map->dso, &build_id); + build_id__sprintf(&build_id, bid_buf); + dso__get_long_name(map->dso, modpath, sizeof(modpath)); + printf("%s %16lx %16lx %s\n", bid_buf, map->start, map->end, modpath); + + return 0; +} + +static void buildid__show_kernel_modules(void) +{ + struct machine *machine; + + machine =3D machine__new_host(); + machine__for_each_kernel_map(machine, buildid__map_cb, NULL); + machine__delete(machine); +} + static int sysfs__fprintf_build_id(FILE *fp) { char sbuild_id[SBUILD_ID_SIZE]; @@ -99,6 +123,7 @@ static int perf_session__list_build_ids(bool force, bool= with_hits) int cmd_buildid_list(int argc, const char **argv) { bool show_kernel =3D false; + bool show_modules =3D false; bool with_hits =3D false; bool force =3D false; const struct option options[] =3D { @@ -106,6 +131,8 @@ int cmd_buildid_list(int argc, const char **argv) OPT_STRING('i', "input", &input_name, "file", "input file name"), OPT_BOOLEAN('f', "force", &force, "don't complain, do it"), OPT_BOOLEAN('k', "kernel", &show_kernel, "Show current kernel build id"), + OPT_BOOLEAN('m', "modules", &show_modules, + "Show build id of current kernel + modules"), OPT_INCR('v', "verbose", &verbose, "be more verbose"), OPT_END() }; @@ -117,8 +144,12 @@ int cmd_buildid_list(int argc, const char **argv) argc =3D parse_options(argc, argv, options, buildid_list_usage, 0); setup_pager(); =20 - if (show_kernel) + if (show_kernel) { return !(sysfs__fprintf_build_id(stdout) > 0); + } else if (show_modules) { + buildid__show_kernel_modules(); + return 0; + } =20 return perf_session__list_build_ids(force, with_hits); } diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 5ac13958d1bd..7c490b5ce449 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -1227,6 +1227,19 @@ void dso__set_long_name(struct dso *dso, const char = *name, bool name_allocated) dso__set_long_name_id(dso, name, NULL, name_allocated); } =20 +void dso__get_long_name(const struct dso *dso, char *name, size_t len) +{ + if (len =3D=3D 0) + return; + if (dso->long_name =3D=3D NULL) { + name[0] =3D '\0'; + return; + } + + strncpy(name, dso->long_name, len); + name[len - 1] =3D '\0'; +} + void dso__set_short_name(struct dso *dso, const char *name, bool name_allo= cated) { if (name =3D=3D NULL) @@ -1359,6 +1372,16 @@ void dso__set_build_id(struct dso *dso, struct build= _id *bid) dso->has_build_id =3D 1; } =20 +void dso__get_build_id(struct dso *dso, struct build_id *bid) +{ + if (dso->has_build_id) { + *bid =3D dso->bid; + } else { + bid->size =3D 0; + memset(bid->data, 0, sizeof(*bid->data)); + } +} + bool dso__build_id_equal(const struct dso *dso, struct build_id *bid) { if (dso->bid.size > bid->size && dso->bid.size =3D=3D BUILD_ID_SIZE) { diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index 97047a11282b..e531f9d0818d 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -239,6 +239,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__get_long_name(const struct dso *dso, char *name, size_t len); =20 int dso__name_len(const struct dso *dso); =20 @@ -265,6 +266,7 @@ void dso__set_sorted_by_name(struct dso *dso); void dso__sort_by_name(struct dso *dso); =20 void dso__set_build_id(struct dso *dso, struct build_id *bid); +void dso__get_build_id(struct dso *dso, struct build_id *bid); bool dso__build_id_equal(const struct dso *dso, struct build_id *bid); void dso__read_running_kernel_build_id(struct dso *dso, struct machine *machine); diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 009061852808..28fff9a02ab0 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -3327,3 +3327,16 @@ int machine__for_each_dso(struct machine *machine, m= achine__dso_t fn, void *priv } return err; } + +int machine__for_each_kernel_map(struct machine *machine, machine__map_t f= n, void *priv) +{ + struct maps *maps =3D machine__kernel_maps(machine); + struct map *map; + int err =3D 0; + + for (map =3D maps__first(maps); map !=3D NULL; map =3D map__next(map)) { + if (fn(map, priv)) + err =3D -1; + } + return err; +} diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h index 5d7daf7cb7bc..e1476343cbb2 100644 --- a/tools/perf/util/machine.h +++ b/tools/perf/util/machine.h @@ -262,6 +262,11 @@ typedef int (*machine__dso_t)(struct dso *dso, struct = machine *machine, void *pr =20 int machine__for_each_dso(struct machine *machine, machine__dso_t fn, void *priv); + +typedef int (*machine__map_t)(struct map *map, void *priv); +int machine__for_each_kernel_map(struct machine *machine, machine__map_t f= n, + void *priv); + int machine__for_each_thread(struct machine *machine, int (*fn)(struct thread *thread, void *p), void *priv); base-commit: 1bcca2b1bd67f3c0e5c3a88ed16c6389f01a5b31 --=20 2.36.1.476.g0c4daa206d-goog