From nobody Fri Apr 10 13:01:24 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 43AA0ECAAA1 for ; Fri, 16 Sep 2022 17:59:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229953AbiIPR7Z (ORCPT ); Fri, 16 Sep 2022 13:59:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229881AbiIPR7K (ORCPT ); Fri, 16 Sep 2022 13:59:10 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C262B6D26; Fri, 16 Sep 2022 10:59:07 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id o70-20020a17090a0a4c00b00202f898fa86so366082pjo.2; Fri, 16 Sep 2022 10:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date; bh=3Z1UBNkQWWSj81b1Nj/BZaCfVqWCpu/WDo7Z4K3NP2o=; b=Ioi27MsEZ7IT0HFQdqUMcEN+Nw1807kWs1WHf5FBaT/8JBbigpHd7GdbYm2gUZsTfp r/FD/MSLwbXQcz9U6XKPxfRGYKwCWNcpOPhNCsJU+4WbzTgFU+OSb138eYvOLbiU05IM h73v1L451m4iC21zyLw5zeul3Xe6HiF4tWDSVtwSAEPNpp1NiT+LIKVJ1JSVk33lPCvq Lhr0DLV6q/VBbJ//MivNcA9yHgD34NN/RZ43cm2qKahXjRcR2VhqoY9qoikCjv/y17Gx /H2zzG/pM3iYNxhN9AlZqNQA6pRInMDQGyqNB/GdCKnAKz9BuFTPhGoHDyh4cmuMyU8R KdsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date; bh=3Z1UBNkQWWSj81b1Nj/BZaCfVqWCpu/WDo7Z4K3NP2o=; b=QphvRHIMFz6I0G5hiNdiIGCwFi3tmcNv+FfQB6HpOuhFsiZEsXaUNLvE7BYY9OV3Uy rLmFv4GliHp0ZWBu50pMMjraT5vTJTjtaaJddGcru+LLr+EJkeWB+p/HgKwG7q6T+gMQ qszqAj3N8zEECDUCDzmRufJO9u0Od1bmq16DxlC4CubW6l0jHBeefZ+thZb+kL91ejLA xwK9+3oIpzowGZvXG0/uQVt2XDnr4tRbMWszgI4Kc7N9ePtlMTchCFuQiUjWkMhpx/Hb O6oNL8F23Pp9Rpc8OYNF2OlPg4KPansVWxw84R8z+8pE+IaXz+y2cpT+O9MX+bt0Qi+o tnlA== X-Gm-Message-State: ACrzQf32/sMdJextk4cdVnYe33MXhgUmj5tA4KueDegDitxNROOqzAb8 pAVIV+7vKrye/gRrAmbJUcY= X-Google-Smtp-Source: AMsMyM4EpAw+rk2ysa2xBRmNCS5vPVVHP4+vjjzX5yAo/4130TLMippq88eB+rRFFCpKSM1Kxp/Q8Q== X-Received: by 2002:a17:90b:1e49:b0:203:38c:365a with SMTP id pi9-20020a17090b1e4900b00203038c365amr17922997pjb.133.1663351146601; Fri, 16 Sep 2022 10:59:06 -0700 (PDT) Received: from youngsil.svl.corp.google.com ([2620:15c:2d4:203:2952:dee7:a35e:6428]) by smtp.gmail.com with ESMTPSA id jo21-20020a170903055500b001767f6f04efsm15059458plb.242.2022.09.16.10.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 10:59:06 -0700 (PDT) Sender: Namhyung Kim From: Namhyung Kim To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Ingo Molnar , Peter Zijlstra , LKML , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org Subject: [PATCH 1/4] perf tools: Move dsos functions to util/dsos.c Date: Fri, 16 Sep 2022 10:58:59 -0700 Message-Id: <20220916175902.1155177-2-namhyung@kernel.org> X-Mailer: git-send-email 2.37.3.968.ga6b4b080e4-goog In-Reply-To: <20220916175902.1155177-1-namhyung@kernel.org> References: <20220916175902.1155177-1-namhyung@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Signed-off-by: Namhyung Kim --- tools/perf/util/dsos.c | 29 +++++++++++++++++++++++++++++ tools/perf/util/dsos.h | 3 +++ tools/perf/util/machine.c | 29 ----------------------------- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/tools/perf/util/dsos.c b/tools/perf/util/dsos.c index 2bd23e4cf19e..90a800625110 100644 --- a/tools/perf/util/dsos.c +++ b/tools/perf/util/dsos.c @@ -12,6 +12,35 @@ #include // filename__read_build_id #include =20 +void dsos__init(struct dsos *dsos) +{ + INIT_LIST_HEAD(&dsos->head); + dsos->root =3D RB_ROOT; + init_rwsem(&dsos->lock); +} + +static void dsos__purge(struct dsos *dsos) +{ + struct dso *pos, *n; + + down_write(&dsos->lock); + + list_for_each_entry_safe(pos, n, &dsos->head, node) { + RB_CLEAR_NODE(&pos->rb_node); + pos->root =3D NULL; + list_del_init(&pos->node); + dso__put(pos); + } + + up_write(&dsos->lock); +} + +void dsos__exit(struct dsos *dsos) +{ + dsos__purge(dsos); + exit_rwsem(&dsos->lock); +} + static int __dso_id__cmp(struct dso_id *a, struct dso_id *b) { if (a->maj > b->maj) return -1; diff --git a/tools/perf/util/dsos.h b/tools/perf/util/dsos.h index 5dbec2bc6966..49f448f106f8 100644 --- a/tools/perf/util/dsos.h +++ b/tools/perf/util/dsos.h @@ -21,6 +21,9 @@ struct dsos { struct rw_semaphore lock; }; =20 +void dsos__init(struct dsos *dsos); +void dsos__exit(struct dsos *dsos); + void __dsos__add(struct dsos *dsos, struct dso *dso); void dsos__add(struct dsos *dsos, struct dso *dso); struct dso *__dsos__addnew(struct dsos *dsos, const char *name); diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 2a16cae28407..4c5540f5c753 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -50,13 +50,6 @@ static struct dso *machine__kernel_dso(struct machine *m= achine) return machine->vmlinux_map->dso; } =20 -static void dsos__init(struct dsos *dsos) -{ - INIT_LIST_HEAD(&dsos->head); - dsos->root =3D RB_ROOT; - init_rwsem(&dsos->lock); -} - static void machine__threads_init(struct machine *machine) { int i; @@ -181,28 +174,6 @@ struct machine *machine__new_kallsyms(void) return machine; } =20 -static void dsos__purge(struct dsos *dsos) -{ - struct dso *pos, *n; - - down_write(&dsos->lock); - - list_for_each_entry_safe(pos, n, &dsos->head, node) { - RB_CLEAR_NODE(&pos->rb_node); - pos->root =3D NULL; - list_del_init(&pos->node); - dso__put(pos); - } - - up_write(&dsos->lock); -} - -static void dsos__exit(struct dsos *dsos) -{ - dsos__purge(dsos); - exit_rwsem(&dsos->lock); -} - void machine__delete_threads(struct machine *machine) { struct rb_node *nd; --=20 2.37.3.968.ga6b4b080e4-goog From nobody Fri Apr 10 13:01:24 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 38A5FC6FA82 for ; Fri, 16 Sep 2022 17:59:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229783AbiIPR7i (ORCPT ); Fri, 16 Sep 2022 13:59:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229728AbiIPR7K (ORCPT ); Fri, 16 Sep 2022 13:59:10 -0400 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 235BCB6549; Fri, 16 Sep 2022 10:59:08 -0700 (PDT) Received: by mail-pl1-x634.google.com with SMTP id f23so5892699plr.6; Fri, 16 Sep 2022 10:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date; bh=fHUO/tTSXGwAYWJl/h0HUVhnDEOopzy02qV2Gf5LuFs=; b=ZK8zrdV8d0dwJcFEu5/64qRd9FaeNiefq6CFkl68lXUVMTGfBNgbTNYZOauC+hVTGb 6y3x1XM2mryd1E+ITjTL7KfeRyHT2WSSTHx4gEomFsbrp/f5BU0OetLFSFX6dP7HIiBp Thhskg2kZzIJc15fkUg1C7eTdCqioUhXM/C2GcvPk8MyjRvX7gHduphw87kgv4FNWuXK +ZLCqZT1yhPK84NWUoTvWNR4UvEBgD3l/C58T5otxKUMPmAB+YslGUyFUZZImp6H7n5G KXgN9mMP3mOQGWjQtaNLzSmy7pyPDb0se+vqmWilst4S8EF73NHPDLTmJy/OVpVAuYnI lIUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date; bh=fHUO/tTSXGwAYWJl/h0HUVhnDEOopzy02qV2Gf5LuFs=; b=RgleZHHXzA1QNox/OiJtmxPuMlCy1q5QA38sSMw+IUlRW5CeKrgDdL+XxXkSUtCwsc EndCIIy6iu6RNHdGGfNN40Zue0jLgS5DznUk+RRS9t2+luG/FOjbO0rqBR3jmWiqaIWO 2k8VZ8ZA5m1c9BAhTopi78appO8fjbHoJVOnJHNouX/wj8lTdMAlZc6SG4UKePVck3nf aZTZ355cjBItgnbx0A1elqr8W02m6thoCTSV5HhATHL4G91FzRWaCD1KMn0toBT5EC+j olTT/LO9j1OE2ZO4Cf/rh/N6U+5uU5d4t/Wytb4Fzx9RuRiuQt/rLyKysRr5lV9WKpBi Fz0g== X-Gm-Message-State: ACrzQf2zFy4hfsEbcp+pkn6/oivGhAnVu4KU7NH+dzlSZFfKFHjGty/T 8rt8N5vBwA/4vEqynL+LeSs= X-Google-Smtp-Source: AMsMyM4dG4hKzttcx8sac4yQPxAuCp9N3g0k99zv9hMicHD8V+S5LpjBV8yGirFLASDCHSHrpRFvYg== X-Received: by 2002:a17:902:cec1:b0:178:cdb:8458 with SMTP id d1-20020a170902cec100b001780cdb8458mr962068plg.161.1663351147621; Fri, 16 Sep 2022 10:59:07 -0700 (PDT) Received: from youngsil.svl.corp.google.com ([2620:15c:2d4:203:2952:dee7:a35e:6428]) by smtp.gmail.com with ESMTPSA id jo21-20020a170903055500b001767f6f04efsm15059458plb.242.2022.09.16.10.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 10:59:07 -0700 (PDT) Sender: Namhyung Kim From: Namhyung Kim To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Ingo Molnar , Peter Zijlstra , LKML , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org Subject: [PATCH 2/4] perf tools: Add perf_event__synthesize_{start,stop}() Date: Fri, 16 Sep 2022 10:59:00 -0700 Message-Id: <20220916175902.1155177-3-namhyung@kernel.org> X-Mailer: git-send-email 2.37.3.968.ga6b4b080e4-goog In-Reply-To: <20220916175902.1155177-1-namhyung@kernel.org> References: <20220916175902.1155177-1-namhyung@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" These functions are to prepare and cleanup necessary work for synthesizing. It doesn't do anything yet but later patch will add it. Signed-off-by: Namhyung Kim --- tools/perf/builtin-inject.c | 3 +++ tools/perf/builtin-record.c | 3 +++ tools/perf/builtin-stat.c | 2 ++ tools/perf/builtin-top.c | 4 ++++ tools/perf/util/auxtrace.c | 2 ++ tools/perf/util/synthetic-events.c | 8 ++++++++ tools/perf/util/synthetic-events.h | 3 +++ 7 files changed, 25 insertions(+) diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index e254f18986f7..2e91a887919b 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -2368,9 +2368,12 @@ int cmd_inject(int argc, const char **argv) if (ret < 0) goto out_delete; =20 + perf_event__synthesize_start(); + ret =3D __cmd_inject(&inject); =20 guest_session__exit(&inject.guest_session); + perf_event__synthesize_stop(); =20 out_delete: strlist__delete(inject.known_build_ids); diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 02e38f50a138..5b7b9ad2a280 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1966,6 +1966,8 @@ static int record__synthesize(struct record *rec, boo= l tail) if (rec->opts.tail_synthesize !=3D tail) return 0; =20 + perf_event__synthesize_start(); + if (data->is_pipe) { err =3D perf_event__synthesize_for_pipe(tool, session, data, process_synthesized_event); @@ -2072,6 +2074,7 @@ static int record__synthesize(struct record *rec, boo= l tail) } =20 out: + perf_event__synthesize_stop(); return err; } =20 diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index e05fe72c1d87..f6f61e08f4c2 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -962,6 +962,7 @@ static int __run_perf_stat(int argc, const char **argv,= int run_idx) if (err < 0) return err; =20 + perf_event__synthesize_start(); err =3D perf_event__synthesize_stat_events(&stat_config, NULL, evsel_lis= t, process_synthesized_event, is_pipe); if (err < 0) @@ -2641,6 +2642,7 @@ int cmd_stat(int argc, const char **argv) perf_session__write_header(perf_stat.session, evsel_list, fd, true); } =20 + perf_event__synthesize_stop(); evlist__close(evsel_list); perf_session__delete(perf_stat.session); } diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index e89208b4ad4b..1eff894e6b5f 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -1258,6 +1258,8 @@ static int __cmd_top(struct perf_top *top) #endif } =20 + perf_event__synthesize_start(); + ret =3D perf_event__synthesize_bpf_events(top->session, perf_event__proce= ss, &top->session->machines.host, &top->record_opts); @@ -1273,6 +1275,8 @@ static int __cmd_top(struct perf_top *top) top->evlist->core.threads, true, false, top->nr_threads_synthesize); =20 + perf_event__synthesize_stop(); + if (top->nr_threads_synthesize > 1) perf_set_singlethreaded(); =20 diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index b59c278fe9ed..1bfe076c22fb 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -1328,6 +1328,7 @@ int perf_event__process_auxtrace_info(struct perf_ses= sion *session, if (err) return err; =20 + perf_event__synthesize_start(); unleader_auxtrace(session); =20 return 0; @@ -2834,6 +2835,7 @@ void auxtrace__free(struct perf_session *session) if (!session->auxtrace) return; =20 + perf_event__synthesize_stop(); return session->auxtrace->free(session); } =20 diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index 0ff57ca24577..9d4f5dacd154 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -47,6 +47,14 @@ =20 unsigned int proc_map_timeout =3D DEFAULT_PROC_MAP_PARSE_TIMEOUT; =20 +void perf_event__synthesize_start(void) +{ +} + +void perf_event__synthesize_stop(void) +{ +} + int perf_tool__process_synth_event(struct perf_tool *tool, union perf_event *event, struct machine *machine, diff --git a/tools/perf/util/synthetic-events.h b/tools/perf/util/synthetic= -events.h index 53737d1619a4..e4414616080c 100644 --- a/tools/perf/util/synthetic-events.h +++ b/tools/perf/util/synthetic-events.h @@ -43,6 +43,9 @@ int parse_synth_opt(char *str); typedef int (*perf_event__handler_t)(struct perf_tool *tool, union perf_ev= ent *event, struct perf_sample *sample, struct machine *machine); =20 +void perf_event__synthesize_start(void); +void perf_event__synthesize_stop(void); + int perf_event__synthesize_attrs(struct perf_tool *tool, struct evlist *ev= list, perf_event__handler_t process); int perf_event__synthesize_attr(struct perf_tool *tool, struct perf_event_= attr *attr, u32 ids, u64 *id, perf_event__handler_t process); int perf_event__synthesize_build_id(struct perf_tool *tool, struct dso *po= s, u16 misc, perf_event__handler_t process, struct machine *machine); --=20 2.37.3.968.ga6b4b080e4-goog From nobody Fri Apr 10 13:01:24 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 D7099ECAAA1 for ; Fri, 16 Sep 2022 17:59:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229893AbiIPR7m (ORCPT ); Fri, 16 Sep 2022 13:59:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229733AbiIPR7L (ORCPT ); Fri, 16 Sep 2022 13:59:11 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40F6CB6D0A; Fri, 16 Sep 2022 10:59:09 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id v1so22130458plo.9; Fri, 16 Sep 2022 10:59:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date; bh=FfVxaA/NFL5K4dZMYV/uqZ4exzRsWeYDxGfoCMaxpz4=; b=JXmEK+aHvnZ6zy9+8Y2UAmlN29y9xIeMY53W8Vi6Q/b9fxdQ3Xp9j/GBt3sdWXVNBB UrDgEBeMMdUChtDEzVyAXNiT97EksUFChk2bktu+45X8LxfLdpeEslesD+x3ubc1+Hgm xpsOLJwin47cieM4PS1jxJGRxyvcxTZ1jRHv1oB2Wgw/EmjCDsJ/ncfaIXxJidgw5Cxz CgI67NDDHa6A7zNrh//42AsKWGJZ1k4dEwaeNUGPkxNhMfvrrYLBu63GCXLPu3QXYB6U aCMVYOZc8F+u3bywLkAtgKGICrVs93kQ5nP+i4ITm03FVQ188TPtkJ3i8oNlf/WrWuKH X05Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date; bh=FfVxaA/NFL5K4dZMYV/uqZ4exzRsWeYDxGfoCMaxpz4=; b=bOci3s+pDHeyiEDMJ84ivARcvB7ogQ+o+5HQ39It79R9ts313FYCsZpKr+NR7SodMz Z9pUjzav5yNwb6GP3lH0+ZpE8pKWiBoVbQ3ag8Bw4UQTpzC7T37Ciajuchr/g4HtDnOl u9r2PNBDOBygrvLYWAPie/ggZaRKq3vKW6ALLOYj0w0erLLqLlygvHDRuFrSc/uU4025 VLQ62zKXKecYSgmLUBHa1LXEtr4OmOuEu/j4bcJge3J0CO0L8xBJ9wTWiU+JRL4nR4fd uag+rNERoMj8cU8o1CTAPXGt++ZZwKbZekOLmX3UrcPH8cvlDTU5EbPXzWN1o+adPlRz pU7Q== X-Gm-Message-State: ACrzQf3fPxVjnuqHayYmMjBcbXg8dKyRQValOIBWP+7+1nL4KetGu2m1 idBt1gPZWdWqTdrqLQVuPVY= X-Google-Smtp-Source: AMsMyM6SyudhJbNymixudRa6ddJbRpMbzogNk8I1XknUU4oSXlRHB0Bjr6JMqCkh8sN/hoRvERXmew== X-Received: by 2002:a17:90b:194a:b0:202:e6eb:4b62 with SMTP id nk10-20020a17090b194a00b00202e6eb4b62mr17921863pjb.33.1663351148686; Fri, 16 Sep 2022 10:59:08 -0700 (PDT) Received: from youngsil.svl.corp.google.com ([2620:15c:2d4:203:2952:dee7:a35e:6428]) by smtp.gmail.com with ESMTPSA id jo21-20020a170903055500b001767f6f04efsm15059458plb.242.2022.09.16.10.59.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 10:59:08 -0700 (PDT) Sender: Namhyung Kim From: Namhyung Kim To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Ingo Molnar , Peter Zijlstra , LKML , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org Subject: [PATCH 3/4] perf record: Save DSO build-ID for synthesizing Date: Fri, 16 Sep 2022 10:59:01 -0700 Message-Id: <20220916175902.1155177-4-namhyung@kernel.org> X-Mailer: git-send-email 2.37.3.968.ga6b4b080e4-goog In-Reply-To: <20220916175902.1155177-1-namhyung@kernel.org> References: <20220916175902.1155177-1-namhyung@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When synthesizing MMAP2 with build-id, it'd read the same file repeatedly as it has no idea if it's done already. Maintain a dsos to check that and skip the file access if possible. Signed-off-by: Namhyung Kim --- tools/perf/util/synthetic-events.c | 49 +++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index 9d4f5dacd154..e6978b2dee8f 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -4,6 +4,7 @@ #include "util/data.h" #include "util/debug.h" #include "util/dso.h" +#include "util/dsos.h" #include "util/event.h" #include "util/evlist.h" #include "util/machine.h" @@ -47,12 +48,25 @@ =20 unsigned int proc_map_timeout =3D DEFAULT_PROC_MAP_PARSE_TIMEOUT; =20 +static bool synth_init_done; +static struct dsos synth_dsos; + void perf_event__synthesize_start(void) { + if (synth_init_done) + return; + + dsos__init(&synth_dsos); + + synth_init_done =3D true; } =20 void perf_event__synthesize_stop(void) { + if (!synth_init_done) + return; + + dsos__exit(&synth_dsos); } =20 int perf_tool__process_synth_event(struct perf_tool *tool, @@ -374,26 +388,47 @@ static bool read_proc_maps_line(struct io *io, __u64 = *start, __u64 *end, static void perf_record_mmap2__read_build_id(struct perf_record_mmap2 *eve= nt, bool is_kernel) { - struct build_id bid; + struct build_id _bid, *bid =3D &_bid; + struct dso *dso =3D NULL; + struct dso_id id; int rc; =20 - if (is_kernel) - rc =3D sysfs__read_build_id("/sys/kernel/notes", &bid); - else - rc =3D filename__read_build_id(event->filename, &bid) > 0 ? 0 : -1; + if (is_kernel) { + rc =3D sysfs__read_build_id("/sys/kernel/notes", bid); + goto out; + } + + id.maj =3D event->maj; + id.min =3D event->min; + id.ino =3D event->ino; + id.ino_generation =3D event->ino_generation; =20 + dso =3D dsos__findnew_id(&synth_dsos, event->filename, &id); + if (dso && dso->has_build_id) { + bid =3D &dso->bid; + rc =3D 0; + goto out; + } + + rc =3D filename__read_build_id(event->filename, bid) > 0 ? 0 : -1; + +out: if (rc =3D=3D 0) { - memcpy(event->build_id, bid.data, sizeof(bid.data)); - event->build_id_size =3D (u8) bid.size; + memcpy(event->build_id, bid->data, sizeof(bid->data)); + event->build_id_size =3D (u8) bid->size; event->header.misc |=3D PERF_RECORD_MISC_MMAP_BUILD_ID; event->__reserved_1 =3D 0; event->__reserved_2 =3D 0; + + if (dso && !dso->has_build_id) + dso__set_build_id(dso, bid); } else { if (event->filename[0] =3D=3D '/') { pr_debug2("Failed to read build ID for %s\n", event->filename); } } + dso__put(dso); } =20 int perf_event__synthesize_mmap_events(struct perf_tool *tool, --=20 2.37.3.968.ga6b4b080e4-goog From nobody Fri Apr 10 13:01:24 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 A8AD1ECAAA1 for ; Fri, 16 Sep 2022 17:59:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229959AbiIPR7u (ORCPT ); Fri, 16 Sep 2022 13:59:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229898AbiIPR7M (ORCPT ); Fri, 16 Sep 2022 13:59:12 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A92ACB6D0C; Fri, 16 Sep 2022 10:59:10 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id f23so5892772plr.6; Fri, 16 Sep 2022 10:59:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date; bh=cUos+vcM9RRP8jutVG/rSrtmvF3gBZ9cbF4X9vnuVXA=; b=mDL1f6wdW3HYPP3qHIuExoLh4wMpLe1oSX6/1SvYT298q6552lcJjjzEr9HiBBdb0s cgy3JkLLgigeVlyz7a565GqGJU4+06YddMU0R9rGvC2XEyTKSt3XJ+NgsoTwgrnI6DXz /c+25Lu3WHlsouJUahvrr3lgOkbkNTI3du/KkuA+TxB3tRfZA/PIF/Bi2WCumkJz0LUZ Q2HnZEOW2+suQgvGOoaHgmQEsboC4p8/LXq38ozCn/fFVj8xjVgKxC3SiQ5cuFBtXfxX Gor3O6b5JJqU3oydXwVzqfJ6xaA/foC1nGZ9v2SygXkGegPGXKLkvTKNf9KyrjlrpfKK KGwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date; bh=cUos+vcM9RRP8jutVG/rSrtmvF3gBZ9cbF4X9vnuVXA=; b=GUKK6puyEfXbQht1Q+DAhEpRtKoxvCycalOnKtKTdkDa8bvqfLpVsAGwDi1Q/81E+F yIwQPT0vENbW8rNsmOeGocvejikQnj6jL09cQo93Ns6AyRKkBrgLcBaGqSUkfMKjfTGS j90tzr1IaDttMMxcgue+V+bpqL8r3L/6oplGIj6/ulAf1k3UFjNCHexsvx+pfkB3htfY lEKR0G+Tdt3p4k7yakKzDxF47FDb9wiT4vIIsppxQj/26ICv+SQb/x/wkeKTwesNL5g+ 7h91gGh0sJfHz2ckwDyeuk3jMtvU5pGwJ9crxmfZl5cLB1SU8kceeSK2X8OkwhAflSz5 eruA== X-Gm-Message-State: ACrzQf0G4qwYXSB2/ZSW4B+Gze2EAh5WSJaFlbTiS7FHAWompsdGshO+ VM9DJMmsgzqwen12b785/Aw= X-Google-Smtp-Source: AMsMyM7hhgcaLiNuABgMK+AUqf9lco8WK6JwmsakaTsF1Zw+04inBwzNO8HhdjxkPC8tBuo576bBPg== X-Received: by 2002:a17:90b:38ca:b0:202:fb75:7dc3 with SMTP id nn10-20020a17090b38ca00b00202fb757dc3mr17663941pjb.192.1663351149748; Fri, 16 Sep 2022 10:59:09 -0700 (PDT) Received: from youngsil.svl.corp.google.com ([2620:15c:2d4:203:2952:dee7:a35e:6428]) by smtp.gmail.com with ESMTPSA id jo21-20020a170903055500b001767f6f04efsm15059458plb.242.2022.09.16.10.59.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Sep 2022 10:59:09 -0700 (PDT) Sender: Namhyung Kim From: Namhyung Kim To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Ingo Molnar , Peter Zijlstra , LKML , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org Subject: [PATCH 4/4] perf tools: Honor namespace when synthesizing build-id Date: Fri, 16 Sep 2022 10:59:02 -0700 Message-Id: <20220916175902.1155177-5-namhyung@kernel.org> X-Mailer: git-send-email 2.37.3.968.ga6b4b080e4-goog In-Reply-To: <20220916175902.1155177-1-namhyung@kernel.org> References: <20220916175902.1155177-1-namhyung@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" It needs to go into a namespace before reading a file. Signed-off-by: Namhyung Kim --- tools/perf/util/synthetic-events.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index e6978b2dee8f..d0d540d09196 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -391,6 +391,8 @@ static void perf_record_mmap2__read_build_id(struct per= f_record_mmap2 *event, struct build_id _bid, *bid =3D &_bid; struct dso *dso =3D NULL; struct dso_id id; + struct nsinfo *nsi; + struct nscookie nc; int rc; =20 if (is_kernel) { @@ -410,8 +412,14 @@ static void perf_record_mmap2__read_build_id(struct pe= rf_record_mmap2 *event, goto out; } =20 + nsi =3D nsinfo__new(event->pid); + nsinfo__mountns_enter(nsi, &nc); + rc =3D filename__read_build_id(event->filename, bid) > 0 ? 0 : -1; =20 + nsinfo__mountns_exit(&nc); + nsinfo__put(nsi); + out: if (rc =3D=3D 0) { memcpy(event->build_id, bid->data, sizeof(bid->data)); --=20 2.37.3.968.ga6b4b080e4-goog