From: Ian Rogers <irogers@google.com>
To: John Garry <john.garry@huawei.com>, Will Deacon <will@kernel.org>,
James Clark <james.clark@arm.com>,
Mike Leach <mike.leach@linaro.org>, Leo Yan <leo.yan@linaro.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Andi Kleen <ak@linux.intel.com>,
Zhengjun Xing <zhengjun.xing@linux.intel.com>,
Ravi Bangoria <ravi.bangoria@amd.com>,
Kan Liang <kan.liang@linux.intel.com>,
Adrian Hunter <adrian.hunter@intel.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-perf-users@vger.kernel.org
Cc: Stephane Eranian <eranian@google.com>, Ian Rogers <irogers@google.com>
Subject: [PATCH v5 12/14] perf metrics: Copy entire pmu_event in find metric
Date: Fri, 12 Aug 2022 16:09:47 -0700 [thread overview]
Message-ID: <20220812230949.683239-13-irogers@google.com> (raw)
In-Reply-To: <20220812230949.683239-1-irogers@google.com>
The pmu_event passed to the pmu_events_table_for_each_event is invalid
after the loop. Copy the entire struct in metricgroup__find_metric.
Reduce the scope of this function to static.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/metricgroup.c | 33 ++++++++++++++++++---------------
tools/perf/util/metricgroup.h | 2 --
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index 42a5c8ae915e..464475fd6b9a 100644
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -879,6 +879,10 @@ struct metricgroup_add_iter_data {
const struct pmu_events_table *table;
};
+static bool metricgroup__find_metric(const char *metric,
+ const struct pmu_events_table *table,
+ struct pmu_event *pe);
+
static int add_metric(struct list_head *metric_list,
const struct pmu_event *pe,
const char *modifier,
@@ -914,7 +918,7 @@ static int resolve_metric(struct list_head *metric_list,
size_t bkt;
struct to_resolve {
/* The metric to resolve. */
- const struct pmu_event *pe;
+ struct pmu_event pe;
/*
* The key in the IDs map, this may differ from in case,
* etc. from pe->metric_name.
@@ -928,16 +932,15 @@ static int resolve_metric(struct list_head *metric_list,
* the pending array.
*/
hashmap__for_each_entry(root_metric->pctx->ids, cur, bkt) {
- const struct pmu_event *pe;
+ struct pmu_event pe;
- pe = metricgroup__find_metric(cur->key, table);
- if (pe) {
+ if (metricgroup__find_metric(cur->key, table, &pe)) {
pending = realloc(pending,
(pending_cnt + 1) * sizeof(struct to_resolve));
if (!pending)
return -ENOMEM;
- pending[pending_cnt].pe = pe;
+ memcpy(&pending[pending_cnt].pe, &pe, sizeof(pe));
pending[pending_cnt].key = cur->key;
pending_cnt++;
}
@@ -952,7 +955,7 @@ static int resolve_metric(struct list_head *metric_list,
* context.
*/
for (i = 0; i < pending_cnt; i++) {
- ret = add_metric(metric_list, pending[i].pe, modifier, metric_no_group,
+ ret = add_metric(metric_list, &pending[i].pe, modifier, metric_no_group,
root_metric, visited, table);
if (ret)
break;
@@ -1073,7 +1076,7 @@ static int __add_metric(struct list_head *metric_list,
struct metricgroup__find_metric_data {
const char *metric;
- const struct pmu_event *pe;
+ struct pmu_event *pe;
};
static int metricgroup__find_metric_callback(const struct pmu_event *pe,
@@ -1085,21 +1088,21 @@ static int metricgroup__find_metric_callback(const struct pmu_event *pe,
if (!match_metric(pe->metric_name, data->metric))
return 0;
- data->pe = pe;
- return -1;
+ memcpy(data->pe, pe, sizeof(*pe));
+ return 1;
}
-const struct pmu_event *metricgroup__find_metric(const char *metric,
- const struct pmu_events_table *table)
+static bool metricgroup__find_metric(const char *metric,
+ const struct pmu_events_table *table,
+ struct pmu_event *pe)
{
struct metricgroup__find_metric_data data = {
.metric = metric,
- .pe = NULL,
+ .pe = pe,
};
- pmu_events_table_for_each_event(table, metricgroup__find_metric_callback, &data);
-
- return data.pe;
+ return pmu_events_table_for_each_event(table, metricgroup__find_metric_callback, &data)
+ ? true : false;
}
static int add_metric(struct list_head *metric_list,
diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h
index f54d170043e9..016b3b1a289a 100644
--- a/tools/perf/util/metricgroup.h
+++ b/tools/perf/util/metricgroup.h
@@ -69,8 +69,6 @@ int metricgroup__parse_groups(const struct option *opt,
bool metric_no_group,
bool metric_no_merge,
struct rblist *metric_events);
-const struct pmu_event *metricgroup__find_metric(const char *metric,
- const struct pmu_events_table *table);
int metricgroup__parse_groups_test(struct evlist *evlist,
const struct pmu_events_table *table,
const char *str,
--
2.37.1.595.g718a3a8f04-goog
next prev parent reply other threads:[~2022-08-12 23:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-12 23:09 [PATCH v5 00/14] Compress the pmu_event tables Ian Rogers
2022-08-12 23:09 ` [PATCH v5 01/14] perf jevent: Add an 'all' architecture argument Ian Rogers
2022-08-12 23:09 ` [PATCH v5 02/14] perf jevents: Remove the type/version variables Ian Rogers
2022-08-12 23:09 ` [PATCH v5 03/14] perf jevents: Provide path to json file on error Ian Rogers
2022-08-12 23:09 ` [PATCH v5 04/14] perf jevents: Sort json files entries Ian Rogers
2022-08-12 23:09 ` [PATCH v5 05/14] perf pmu-events: Hide pmu_sys_event_tables Ian Rogers
2022-08-12 23:09 ` [PATCH v5 06/14] perf pmu-events: Avoid passing pmu_events_map Ian Rogers
2022-08-12 23:09 ` [PATCH v5 07/14] perf pmu-events: Hide pmu_events_map Ian Rogers
2022-08-12 23:09 ` [PATCH v5 08/14] perf test: Use full metric resolution Ian Rogers
2022-08-12 23:09 ` [PATCH v5 09/14] perf pmu-events: Move test events/metrics to json Ian Rogers
2022-08-12 23:09 ` [PATCH v5 10/14] perf pmu-events: Don't assume pmu_event is an array Ian Rogers
2022-08-12 23:09 ` [PATCH v5 11/14] perf pmu-events: Hide the pmu_events Ian Rogers
2022-08-12 23:09 ` Ian Rogers [this message]
2022-08-12 23:09 ` [PATCH v5 13/14] perf jevents: Compress the pmu_events_table Ian Rogers
2022-08-12 23:09 ` [PATCH v5 14/14] perf jevents: Fold strings optimization Ian Rogers
2022-08-13 18:03 ` [PATCH v5 00/14] Compress the pmu_event tables Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220812230949.683239-13-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=james.clark@arm.com \
--cc=john.garry@huawei.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mike.leach@linaro.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=will@kernel.org \
--cc=zhengjun.xing@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).