From mboxrd@z Thu Jan 1 00:00:00 1970 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 4E689C433EF for ; Sat, 9 Jul 2022 00:20:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229608AbiGIAU4 (ORCPT ); Fri, 8 Jul 2022 20:20:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbiGIAUy (ORCPT ); Fri, 8 Jul 2022 20:20:54 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0BED7AC16 for ; Fri, 8 Jul 2022 17:20:53 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id t10-20020a5b07ca000000b0066ec1bb6e2cso133684ybq.14 for ; Fri, 08 Jul 2022 17:20:53 -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=FUpf7qbhcYhqC7SCTim1z1K8LNHsfqJ6ksw1Uk9yn0w=; b=E4PshmJKlIst3fmKP0Agc3adhM0zrUezSL0V+S33kL7v/UPR7J+6bVFB+UO8e0TsUj 0I48wF9OVUVv1mIXCj9yE7QHDEuvSkAGmMpbwclj6MMgdyxFSGQeMf5mEYjLIcURhbgE AA+73HbWBlE6RXaHY5YGaCnE9xKZsKzU4nUKwparqy9m08BqagkIIn1/dOOK2X1xhnCA Nf1YT1iuikTJL9w4WVeK7bKuZ1ahpiWdgnYze3RPiANWz6lGqKfaUAChznqWiWY+t+y6 vD0Qrcf+hyTObEXEi1D+cnPQmrV4bCCVUU3wrB07cgXUrCc6/vY+/ch6wJHSAQbcR+xP imRw== 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=FUpf7qbhcYhqC7SCTim1z1K8LNHsfqJ6ksw1Uk9yn0w=; b=YcLZ3hQveRYNM70uC1F8NPXzZPxX+YDa36Nf7HK3fP1Oir22X1qXq4wBi22cqplsbd MAhyk9yTxrESm4b//xaPyKvyGmy7c5Q91LpKAlRCAwpyzdmulEGbuXRepaIjwqYA8xR3 pE0TpYDdSTupuDGejs3IYkpJmDdIWTbjzzN7vPORXyWXANW/3SDCvBLtZUjbgiUpjpgW L23EJOmsAWuWl+3sH63Zl+60hGVguvXXSDeheKf5uEyBQNQWF30dnQuDGShedSe5GL5H Dgzd3hwMfy+6fqn3kvOUYx9XSKU8nIrs+7ruOquPiHscTqwpuQJ/VBWbXORAHD7u7In1 Qp2Q== X-Gm-Message-State: AJIora85TH87wMd90B/iX5yYAiFA0aKFovbc29POgP9TQP+TYlFLCb/h 4cbX0dvjKF3rAjp5IxEa2uoycNOk4JEOhQ== X-Google-Smtp-Source: AGRyM1svRn0hMLWKrLMB0KKM7xOXMQ2h87tkFL2IEcNUQkKnpTQ1W03aJnnf0YOD/wRy8mlZocxMHK+bWvv38Q== X-Received: from riochico.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:b3e]) (user=rsilvera job=sendgmr) by 2002:a25:900d:0:b0:66e:4dc3:be1e with SMTP id s13-20020a25900d000000b0066e4dc3be1emr6533569ybl.375.1657326053054; Fri, 08 Jul 2022 17:20:53 -0700 (PDT) Date: Sat, 9 Jul 2022 00:20:46 +0000 Message-Id: <20220709002046.2804157-1-rsilvera@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog Subject: [PATCH v3] perf inject: Add a command line option to specify build ids. From: Raul Silvera To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Raul Silvera Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org This commit adds the option --known-build-ids to perf inject. It allows the user to explicitly specify the build id for a given path, instead of retrieving it from the current system. This is useful in cases where a perf.data file is processed on a different system from where it was collected, or if some of the binaries are no longer available. The build ids and paths are specified in pairs in the command line. Using the file:// specifier, build ids can be loaded from a file directly generated by perf buildid-list. This is convenient to copy build ids from one perf.data file to another. ** Example: In this example we use perf record to create two perf.data files, one with build ids and another without, and use perf buildid-list and perf inject to copy the build ids from the first file to the second. $ perf record ls /tmp $ perf record --no-buildid -o perf.data.no-buildid ls /tmp $ perf buildid-list > /tmp/build-ids.txt $ perf inject -b --known-build-ids='file:///tmp/build-ids.txt' \ -i perf.data.no-buildid -o perf.data.buildid Signed-off-by: Raul Silvera --- V2 -> V3 Added documentation and removed unnecessary temps V1 -> V2: Cleaned up patch description, deleted the strlist during cleanup, and updated validation of the build id strings tools/perf/Documentation/perf-inject.txt | 7 ++- tools/perf/builtin-inject.c | 57 ++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/tools/perf/Documentation/perf-inject.txt b/tools/perf/Documentation/perf-inject.txt index 0570a1ccd344..78474d941fd8 100644 --- a/tools/perf/Documentation/perf-inject.txt +++ b/tools/perf/Documentation/perf-inject.txt @@ -27,9 +27,14 @@ OPTIONS --build-ids:: Inject build-ids into the output stream ---buildid-all: +--buildid-all:: Inject build-ids of all DSOs into the output stream +--known-build-ids=:: + Override build-ids to inject using these comma-separated pairs of + build-id and path. Understands file://filename to read these pairs + from a file, which can be generated with perf buildid-list. + -v:: --verbose:: Be more verbose. diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index a75bf11585b5..bf10c6478493 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -21,6 +21,7 @@ #include "util/data.h" #include "util/auxtrace.h" #include "util/jit.h" +#include "util/string2.h" #include "util/symbol.h" #include "util/synthetic-events.h" #include "util/thread.h" @@ -35,6 +36,7 @@ #include #include +#include #include #include @@ -59,6 +61,7 @@ struct perf_inject { struct itrace_synth_opts itrace_synth_opts; char event_copy[PERF_SAMPLE_MAX_SIZE]; struct perf_file_section secs[HEADER_FEAT_BITS]; + struct strlist *known_build_ids; }; struct event_entry { @@ -570,9 +573,45 @@ static int dso__read_build_id(struct dso *dso) return dso->has_build_id ? 0 : -1; } +static bool perf_inject__lookup_known_build_id(struct perf_inject *inject, + struct dso *dso) +{ + struct str_node *pos; + int bid_len; + + strlist__for_each_entry(pos, inject->known_build_ids) { + const char *build_id, *dso_name; + + build_id = skip_spaces(pos->s); + dso_name = strchr(build_id, ' '); + if (dso_name == NULL) + continue; + bid_len = dso_name - pos->s; + dso_name = skip_spaces(dso_name); + if (strcmp(dso->long_name, dso_name)) + continue; + if (bid_len % 2 != 0 || bid_len >= SBUILD_ID_SIZE) + return false; + for (int ix = 0; 2 * ix + 1 < bid_len; ++ix) { + if (!isxdigit(build_id[2 * ix]) || + !isxdigit(build_id[2 * ix + 1])) + return false; + + dso->bid.data[ix] = (hex(build_id[2 * ix]) << 4 | + hex(build_id[2 * ix + 1])); + } + dso->bid.size = bid_len / 2; + dso->has_build_id = 1; + return true; + } + return false; +} + static int dso__inject_build_id(struct dso *dso, struct perf_tool *tool, struct machine *machine, u8 cpumode, u32 flags) { + struct perf_inject *inject = container_of(tool, struct perf_inject, + tool); int err; if (is_anon_memory(dso->long_name) || flags & MAP_HUGETLB) @@ -580,6 +619,10 @@ static int dso__inject_build_id(struct dso *dso, struct perf_tool *tool, if (is_no_dso_memory(dso->long_name)) return 0; + if (inject->known_build_ids != NULL && + perf_inject__lookup_known_build_id(inject, dso)) + return 1; + if (dso__read_build_id(dso) < 0) { pr_debug("no build_id found for %s\n", dso->long_name); return -1; @@ -1076,12 +1119,16 @@ int cmd_inject(int argc, const char **argv) }; int ret; bool repipe = true; + const char *known_build_ids = NULL; struct option options[] = { OPT_BOOLEAN('b', "build-ids", &inject.build_ids, "Inject build-ids into the output stream"), OPT_BOOLEAN(0, "buildid-all", &inject.build_id_all, "Inject build-ids of all DSOs into the output stream"), + OPT_STRING(0, "known-build-ids", &known_build_ids, + "buildid path [,buildid path...]", + "build-ids to use for given paths"), OPT_STRING('i', "input", &inject.input_name, "file", "input file name"), OPT_STRING('o', "output", &inject.output.path, "file", @@ -1215,6 +1262,15 @@ int cmd_inject(int argc, const char **argv) */ inject.tool.ordered_events = true; inject.tool.ordering_requires_timestamps = true; + if (known_build_ids != NULL) { + inject.known_build_ids = strlist__new( + known_build_ids, NULL); + + if (inject.known_build_ids == NULL) { + pr_err("Couldn't parse known build ids.\n"); + goto out_delete; + } + } } if (inject.sched_stat) { @@ -1241,6 +1297,7 @@ int cmd_inject(int argc, const char **argv) ret = __cmd_inject(&inject); out_delete: + strlist__delete(inject.known_build_ids); zstd_fini(&(inject.session->zstd_data)); perf_session__delete(inject.session); out_close_output: -- 2.37.0.rc0.161.g10f37bed90-goog