Commit f5144eca authored by Ian Rogers's avatar Ian Rogers Committed by Namhyung Kim

perf parse-events: Improve error location of terms cloned from an event

A PMU event/alias will have a set of format terms that replace it when
an event is parsed. The location of the terms is their position when
parsed for the event/alias either from sysfs or json. This location is
of little use when an event fails to parse as the error will be given
in terms of the location in the string of events parsed not the json
or sysfs string. Fix this by making the cloned terms location that of
the event/alias.

If a cloned term from an event/alias is invalid the bad format is hard
to determine from the error string. Add the name of the bad format
into the error string.
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Reviewed-by: default avatarJames Clark <james.clark@arm.com>
Cc: tchen168@asu.edu
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240131134940.593788-2-irogers@google.com
parent 2882358b
...@@ -657,7 +657,7 @@ static int pmu_aliases_parse(struct perf_pmu *pmu) ...@@ -657,7 +657,7 @@ static int pmu_aliases_parse(struct perf_pmu *pmu)
return 0; return 0;
} }
static int pmu_alias_terms(struct perf_pmu_alias *alias, struct list_head *terms) static int pmu_alias_terms(struct perf_pmu_alias *alias, int err_loc, struct list_head *terms)
{ {
struct parse_events_term *term, *cloned; struct parse_events_term *term, *cloned;
struct parse_events_terms clone_terms; struct parse_events_terms clone_terms;
...@@ -675,6 +675,7 @@ static int pmu_alias_terms(struct perf_pmu_alias *alias, struct list_head *terms ...@@ -675,6 +675,7 @@ static int pmu_alias_terms(struct perf_pmu_alias *alias, struct list_head *terms
* which we don't want for implicit terms in aliases. * which we don't want for implicit terms in aliases.
*/ */
cloned->weak = true; cloned->weak = true;
cloned->err_term = cloned->err_val = err_loc;
list_add_tail(&cloned->list, &clone_terms.terms); list_add_tail(&cloned->list, &clone_terms.terms);
} }
list_splice_init(&clone_terms.terms, terms); list_splice_init(&clone_terms.terms, terms);
...@@ -1363,8 +1364,8 @@ static int pmu_config_term(const struct perf_pmu *pmu, ...@@ -1363,8 +1364,8 @@ static int pmu_config_term(const struct perf_pmu *pmu,
parse_events_error__handle(err, term->err_val, parse_events_error__handle(err, term->err_val,
asprintf(&err_str, asprintf(&err_str,
"value too big for format, maximum is %llu", "value too big for format (%s), maximum is %llu",
(unsigned long long)max_val) < 0 format->name, (unsigned long long)max_val) < 0
? strdup("value too big for format") ? strdup("value too big for format")
: err_str, : err_str,
NULL); NULL);
...@@ -1518,7 +1519,7 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct parse_events_terms *head_ ...@@ -1518,7 +1519,7 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct parse_events_terms *head_
alias = pmu_find_alias(pmu, term); alias = pmu_find_alias(pmu, term);
if (!alias) if (!alias)
continue; continue;
ret = pmu_alias_terms(alias, &term->list); ret = pmu_alias_terms(alias, term->err_term, &term->list);
if (ret) { if (ret) {
parse_events_error__handle(err, term->err_term, parse_events_error__handle(err, term->err_term,
strdup("Failure to duplicate terms"), strdup("Failure to duplicate terms"),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment