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=-13.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 A9DF5C43464 for ; Mon, 21 Sep 2020 09:46:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 52ABC21789 for ; Mon, 21 Sep 2020 09:46:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600681586; bh=VGkgwo0rAb8iWDzX6/rKcMAwAcoTg/lzdMRLvIx08pk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iBkoYgzez7nyt+m76EuEj38otdTUm4UcDRUX0mKI8PcpaK+gXjcDnUyZIyE1PPvQ3 8jp5skCWUzWkPW4k4oKqaRcAeVC4W3FtrUR6aBC0ZKMGf6Hu8O5DDL4fqZs/nuPXeZ uHtjQ28EvkFsqmoN2JZqP2HuuvbbvIXuu+jh8Eyg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726578AbgIUJqZ (ORCPT ); Mon, 21 Sep 2020 05:46:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726318AbgIUJqY (ORCPT ); Mon, 21 Sep 2020 05:46:24 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDB62C061755 for ; Mon, 21 Sep 2020 02:46:23 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id gf14so6844440pjb.5 for ; Mon, 21 Sep 2020 02:46:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mlLJcOuSU9JAVCM1Imc+rg8XTQDEn6QecAr6zv9fCA0=; b=O+zrOJb1sTqd67tnsaPbppq+eRR7kkgGlA0CaBTlepSaVBDorYEPvVHJP2qBVgNNpz XV39GpADNP7ai9Swx9Ir3CBTIBsFILvPSOQxueeAXQ/RR6/QVCdBiVG5eVWvb8A02chV FiAMMj9f7sdIy3hU0cqRk+1+YLR40VyMKjtxHlr/1LI5DEoqnqNaJofxN04qvsXOc6Vn J9KIMSMFD2YCxF4+2ORbegfHLQzmEGXYXvDlnfo8GQBi0kyrcVeMitH5LHzGcZEQQg44 FC6nT40iWTPBZKoN6IMggH7bN92SVHBH6G306URlbx6+I7hW8v2wx9W0rGGtP7v9VkCM E/Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mlLJcOuSU9JAVCM1Imc+rg8XTQDEn6QecAr6zv9fCA0=; b=F7UBa1ufDV50ahTC5I3R2X/xlnaAmk8qwxCyIpYhWhqcky22nw8FVYIZJeuIUpDbGD IFPDoQZl4+fupyue1dXwlqbdWlBgQ5+lZ3vtGImka9E5l3WHd+3D8p8TJ/9Bj88ahUA0 ynItVIEiIhJCTTqXS9yyn4tjFJXbIL4GWMvOXTBixmN6xNpR2UUJBfHYBjVR39U/t2jM xMGRW/DvsYmcDq+bfsoe7h/slGpTpoZYTeJE96l7rT23Z9I2GKeRJ0g0AzKmIoOi+51W 2E1ja1aTVfTafp8smsO8yukIiwMIqDRWL5++b+GEKRDpYqZWfZNMB9NZGxqXlRamKJs5 FTDw== X-Gm-Message-State: AOAM531Fm0EQrxNjqPTbk863W0iuZDV4OpDhKrfMn8JIzM+GxjUkUI85 bUUhiI5WBC6IXdcetiKko2QwRhoWTSY= X-Google-Smtp-Source: ABdhPJzRd6SH+B4zyXB2XTuSoT4DeIKCHkV5/6ajAzUP/2/23rLlnJCzd4LEn72GlcySA5cQop0c3A== X-Received: by 2002:a17:90b:364c:: with SMTP id nh12mr23121476pjb.182.1600681583528; Mon, 21 Sep 2020 02:46:23 -0700 (PDT) Received: from balhae.roam.corp.google.com ([101.235.31.111]) by smtp.gmail.com with ESMTPSA id x192sm11199984pfc.142.2020.09.21.02.46.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 02:46:23 -0700 (PDT) Sender: Namhyung Kim From: Namhyung Kim To: Arnaldo Carvalho de Melo , Jiri Olsa Cc: Ingo Molnar , Peter Zijlstra , Mark Rutland , Alexander Shishkin , LKML , Stephane Eranian , Andi Kleen , Ian Rogers Subject: [PATCH 2/5] perf stat: Add --for-each-cgroup option Date: Mon, 21 Sep 2020 18:46:07 +0900 Message-Id: <20200921094610.83736-3-namhyung@kernel.org> X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog In-Reply-To: <20200921094610.83736-1-namhyung@kernel.org> References: <20200921094610.83736-1-namhyung@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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