Skip to content

Commit

Permalink
perf parse-events: Move instances of YYABORT to YYNOMEM
Browse files Browse the repository at this point in the history 
[ Upstream commit 77cdd78 ]

Migration to improve error reporting as YYABORT cases should carry
event parsing errors.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: bpf@vger.kernel.org
Link: https://lore.kernel.org/r/20230627181030.95608-9-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Stable-dep-of: b30d4f0 ("perf parse-events: Additional error reporting")
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
@captain5050 @gregkh
captain5050 authored and gregkh committed Sep 19, 2023
1 parent 7e7bca9 commit 0e8501c
Showing 1 changed file with 40 additions and 18 deletions.
58 changes: 40 additions & 18 deletions tools/perf/util/parse-events.y
View file
Expand Up @@ -455,7 +455,8 @@ value_sym '/' event_config '/'
bool wildcard = (type == PERF_TYPE_HARDWARE || type == PERF_TYPE_HW_CACHE);

list = alloc_list();
ABORT_ON(!list);
if (!list)
YYNOMEM;
err = parse_events_add_numeric(_parse_state, list, type, config, $3, wildcard);
parse_events_terms__delete($3);
if (err) {
Expand All @@ -473,7 +474,8 @@ value_sym sep_slash_slash_dc
bool wildcard = (type == PERF_TYPE_HARDWARE || type == PERF_TYPE_HW_CACHE);

list = alloc_list();
ABORT_ON(!list);
if (!list)
YYNOMEM;
ABORT_ON(parse_events_add_numeric(_parse_state, list, type, config,
/*head_config=*/NULL, wildcard));
$$ = list;
Expand All @@ -484,7 +486,8 @@ PE_VALUE_SYM_TOOL sep_slash_slash_dc
struct list_head *list;

list = alloc_list();
ABORT_ON(!list);
if (!list)
YYNOMEM;
ABORT_ON(parse_events_add_tool(_parse_state, list, $1));
$$ = list;
}
Expand All @@ -497,7 +500,9 @@ PE_LEGACY_CACHE opt_event_config
int err;

list = alloc_list();
ABORT_ON(!list);
if (!list)
YYNOMEM;

err = parse_events_add_cache(list, &parse_state->idx, $1, parse_state, $2);

parse_events_terms__delete($2);
Expand All @@ -516,7 +521,9 @@ PE_PREFIX_MEM PE_VALUE PE_BP_SLASH PE_VALUE PE_BP_COLON PE_MODIFIER_BP opt_event
int err;

list = alloc_list();
ABORT_ON(!list);
if (!list)
YYNOMEM;

err = parse_events_add_breakpoint(_parse_state, list,
$2, $6, $4, $7);
parse_events_terms__delete($7);
Expand All @@ -534,7 +541,9 @@ PE_PREFIX_MEM PE_VALUE PE_BP_SLASH PE_VALUE opt_event_config
int err;

list = alloc_list();
ABORT_ON(!list);
if (!list)
YYNOMEM;

err = parse_events_add_breakpoint(_parse_state, list,
$2, NULL, $4, $5);
parse_events_terms__delete($5);
Expand All @@ -551,7 +560,9 @@ PE_PREFIX_MEM PE_VALUE PE_BP_COLON PE_MODIFIER_BP opt_event_config
int err;

list = alloc_list();
ABORT_ON(!list);
if (!list)
YYNOMEM;

err = parse_events_add_breakpoint(_parse_state, list,
$2, $4, 0, $5);
parse_events_terms__delete($5);
Expand All @@ -569,7 +580,8 @@ PE_PREFIX_MEM PE_VALUE opt_event_config
int err;

list = alloc_list();
ABORT_ON(!list);
if (!list)
YYNOMEM;
err = parse_events_add_breakpoint(_parse_state, list,
$2, NULL, 0, $3);
parse_events_terms__delete($3);
Expand All @@ -589,7 +601,8 @@ tracepoint_name opt_event_config
int err;

list = alloc_list();
ABORT_ON(!list);
if (!list)
YYNOMEM;
if (error)
error->idx = @1.first_column;

Expand Down Expand Up @@ -621,7 +634,8 @@ PE_VALUE ':' PE_VALUE opt_event_config
int err;

list = alloc_list();
ABORT_ON(!list);
if (!list)
YYNOMEM;
err = parse_events_add_numeric(_parse_state, list, (u32)$1, $3, $4,
/*wildcard=*/false);
parse_events_terms__delete($4);
Expand All @@ -640,7 +654,8 @@ PE_RAW opt_event_config
u64 num;

list = alloc_list();
ABORT_ON(!list);
if (!list)
YYNOMEM;
errno = 0;
num = strtoull($1 + 1, NULL, 16);
ABORT_ON(errno);
Expand All @@ -663,7 +678,8 @@ PE_BPF_OBJECT opt_event_config
int err;

list = alloc_list();
ABORT_ON(!list);
if (!list)
YYNOMEM;
err = parse_events_load_bpf(parse_state, list, $1, false, $2);
parse_events_terms__delete($2);
free($1);
Expand All @@ -680,7 +696,8 @@ PE_BPF_SOURCE opt_event_config
int err;

list = alloc_list();
ABORT_ON(!list);
if (!list)
YYNOMEM;
err = parse_events_load_bpf(_parse_state, list, $1, true, $2);
parse_events_terms__delete($2);
if (err) {
Expand Down Expand Up @@ -745,7 +762,8 @@ event_term
struct list_head *head = malloc(sizeof(*head));
struct parse_events_term *term = $1;

ABORT_ON(!head);
if (!head)
YYNOMEM;
INIT_LIST_HEAD(head);
list_add_tail(&term->list, head);
$$ = head;
Expand Down Expand Up @@ -922,7 +940,8 @@ PE_DRV_CFG_TERM
struct parse_events_term *term;
char *config = strdup($1);

ABORT_ON(!config);
if (!config)
YYNOMEM;
if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG,
config, $1, &@1, NULL)) {
free($1);
Expand Down Expand Up @@ -953,7 +972,8 @@ array_terms ',' array_term
new_array.ranges = realloc($1.ranges,
sizeof(new_array.ranges[0]) *
new_array.nr_ranges);
ABORT_ON(!new_array.ranges);
if (!new_array.ranges)
YYNOMEM;
memcpy(&new_array.ranges[$1.nr_ranges], $3.ranges,
$3.nr_ranges * sizeof(new_array.ranges[0]));
free($3.ranges);
Expand All @@ -969,7 +989,8 @@ PE_VALUE

array.nr_ranges = 1;
array.ranges = malloc(sizeof(array.ranges[0]));
ABORT_ON(!array.ranges);
if (!array.ranges)
YYNOMEM;
array.ranges[0].start = $1;
array.ranges[0].length = 1;
$$ = array;
Expand All @@ -982,7 +1003,8 @@ PE_VALUE PE_ARRAY_RANGE PE_VALUE
ABORT_ON($3 < $1);
array.nr_ranges = 1;
array.ranges = malloc(sizeof(array.ranges[0]));
ABORT_ON(!array.ranges);
if (!array.ranges)
YYNOMEM;
array.ranges[0].start = $1;
array.ranges[0].length = $3 - $1 + 1;
$$ = array;
Expand Down

0 comments on commit 0e8501c

Please sign in to comment.