system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-16 16:29:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf parse: Before yyabort-ing free components

Browse source 
Yyabort doesn't destruct inputs and so this must be done manually before
using yyabort.

Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Martin KaFai Lau <kafai@fb.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Yonghong Song <yhs@fb.com>
Cc: bpf@vger.kernel.org
Cc: clang-built-linux@googlegroups.com
Cc: netdev@vger.kernel.org
Link: http://lore.kernel.org/lkml/20191030223448.12930-8-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2019-10-30 15:34:45 -07:00 committed by Arnaldo Carvalho de Melo
parent f2a8ecd8b1
commit cabbf26821
1 changed files with 197 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

252
tools/perf/util/parse-events.y
View file

@ -152,6 +152,7 @@ start_events: groups
{ {
struct parse_events_state *parse_state = _parse_state; struct parse_events_state *parse_state = _parse_state;
/* frees $1 */
parse_events_update_lists($1, &parse_state->list); parse_events_update_lists($1, &parse_state->list);
} }
@ -161,6 +162,7 @@ groups ',' group
struct list_head *list = $1; struct list_head *list = $1;
struct list_head *group = $3; struct list_head *group = $3;
/* frees $3 */
parse_events_update_lists(group, list); parse_events_update_lists(group, list);
$$ = list; $$ = list;
} }
@ -170,6 +172,7 @@ groups ',' event
struct list_head *list = $1; struct list_head *list = $1;
struct list_head *event = $3; struct list_head *event = $3;
/* frees $3 */
parse_events_update_lists(event, list); parse_events_update_lists(event, list);
$$ = list; $$ = list;
} }
@ -182,8 +185,14 @@ group:
group_def ':' PE_MODIFIER_EVENT group_def ':' PE_MODIFIER_EVENT
{ {
struct list_head *list = $1; struct list_head *list = $1;
int err;
ABORT_ON(parse_events__modifier_group(list, $3)); err = parse_events__modifier_group(list, $3);
free($3);
if (err) {
free_list_evsel(list);
YYABORT;
}
$$ = list; $$ = list;
} }
| |
@ -196,6 +205,7 @@ PE_NAME '{' events '}'
inc_group_count(list, _parse_state); inc_group_count(list, _parse_state);
parse_events__set_leader($1, list, _parse_state); parse_events__set_leader($1, list, _parse_state);
free($1);
$$ = list; $$ = list;
} }
| |
@ -214,6 +224,7 @@ events ',' event
struct list_head *event = $3; struct list_head *event = $3;
struct list_head *list = $1; struct list_head *list = $1;
/* frees $3 */
parse_events_update_lists(event, list); parse_events_update_lists(event, list);
$$ = list; $$ = list;
} }
@ -226,13 +237,19 @@ event_mod:
event_name PE_MODIFIER_EVENT event_name PE_MODIFIER_EVENT
{ {
struct list_head *list = $1; struct list_head *list = $1;
int err;
/* /*
* Apply modifier on all events added by single event definition * Apply modifier on all events added by single event definition
* (there could be more events added for multiple tracepoint * (there could be more events added for multiple tracepoint
* definitions via '*?'. * definitions via '*?'.
*/ */
ABORT_ON(parse_events__modifier_event(list, $2, false)); err = parse_events__modifier_event(list, $2, false);
free($2);
if (err) {
free_list_evsel(list);
YYABORT;
}
$$ = list; $$ = list;
} }
| |
@ -241,8 +258,14 @@ event_name
event_name: event_name:
PE_EVENT_NAME event_def PE_EVENT_NAME event_def
{ {
ABORT_ON(parse_events_name($2, $1)); int err;
err = parse_events_name($2, $1);
free($1); free($1);
if (err) {
free_list_evsel($2);
YYABORT;
}
$$ = $2; $$ = $2;
} }
| |
@ -262,23 +285,33 @@ PE_NAME opt_pmu_config
{ {
struct parse_events_state *parse_state = _parse_state; struct parse_events_state *parse_state = _parse_state;
struct parse_events_error *error = parse_state->error; struct parse_events_error *error = parse_state->error;
struct list_head *list, *orig_terms, *terms; struct list_head *list = NULL, *orig_terms = NULL, *terms= NULL;
char *pattern = NULL;
#define CLEANUP_YYABORT \
do { \
parse_events_terms__delete($2); \
parse_events_terms__delete(orig_terms); \
free($1); \
free(pattern); \
YYABORT; \
} while(0)
if (parse_events_copy_term_list($2, &orig_terms)) if (parse_events_copy_term_list($2, &orig_terms))
YYABORT; CLEANUP_YYABORT;
if (error) if (error)
error->idx = @1.first_column; error->idx = @1.first_column;
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); if (!list)
CLEANUP_YYABORT;
if (parse_events_add_pmu(_parse_state, list, $1, $2, false, false)) { if (parse_events_add_pmu(_parse_state, list, $1, $2, false, false)) {
struct perf_pmu *pmu = NULL; struct perf_pmu *pmu = NULL;
int ok = 0; int ok = 0;
char *pattern;
if (asprintf(&pattern, "%s*", $1) < 0) if (asprintf(&pattern, "%s*", $1) < 0)
YYABORT; CLEANUP_YYABORT;
while ((pmu = perf_pmu__scan(pmu)) != NULL) { while ((pmu = perf_pmu__scan(pmu)) != NULL) {
char *name = pmu->name; char *name = pmu->name;
@ -287,31 +320,32 @@ PE_NAME opt_pmu_config
strncmp($1, "uncore_", 7)) strncmp($1, "uncore_", 7))
name += 7; name += 7;
if (!fnmatch(pattern, name, 0)) { if (!fnmatch(pattern, name, 0)) {
if (parse_events_copy_term_list(orig_terms, &terms)) { if (parse_events_copy_term_list(orig_terms, &terms))
free(pattern); CLEANUP_YYABORT;
YYABORT;
}
if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, true, false)) if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, true, false))
ok++; ok++;
parse_events_terms__delete(terms); parse_events_terms__delete(terms);
} }
} }
free(pattern);
if (!ok) if (!ok)
YYABORT; CLEANUP_YYABORT;
} }
parse_events_terms__delete($2); parse_events_terms__delete($2);
parse_events_terms__delete(orig_terms); parse_events_terms__delete(orig_terms);
free($1);
$$ = list; $$ = list;
#undef CLEANUP_YYABORT
} }
| |
PE_KERNEL_PMU_EVENT sep_dc PE_KERNEL_PMU_EVENT sep_dc
{ {
struct list_head *list; struct list_head *list;
int err;
if (parse_events_multi_pmu_add(_parse_state, $1, &list) < 0) err = parse_events_multi_pmu_add(_parse_state, $1, &list);
free($1);
if (err < 0)
YYABORT; YYABORT;
$$ = list; $$ = list;
} }
@ -322,6 +356,8 @@ PE_PMU_EVENT_PRE '-' PE_PMU_EVENT_SUF sep_dc
char pmu_name[128]; char pmu_name[128];
snprintf(&pmu_name, 128, "%s-%s", $1, $3); snprintf(&pmu_name, 128, "%s-%s", $1, $3);
free($1);
free($3);
if (parse_events_multi_pmu_add(_parse_state, pmu_name, &list) < 0) if (parse_events_multi_pmu_add(_parse_state, pmu_name, &list) < 0)
YYABORT; YYABORT;
$$ = list; $$ = list;
@ -338,11 +374,16 @@ value_sym '/' event_config '/'
struct list_head *list; struct list_head *list;
int type = $1 >> 16; int type = $1 >> 16;
int config = $1 & 255; int config = $1 & 255;
int err;
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
ABORT_ON(parse_events_add_numeric(_parse_state, list, type, config, $3)); err = parse_events_add_numeric(_parse_state, list, type, config, $3);
parse_events_terms__delete($3); parse_events_terms__delete($3);
if (err) {
free_list_evsel(list);
YYABORT;
}
$$ = list; $$ = list;
} }
| |
@ -374,11 +415,19 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT opt_e
struct parse_events_state *parse_state = _parse_state; struct parse_events_state *parse_state = _parse_state;
struct parse_events_error *error = parse_state->error; struct parse_events_error *error = parse_state->error;
struct list_head *list; struct list_head *list;
int err;
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
ABORT_ON(parse_events_add_cache(list, &parse_state->idx, $1, $3, $5, error, $6)); err = parse_events_add_cache(list, &parse_state->idx, $1, $3, $5, error, $6);
parse_events_terms__delete($6); parse_events_terms__delete($6);
free($1);
free($3);
free($5);
if (err) {
free_list_evsel(list);
YYABORT;
}
$$ = list; $$ = list;
} }
| |
@ -387,11 +436,18 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT opt_event_config
struct parse_events_state *parse_state = _parse_state; struct parse_events_state *parse_state = _parse_state;
struct parse_events_error *error = parse_state->error; struct parse_events_error *error = parse_state->error;
struct list_head *list; struct list_head *list;
int err;
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
ABORT_ON(parse_events_add_cache(list, &parse_state->idx, $1, $3, NULL, error, $4)); err = parse_events_add_cache(list, &parse_state->idx, $1, $3, NULL, error, $4);
parse_events_terms__delete($4); parse_events_terms__delete($4);
free($1);
free($3);
if (err) {
free_list_evsel(list);
YYABORT;
}
$$ = list; $$ = list;
} }
| |
@ -400,11 +456,17 @@ PE_NAME_CACHE_TYPE opt_event_config
struct parse_events_state *parse_state = _parse_state; struct parse_events_state *parse_state = _parse_state;
struct parse_events_error *error = parse_state->error; struct parse_events_error *error = parse_state->error;
struct list_head *list; struct list_head *list;
int err;
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
ABORT_ON(parse_events_add_cache(list, &parse_state->idx, $1, NULL, NULL, error, $2)); err = parse_events_add_cache(list, &parse_state->idx, $1, NULL, NULL, error, $2);
parse_events_terms__delete($2); parse_events_terms__delete($2);
free($1);
if (err) {
free_list_evsel(list);
YYABORT;
}
$$ = list; $$ = list;
} }
@ -413,11 +475,17 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE ':' PE_MODIFIER_BP sep_dc
{ {
struct parse_events_state *parse_state = _parse_state; struct parse_events_state *parse_state = _parse_state;
struct list_head *list; struct list_head *list;
int err;
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, err = parse_events_add_breakpoint(list, &parse_state->idx,
(void *) $2, $6, $4)); (void *) $2, $6, $4);
free($6);
if (err) {
free(list);
YYABORT;
}
$$ = list; $$ = list;
} }
| |
@ -428,8 +496,11 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE sep_dc
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, if (parse_events_add_breakpoint(list, &parse_state->idx,
(void *) $2, NULL, $4)); (void *) $2, NULL, $4)) {
free(list);
YYABORT;
}
$$ = list; $$ = list;
} }
| |
@ -437,11 +508,17 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc
{ {
struct parse_events_state *parse_state = _parse_state; struct parse_events_state *parse_state = _parse_state;
struct list_head *list; struct list_head *list;
int err;
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, err = parse_events_add_breakpoint(list, &parse_state->idx,
(void *) $2, $4, 0)); (void *) $2, $4, 0);
free($4);
if (err) {
free(list);
YYABORT;
}
$$ = list; $$ = list;
} }
| |
@ -452,8 +529,11 @@ PE_PREFIX_MEM PE_VALUE sep_dc
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, if (parse_events_add_breakpoint(list, &parse_state->idx,
(void *) $2, NULL, 0)); (void *) $2, NULL, 0)) {
free(list);
YYABORT;
}
$$ = list; $$ = list;
} }
@ -463,29 +543,35 @@ tracepoint_name opt_event_config
struct parse_events_state *parse_state = _parse_state; struct parse_events_state *parse_state = _parse_state;
struct parse_events_error *error = parse_state->error; struct parse_events_error *error = parse_state->error;
struct list_head *list; struct list_head *list;
int err;
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
if (error) if (error)
error->idx = @1.first_column; error->idx = @1.first_column;
if (parse_events_add_tracepoint(list, &parse_state->idx, $1.sys, $1.event, err = parse_events_add_tracepoint(list, &parse_state->idx, $1.sys, $1.event,
error, $2)) error, $2);
return -1;
parse_events_terms__delete($2);
free($1.sys);
free($1.event);
if (err) {
free(list);
return -1;
}
$$ = list; $$ = list;
} }
tracepoint_name: tracepoint_name:
PE_NAME '-' PE_NAME ':' PE_NAME PE_NAME '-' PE_NAME ':' PE_NAME
{ {
char sys_name[128];
struct tracepoint_name tracepoint; struct tracepoint_name tracepoint;
snprintf(&sys_name, 128, "%s-%s", $1, $3); ABORT_ON(asprintf(&tracepoint.sys, "%s-%s", $1, $3) < 0);
tracepoint.sys = &sys_name;
tracepoint.event = $5; tracepoint.event = $5;
free($1);
free($3);
$$ = tracepoint; $$ = tracepoint;
} }
| |
@ -500,11 +586,16 @@ event_legacy_numeric:
PE_VALUE ':' PE_VALUE opt_event_config PE_VALUE ':' PE_VALUE opt_event_config
{ {
struct list_head *list; struct list_head *list;
int err;
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
ABORT_ON(parse_events_add_numeric(_parse_state, list, (u32)$1, $3, $4)); err = parse_events_add_numeric(_parse_state, list, (u32)$1, $3, $4);
parse_events_terms__delete($4); parse_events_terms__delete($4);
if (err) {
free(list);
YYABORT;
}
$$ = list; $$ = list;
} }
@ -512,11 +603,16 @@ event_legacy_raw:
PE_RAW opt_event_config PE_RAW opt_event_config
{ {
struct list_head *list; struct list_head *list;
int err;
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
ABORT_ON(parse_events_add_numeric(_parse_state, list, PERF_TYPE_RAW, $1, $2)); err = parse_events_add_numeric(_parse_state, list, PERF_TYPE_RAW, $1, $2);
parse_events_terms__delete($2); parse_events_terms__delete($2);
if (err) {
free(list);
YYABORT;
}
$$ = list; $$ = list;
} }
@ -525,22 +621,33 @@ PE_BPF_OBJECT opt_event_config
{ {
struct parse_events_state *parse_state = _parse_state; struct parse_events_state *parse_state = _parse_state;
struct list_head *list; struct list_head *list;
int err;
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
ABORT_ON(parse_events_load_bpf(parse_state, list, $1, false, $2)); err = parse_events_load_bpf(parse_state, list, $1, false, $2);
parse_events_terms__delete($2); parse_events_terms__delete($2);
free($1);
if (err) {
free(list);
YYABORT;
}
$$ = list; $$ = list;
} }
| |
PE_BPF_SOURCE opt_event_config PE_BPF_SOURCE opt_event_config
{ {
struct list_head *list; struct list_head *list;
int err;
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
ABORT_ON(parse_events_load_bpf(_parse_state, list, $1, true, $2)); err = parse_events_load_bpf(_parse_state, list, $1, true, $2);
parse_events_terms__delete($2); parse_events_terms__delete($2);
if (err) {
free(list);
YYABORT;
}
$$ = list; $$ = list;
} }
@ -573,6 +680,10 @@ opt_pmu_config:
start_terms: event_config start_terms: event_config
{ {
struct parse_events_state *parse_state = _parse_state; struct parse_events_state *parse_state = _parse_state;
if (parse_state->terms) {
parse_events_terms__delete ($1);
YYABORT;
}
parse_state->terms = $1; parse_state->terms = $1;
} }
@ -582,7 +693,10 @@ event_config ',' event_term
struct list_head *head = $1; struct list_head *head = $1;
struct parse_events_term *term = $3; struct parse_events_term *term = $3;
ABORT_ON(!head); if (!head) {
free_term(term);
YYABORT;
}
list_add_tail(&term->list, head); list_add_tail(&term->list, head);
$$ = $1; $$ = $1;
} }
@ -603,8 +717,12 @@ PE_NAME '=' PE_NAME
{ {
struct parse_events_term *term; struct parse_events_term *term;
ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER,
$1, $3, &@1, &@3)); $1, $3, &@1, &@3)) {
free($1);
free($3);
YYABORT;
}
$$ = term; $$ = term;
} }
| |
@ -612,8 +730,11 @@ PE_NAME '=' PE_VALUE
{ {
struct parse_events_term *term; struct parse_events_term *term;
ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,
$1, $3, false, &@1, &@3)); $1, $3, false, &@1, &@3)) {
free($1);
YYABORT;
}
$$ = term; $$ = term;
} }
| |
@ -622,7 +743,10 @@ PE_NAME '=' PE_VALUE_SYM_HW
struct parse_events_term *term; struct parse_events_term *term;
int config = $3 & 255; int config = $3 & 255;
ABORT_ON(parse_events_term__sym_hw(&term, $1, config)); if (parse_events_term__sym_hw(&term, $1, config)) {
free($1);
YYABORT;
}
$$ = term; $$ = term;
} }
| |
@ -630,8 +754,11 @@ PE_NAME
{ {
struct parse_events_term *term; struct parse_events_term *term;
ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,
$1, 1, true, &@1, NULL)); $1, 1, true, &@1, NULL)) {
free($1);
YYABORT;
}
$$ = term; $$ = term;
} }
| |
@ -648,7 +775,10 @@ PE_TERM '=' PE_NAME
{ {
struct parse_events_term *term; struct parse_events_term *term;
ABORT_ON(parse_events_term__str(&term, (int)$1, NULL, $3, &@1, &@3)); if (parse_events_term__str(&term, (int)$1, NULL, $3, &@1, &@3)) {
free($3);
YYABORT;
}
$$ = term; $$ = term;
} }
| |
@ -672,9 +802,13 @@ PE_NAME array '=' PE_NAME
{ {
struct parse_events_term *term; struct parse_events_term *term;
ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER,
$1, $4, &@1, &@4)); $1, $4, &@1, &@4)) {
free($1);
free($4);
free($2.ranges);
YYABORT;
}
term->array = $2; term->array = $2;
$$ = term; $$ = term;
} }
@ -683,8 +817,12 @@ PE_NAME array '=' PE_VALUE
{ {
struct parse_events_term *term; struct parse_events_term *term;
ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER,
$1, $4, false, &@1, &@4)); $1, $4, false, &@1, &@4)) {
free($1);
free($2.ranges);
YYABORT;
}
term->array = $2; term->array = $2;
$$ = term; $$ = term;
} }
@ -695,8 +833,12 @@ PE_DRV_CFG_TERM
char *config = strdup($1); char *config = strdup($1);
ABORT_ON(!config); ABORT_ON(!config);
ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG,
config, $1, &@1, NULL)); config, $1, &@1, NULL)) {
free($1);
free(config);
YYABORT;
}
$$ = term; $$ = term;
} }