| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20210918063513.2356923-7-irogers@google.com>
Date: Fri, 17 Sep 2021 23:35:11 -0700
From: Ian Rogers <irogers@...gle.com>
To: Peter Zijlstra <peterz@...radead.org>,
Ingo Molnar <mingo@...hat.com>,
Arnaldo Carvalho de Melo <acme@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Jiri Olsa <jolsa@...hat.com>,
Namhyung Kim <namhyung@...nel.org>,
linux-kernel@...r.kernel.org, Andi Kleen <ak@...ux.intel.com>,
Jin Yao <yao.jin@...ux.intel.com>,
John Garry <john.garry@...wei.com>,
Paul Clarke <pc@...ibm.com>, kajoljain <kjain@...ux.ibm.com>,
linux-perf-users@...r.kernel.org
Cc: Stephane Eranian <eranian@...gle.com>,
Sandeep Dasgupta <sdasgup@...gle.com>,
Ian Rogers <irogers@...gle.com>
Subject: [PATCH v8 6/8] perf metric: Allow metrics with no events
A metric may be a constant value, for example, some SMT metrics are
constant 0 if #smt_on is 0. If we eliminate all the events then there is
no printing. Fix this by forcing metrics like this to have a
duration_time tool event, previously the metric would fail when parsing
the events with a parse error.
Signed-off-by: Ian Rogers <irogers@...gle.com>
---
tools/perf/util/metricgroup.c | 109 ++++++++++++++++++----------------
1 file changed, 59 insertions(+), 50 deletions(-)
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index 046fb3fe1700..34956977e907 100644
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -198,65 +198,69 @@ static struct evsel *find_evsel_group(struct evlist *perf_evlist,
struct evsel *ev, *current_leader = NULL;
struct expr_id_data *val_ptr;
int i = 0, matched_events = 0, events_to_match;
- const int idnum = (int)hashmap__size(pctx->ids);
+ int idnum = (int)hashmap__size(pctx->ids);
- /*
- * duration_time is always grouped separately, when events are grouped
- * (ie has_constraint is false) then ignore it in the matching loop and
- * add it to metric_events at the end.
- */
- if (!has_constraint &&
- hashmap__find(pctx->ids, "duration_time", (void **)&val_ptr))
- events_to_match = idnum - 1;
- else
- events_to_match = idnum;
-
- evlist__for_each_entry (perf_evlist, ev) {
+ if (idnum != 0) {
/*
- * Events with a constraint aren't grouped and match the first
- * events available.
+ * duration_time is always grouped separately, when events are
+ * grouped (ie has_constraint is false) then ignore it in the
+ * matching loop and add it to metric_events at the end.
*/
- if (has_constraint && ev->weak_group)
- continue;
- /* Ignore event if already used and merging is disabled. */
- if (metric_no_merge && test_bit(ev->core.idx, evlist_used))
- continue;
- if (!has_constraint && !evsel__has_leader(ev, current_leader)) {
+ events_to_match = idnum;
+ if (!has_constraint && hashmap__find(pctx->ids, "duration_time", (void **)&val_ptr))
+ events_to_match--;
+
+ evlist__for_each_entry(perf_evlist, ev) {
+ /*
+ * Events with a constraint aren't grouped and match the
+ * first events available.
+ */
+ if (has_constraint && ev->weak_group)
+ continue;
+ /* Ignore event if already used and merging is disabled. */
+ if (metric_no_merge && test_bit(ev->core.idx, evlist_used))
+ continue;
+ if (!has_constraint && !evsel__has_leader(ev, current_leader)) {
+ /*
+ * Start of a new group, discard the whole match
+ * and start again.
+ */
+ matched_events = 0;
+ memset(metric_events, 0, sizeof(struct evsel *) * idnum);
+ current_leader = evsel__leader(ev);
+ }
/*
- * Start of a new group, discard the whole match and
- * start again.
+ * Check for duplicate events with the same name. For
+ * example, uncore_imc/cas_count_read/ will turn into 6
+ * events per socket on skylakex. Only the first such
+ * event is placed in metric_events. If events aren't
+ * grouped then this also ensures that the same event in
+ * different sibling groups aren't both added to
+ * metric_events.
*/
- matched_events = 0;
- memset(metric_events, 0,
- sizeof(struct evsel *) * idnum);
- current_leader = evsel__leader(ev);
+ if (contains_event(metric_events, matched_events, ev->name))
+ continue;
+ /* Does this event belong to the parse context? */
+ if (hashmap__find(pctx->ids, ev->name, (void **)&val_ptr))
+ metric_events[matched_events++] = ev;
+
+ if (matched_events == events_to_match)
+ break;
}
+ } else {
/*
- * Check for duplicate events with the same name. For example,
- * uncore_imc/cas_count_read/ will turn into 6 events per socket
- * on skylakex. Only the first such event is placed in
- * metric_events. If events aren't grouped then this also
- * ensures that the same event in different sibling groups
- * aren't both added to metric_events.
+ * There are no events to match, but we need to associate the
+ * metric with an event for printing. A duration_time event was
+ * parsed for this.
*/
- if (contains_event(metric_events, matched_events, ev->name))
- continue;
- /* Does this event belong to the parse context? */
- if (hashmap__find(pctx->ids, ev->name, (void **)&val_ptr))
- metric_events[matched_events++] = ev;
-
- if (matched_events == events_to_match)
- break;
+ idnum = 1;
+ events_to_match = 0;
}
-
if (events_to_match != idnum) {
/* Add the first duration_time. */
- evlist__for_each_entry(perf_evlist, ev) {
- if (!strcmp(ev->name, "duration_time")) {
- metric_events[matched_events++] = ev;
- break;
- }
- }
+ ev = evlist__find_evsel_by_str(perf_evlist, "duration_time");
+ if (ev)
+ metric_events[matched_events++] = ev;
}
if (matched_events != idnum) {
@@ -320,9 +324,10 @@ static int metricgroup__setup_events(struct list_head *groups,
list_for_each_entry (m, groups, nd) {
struct evsel **metric_events;
struct metric_ref *metric_refs = NULL;
+ const size_t ids_size = hashmap__size(m->pctx->ids);
metric_events = calloc(sizeof(void *),
- hashmap__size(m->pctx->ids) + 1);
+ ids_size == 0 ? 2 : ids_size + 1);
if (!metric_events) {
ret = -ENOMEM;
break;
@@ -1240,7 +1245,11 @@ static int parse_groups(struct evlist *perf_evlist, const char *str,
goto out;
pr_debug("adding %s\n", extra_events.buf);
bzero(&parse_error, sizeof(parse_error));
- ret = __parse_events(perf_evlist, extra_events.buf, &parse_error, fake_pmu);
+ ret = __parse_events(perf_evlist,
+ extra_events.len > 0
+ ? extra_events.buf
+ : "duration_time",
+ &parse_error, fake_pmu);
if (ret) {
parse_events_print_error(&parse_error, extra_events.buf);
goto out;
--
2.33.0.464.g1972c5931b-goog
Powered by blists - more mailing lists