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 X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8E30C2D0E2 for ; Tue, 22 Sep 2020 21:52:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9990420773 for ; Tue, 22 Sep 2020 21:52:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="t8ZwC2U4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726758AbgIVVw1 (ORCPT ); Tue, 22 Sep 2020 17:52:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726652AbgIVVwV (ORCPT ); Tue, 22 Sep 2020 17:52:21 -0400 Received: from mail-yb1-xb41.google.com (mail-yb1-xb41.google.com [IPv6:2607:f8b0:4864:20::b41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30A40C061755 for ; Tue, 22 Sep 2020 14:52:21 -0700 (PDT) Received: by mail-yb1-xb41.google.com with SMTP id s19so13930826ybc.5 for ; Tue, 22 Sep 2020 14:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=myUnUX5+LOe61+hRMYzQClq5iPF+nIpaj1+athcxnag=; b=t8ZwC2U4X4azB8nEYULPVG2/WjP+LWiyzfHcyCJS1RvqA3piu7FXnkCo8Km9sOEOgU VWCLLmULlopr2eAyCZaiLEDnJrxnFP/gKNoihJKH5Z8SCCGSEFGwZXxsq18BEKk9MS4x ZUhBuwamI+abaPWhMYf9G6xTJvpuo/9pkYie9mwyV0MRLqEicn9q6AZah17CZPNvZQjU ExFtEgSvekla34gUHluPWmhqSB00KEG7toi1WFwRK50OLTbMAyoZbN6GWf9pcmxzMlUT tr6psjA5qj5r/Y/Qo5sVxJOoIDE23MmXEJRi2MM6KYi77AAXwn5vU3GUK+8a89hYIU9P 44bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=myUnUX5+LOe61+hRMYzQClq5iPF+nIpaj1+athcxnag=; b=m2z2X8fxNmn+sSclX9O8E9OfM2sVRXfV5pL389dRLeS4EIrOX1cPpLmjcDaSTA1EKn +x8407/HHbNvJ3j6sGCc0i+cX2w7aP5amuX0svSiMgVKe+oazLiU3zVkfR4lhxfx0AvA aZzFvVSp7LFN5CkY8Yh8uayx+PqWg5RpXil3GqBhzQZ76xf+SkFXKycfKglqUddi0YYf qbEjGWhaenwBL3u6U5LVWIAjhCuXl/Npmn13mqW8jbYx2CwhXf4fP86/aNYlQx7mixDL 64I1kVlnHA4f4avGjb4pT+kra2gZg7vNALhJOHFoKkB7gOLlyofJagfxp8771Q/WyjWf 4hPg== X-Gm-Message-State: AOAM532ttSilW9Nv8Q0sg4gQZsnyQhC7/R+Lmy7JqqGLhdobpSvLB8j7 Z1KJzZMfW9WDRkN6FXZA7sT8xO55AK5F8TsIBOQdnw== X-Google-Smtp-Source: ABdhPJyGu8ctygO2ZEUQkr8b9qBxwfJkV4nu9jfWWUhZ0UmWGlsr8crDp/EyrGiRuHVHRQz02B656fM3Uxs6iuZ+peI= X-Received: by 2002:a25:b1a3:: with SMTP id h35mr9511510ybj.136.1600811540110; Tue, 22 Sep 2020 14:52:20 -0700 (PDT) MIME-Version: 1.0 References: <20200921094610.83736-1-namhyung@kernel.org> <20200921094610.83736-3-namhyung@kernel.org> In-Reply-To: <20200921094610.83736-3-namhyung@kernel.org> From: Stephane Eranian Date: Tue, 22 Sep 2020 14:52:09 -0700 Message-ID: Subject: Re: [PATCH 2/5] perf stat: Add --for-each-cgroup option To: Namhyung Kim Cc: Arnaldo Carvalho de Melo , Jiri Olsa , Ingo Molnar , Peter Zijlstra , Mark Rutland , Alexander Shishkin , LKML , Andi Kleen , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Mon, Sep 21, 2020 at 2:46 AM Namhyung Kim wrote: > > The --for-each-cgroup option is a syntax sugar to monitor large number > of cgroups easily. Current command line requires to list all the > events and cgroups even if users want to monitor same events for each > cgroup. This patch addresses that usage by copying given events for > each cgroup on user's behalf. > > For instance, if they want to monitor 6 events for 200 cgroups each > they should write 1200 event names (with -e) AND 1200 cgroup names > (with -G) on the command line. But with this change, they can just > specify 6 events and 200 cgroups with a new option. > > A simpler example below: It wants to measure 3 events for 2 cgroups > ('A' and 'B'). The result is that total 6 events are counted like > below. > > $ ./perf stat -a -e cpu-clock,cycles,instructions --for-each-cgroup A,B sleep 1 > You could also do it by keeping the -G option and providing --for-each-cgroup as a modifier of the behavior of -G: $ ./perf stat -a -e cpu-clock,cycles,instructions --for-each-cgroup -G A,B sleep 1 That way, you do not have to handle the case where both are used. And it makes transitioning to the new style simpler, i.e., the -G option remains, just need to trim the number of cgroups to 200 in your example. Just a suggestion. > Performance counter stats for 'system wide': > > 988.18 msec cpu-clock A # 0.987 CPUs utilized > 3,153,761,702 cycles A # 3.200 GHz (100.00%) > 8,067,769,847 instructions A # 2.57 insn per cycle (100.00%) > 982.71 msec cpu-clock B # 0.982 CPUs utilized > 3,136,093,298 cycles B # 3.182 GHz (99.99%) > 8,109,619,327 instructions B # 2.58 insn per cycle (99.99%) > > 1.001228054 seconds time elapsed > > Signed-off-by: Namhyung Kim > --- > tools/perf/builtin-stat.c | 20 +++++++++- > tools/perf/util/cgroup.c | 84 +++++++++++++++++++++++++++++++++++++++ > tools/perf/util/cgroup.h | 1 + > tools/perf/util/stat.h | 1 + > 4 files changed, 105 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index 7f8d756d9408..a43e58e0a088 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -1051,6 +1051,17 @@ static int parse_control_option(const struct option *opt, > return evlist__parse_control(str, &config->ctl_fd, &config->ctl_fd_ack, &config->ctl_fd_close); > } > > +static int parse_stat_cgroups(const struct option *opt, > + const char *str, int unset) > +{ > + if (stat_config.cgroup_list) { > + pr_err("--cgroup and --for-each-cgroup cannot be used together\n"); > + return -1; > + } > + > + return parse_cgroups(opt, str, unset); > +} > + > static struct option stat_options[] = { > OPT_BOOLEAN('T', "transaction", &transaction_run, > "hardware transaction statistics"), > @@ -1094,7 +1105,9 @@ static struct option stat_options[] = { > OPT_STRING('x', "field-separator", &stat_config.csv_sep, "separator", > "print counts with custom separator"), > OPT_CALLBACK('G', "cgroup", &evsel_list, "name", > - "monitor event in cgroup name only", parse_cgroups), > + "monitor event in cgroup name only", parse_stat_cgroups), > + OPT_STRING(0, "for-each-cgroup", &stat_config.cgroup_list, "name", > + "expand events for each cgroup"), > OPT_STRING('o', "output", &output_name, "file", "output file name"), > OPT_BOOLEAN(0, "append", &append_file, "append to the output file"), > OPT_INTEGER(0, "log-fd", &output_fd, > @@ -2234,6 +2247,11 @@ int cmd_stat(int argc, const char **argv) > if (add_default_attributes()) > goto out; > > + if (stat_config.cgroup_list) { > + if (evlist__expand_cgroup(evsel_list, stat_config.cgroup_list) < 0) > + goto out; > + } > + > target__validate(&target); > > if ((stat_config.aggr_mode == AGGR_THREAD) && (target.system_wide)) > diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c > index 050dea9f1e88..e4916ed740ac 100644 > --- a/tools/perf/util/cgroup.c > +++ b/tools/perf/util/cgroup.c > @@ -12,6 +12,7 @@ > #include > > int nr_cgroups; > +bool multiply_cgroup; > > static int open_cgroup(const char *name) > { > @@ -156,6 +157,10 @@ int parse_cgroups(const struct option *opt, const char *str, > return -1; > } > > + /* delay processing cgroups after it sees all events */ > + if (multiply_cgroup) > + return 0; > + > for (;;) { > p = strchr(str, ','); > e = p ? p : eos; > @@ -193,6 +198,85 @@ int parse_cgroups(const struct option *opt, const char *str, > return 0; > } > > +int evlist__expand_cgroup(struct evlist *evlist, const char *str) > +{ > + struct evlist *orig_list, *tmp_list; > + struct evsel *pos, *evsel, *leader; > + struct cgroup *cgrp = NULL; > + const char *p, *e, *eos = str + strlen(str); > + int ret = -1; > + > + if (evlist->core.nr_entries == 0) { > + fprintf(stderr, "must define events before cgroups\n"); > + return -EINVAL; > + } > + > + orig_list = evlist__new(); > + tmp_list = evlist__new(); > + if (orig_list == NULL || tmp_list == NULL) { > + fprintf(stderr, "memory allocation failed\n"); > + return -ENOMEM; > + } > + > + /* save original events and init evlist */ > + perf_evlist__splice_list_tail(orig_list, &evlist->core.entries); > + evlist->core.nr_entries = 0; > + > + for (;;) { > + p = strchr(str, ','); > + e = p ? p : eos; > + > + /* allow empty cgroups, i.e., skip */ > + if (e - str) { > + /* termination added */ > + char *name = strndup(str, e - str); > + if (!name) > + goto out_err; > + > + cgrp = cgroup__new(name); > + free(name); > + if (cgrp == NULL) > + goto out_err; > + } else { > + cgrp = NULL; > + } > + > + leader = NULL; > + evlist__for_each_entry(orig_list, pos) { > + evsel = evsel__clone(pos); > + if (evsel == NULL) > + goto out_err; > + > + cgroup__put(evsel->cgrp); > + evsel->cgrp = cgroup__get(cgrp); > + > + if (evsel__is_group_leader(pos)) > + leader = evsel; > + evsel->leader = leader; > + > + evlist__add(tmp_list, evsel); > + } > + /* cgroup__new() has a refcount, release it here */ > + cgroup__put(cgrp); > + nr_cgroups++; > + > + perf_evlist__splice_list_tail(evlist, &tmp_list->core.entries); > + tmp_list->core.nr_entries = 0; > + > + if (!p) { > + ret = 0; > + break; > + } > + str = p+1; > + } > + > +out_err: > + evlist__delete(orig_list); > + evlist__delete(tmp_list); > + > + return ret; > +} > + > static struct cgroup *__cgroup__findnew(struct rb_root *root, uint64_t id, > bool create, const char *path) > { > diff --git a/tools/perf/util/cgroup.h b/tools/perf/util/cgroup.h > index e98d5975fe55..32893018296f 100644 > --- a/tools/perf/util/cgroup.h > +++ b/tools/perf/util/cgroup.h > @@ -24,6 +24,7 @@ void cgroup__put(struct cgroup *cgroup); > struct evlist; > > struct cgroup *evlist__findnew_cgroup(struct evlist *evlist, const char *name); > +int evlist__expand_cgroup(struct evlist *evlist, const char *cgroups); > > void evlist__set_default_cgroup(struct evlist *evlist, struct cgroup *cgroup); > > diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h > index 9911fc6adbfd..7325de5bf2a6 100644 > --- a/tools/perf/util/stat.h > +++ b/tools/perf/util/stat.h > @@ -137,6 +137,7 @@ struct perf_stat_config { > int ctl_fd; > int ctl_fd_ack; > bool ctl_fd_close; > + const char *cgroup_list; > }; > > void perf_stat__set_big_num(int set); > -- > 2.28.0.681.g6f77f65b4e-goog >