perf tools: avoid reading out of scope array
Subsystems (4)
Ian Rogers
reviewerPATCH v6 7/10 perf tools: before yyabort-ing free components
In reply to Ian RogersYyabort doesn't destruct inputs and so this must be done manually before using yyabort.
--- tools/perf/util/parse-events.y | 252 ++++++++++++++++++++++++++------- 1 file changed, 197 insertions(+), 55 deletions(-)
tools/perf/util/parse-events.y +197 -55
@@ -152,6 +152,7 @@ start_events: groups { struct parse_events_state *parse_state = _parse_state; + /* frees $1 */ parse_events_update_lists($1, &parse_state->list); }
@@ -161,6 +162,7 @@ groups ',' group struct list_head *list = $1; struct list_head *group = $3; + /* frees $3 */ parse_events_update_lists(group, list); $$ = list; }
@@ -170,6 +172,7 @@ groups ',' event struct list_head *list = $1; struct list_head *event = $3; + /* frees $3 */ parse_events_update_lists(event, list); $$ = list; }
@@ -182,8 +185,14 @@ group: group_def ':' PE_MODIFIER_EVENT { 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; } |
@@ -196,6 +205,7 @@ PE_NAME '{' events '}' inc_group_count(list, _parse_state); parse_events__set_leader($1, list, _parse_state); + free($1); $$ = list; } |
@@ -214,6 +224,7 @@ events ',' event struct list_head *event = $3; struct list_head *list = $1; + /* frees $3 */ parse_events_update_lists(event, list); $$ = list; }
@@ -226,13 +237,19 @@ event_mod: event_name PE_MODIFIER_EVENT { struct list_head *list = $1; + int err; /* * Apply modifier on all events added by single event definition * (there could be more events added for multiple tracepoint * 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; } |
@@ -241,8 +258,14 @@ event_name event_name: PE_EVENT_NAME event_def { - ABORT_ON(parse_events_name($2, $1)); + int err; + + err = parse_events_name($2, $1); free($1); + if (err) { + free_list_evsel($2); + YYABORT; + } $$ = $2; } |
@@ -262,23 +285,33 @@ PE_NAME opt_pmu_config { struct parse_events_state *parse_state = _parse_state; 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)) - YYABORT; + CLEANUP_YYABORT; if (error) error->idx = @1.first_column; list = alloc_list(); - ABORT_ON(!list); + if (!list) + CLEANUP_YYABORT; if (parse_events_add_pmu(_parse_state, list, $1, $2, false, false)) { struct perf_pmu *pmu = NULL; int ok = 0; - char *pattern; if (asprintf(&pattern, "%s*", $1) < 0) - YYABORT; + CLEANUP_YYABORT; while ((pmu = perf_pmu__scan(pmu)) != NULL) { char *name = pmu->name;
@@ -287,31 +320,32 @@ PE_NAME opt_pmu_config strncmp($1, "uncore_", 7)) name += 7; if (!fnmatch(pattern, name, 0)) { - if (parse_events_copy_term_list(orig_terms, &terms)) { - free(pattern); - YYABORT; - } + if (parse_events_copy_term_list(orig_terms, &terms)) + CLEANUP_YYABORT; if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, true, false)) ok++; parse_events_terms__delete(terms); } } - free(pattern); - if (!ok) - YYABORT; + CLEANUP_YYABORT; } parse_events_terms__delete($2); parse_events_terms__delete(orig_terms); + free($1); $$ = list; +#undef CLEANUP_YYABORT } | PE_KERNEL_PMU_EVENT sep_dc { 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; $$ = list; }
@@ -322,6 +356,8 @@ PE_PMU_EVENT_PRE '-' PE_PMU_EVENT_SUF sep_dc char pmu_name[128]; snprintf(&pmu_name, 128, "%s-%s", $1, $3); + free($1); + free($3); if (parse_events_multi_pmu_add(_parse_state, pmu_name, &list) < 0) YYABORT; $$ = list;
@@ -338,11 +374,16 @@ value_sym '/' event_config '/' struct list_head *list; int type = $1 >> 16; int config = $1 & 255; + int err; list = alloc_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); + if (err) { + free_list_evsel(list); + YYABORT; + } $$ = 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_error *error = parse_state->error; struct list_head *list; + int err; list = alloc_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); + free($1); + free($3); + free($5); + if (err) { + free_list_evsel(list); + YYABORT; + } $$ = 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_error *error = parse_state->error; struct list_head *list; + int err; list = alloc_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); + free($1); + free($3); + if (err) { + free_list_evsel(list); + YYABORT; + } $$ = list; } |
@@ -400,11 +456,17 @@ PE_NAME_CACHE_TYPE opt_event_config struct parse_events_state *parse_state = _parse_state; struct parse_events_error *error = parse_state->error; struct list_head *list; + int err; list = alloc_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); + free($1); + if (err) { + free_list_evsel(list); + YYABORT; + } $$ = 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 list_head *list; + int err; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, $6, $4)); + err = parse_events_add_breakpoint(list, &parse_state->idx, + (void *) $2, $6, $4); + free($6); + if (err) { + free(list); + YYABORT; + } $$ = list; } |
@@ -428,8 +496,11 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, NULL, $4)); + if (parse_events_add_breakpoint(list, &parse_state->idx, + (void *) $2, NULL, $4)) { + free(list); + YYABORT; + } $$ = list; } |
@@ -437,11 +508,17 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc { struct parse_events_state *parse_state = _parse_state; struct list_head *list; + int err; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, $4, 0)); + err = parse_events_add_breakpoint(list, &parse_state->idx, + (void *) $2, $4, 0); + free($4); + if (err) { + free(list); + YYABORT; + } $$ = list; } |
@@ -452,8 +529,11 @@ PE_PREFIX_MEM PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, NULL, 0)); + if (parse_events_add_breakpoint(list, &parse_state->idx, + (void *) $2, NULL, 0)) { + free(list); + YYABORT; + } $$ = list; }
@@ -463,29 +543,35 @@ tracepoint_name opt_event_config struct parse_events_state *parse_state = _parse_state; struct parse_events_error *error = parse_state->error; struct list_head *list; + int err; list = alloc_list(); ABORT_ON(!list); if (error) error->idx = @1.first_column; - if (parse_events_add_tracepoint(list, &parse_state->idx, $1.sys, $1.event, - error, $2)) - return -1; + err = parse_events_add_tracepoint(list, &parse_state->idx, $1.sys, $1.event, + error, $2); + parse_events_terms__delete($2); + free($1.sys); + free($1.event); + if (err) { + free(list); + return -1; + } $$ = list; } tracepoint_name: PE_NAME '-' PE_NAME ':' PE_NAME { - char sys_name[128]; struct tracepoint_name tracepoint; - snprintf(&sys_name, 128, "%s-%s", $1, $3); - tracepoint.sys = &sys_name; + ABORT_ON(asprintf(&tracepoint.sys, "%s-%s", $1, $3) < 0); tracepoint.event = $5; - + free($1); + free($3); $$ = tracepoint; } |
@@ -500,11 +586,16 @@ event_legacy_numeric: PE_VALUE ':' PE_VALUE opt_event_config { struct list_head *list; + int err; list = alloc_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); + if (err) { + free(list); + YYABORT; + } $$ = list; }
@@ -512,11 +603,16 @@ event_legacy_raw: PE_RAW opt_event_config { struct list_head *list; + int err; list = alloc_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); + if (err) { + free(list); + YYABORT; + } $$ = list; }
@@ -525,22 +621,33 @@ PE_BPF_OBJECT opt_event_config { struct parse_events_state *parse_state = _parse_state; struct list_head *list; + int err; list = alloc_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); + free($1); + if (err) { + free(list); + YYABORT; + } $$ = list; } | PE_BPF_SOURCE opt_event_config { struct list_head *list; + int err; list = alloc_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); + if (err) { + free(list); + YYABORT; + } $$ = list; }
@@ -573,6 +680,10 @@ opt_pmu_config: start_terms: event_config { struct parse_events_state *parse_state = _parse_state; + if (parse_state->terms) { + parse_events_terms__delete ($1); + YYABORT; + } parse_state->terms = $1; }
@@ -582,7 +693,10 @@ event_config ',' event_term struct list_head *head = $1; struct parse_events_term *term = $3; - ABORT_ON(!head); + if (!head) { + free_term(term); + YYABORT; + } list_add_tail(&term->list, head); $$ = $1; }
@@ -603,8 +717,12 @@ PE_NAME '=' PE_NAME { struct parse_events_term *term; - ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, $3, &@1, &@3)); + if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, + $1, $3, &@1, &@3)) { + free($1); + free($3); + YYABORT; + } $$ = term; } |
@@ -612,8 +730,11 @@ PE_NAME '=' PE_VALUE { struct parse_events_term *term; - ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, $3, false, &@1, &@3)); + if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, + $1, $3, false, &@1, &@3)) { + free($1); + YYABORT; + } $$ = term; } |
@@ -622,7 +743,10 @@ PE_NAME '=' PE_VALUE_SYM_HW struct parse_events_term *term; 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; } |
@@ -630,8 +754,11 @@ PE_NAME { struct parse_events_term *term; - ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, 1, true, &@1, NULL)); + if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, + $1, 1, true, &@1, NULL)) { + free($1); + YYABORT; + } $$ = term; } |
@@ -648,7 +775,10 @@ PE_TERM '=' PE_NAME { 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; } |
@@ -672,9 +802,13 @@ PE_NAME array '=' PE_NAME { struct parse_events_term *term; - ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, $4, &@1, &@4)); - + if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, + $1, $4, &@1, &@4)) { + free($1); + free($4); + free($2.ranges); + YYABORT; + } term->array = $2; $$ = term; }
@@ -683,8 +817,12 @@ PE_NAME array '=' PE_VALUE { struct parse_events_term *term; - ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, $4, false, &@1, &@4)); + if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, + $1, $4, false, &@1, &@4)) { + free($1); + free($2.ranges); + YYABORT; + } term->array = $2; $$ = term; }
@@ -695,8 +833,12 @@ PE_DRV_CFG_TERM char *config = strdup($1); ABORT_ON(!config); - ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, - config, $1, &@1, NULL)); + if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, + config, $1, &@1, NULL)) { + free($1); + free(config); + YYABORT; + } $$ = term; }
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
Ian Rogers
reviewerPATCH v6 8/10 perf tools: if pmu configuration fails free terms
In reply to Ian RogersAvoid a memory leak when the configuration fails.
--- tools/perf/util/parse-events.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
tools/perf/util/parse-events.c +8 -1
@@ -1388,8 +1388,15 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,if (get_config_terms (head_config, &config_terms))return -ENOMEM ; -if (perf_pmu__config (pmu, &attr, head_config, parse_state->error)) +if (perf_pmu__config (pmu, &attr, head_config, parse_state->error)) { +struct perf_evsel_config_term *pos, *tmp; + +list_for_each_entry_safe (pos, tmp, &config_terms, list) { +list_del_init (&pos->list); +free (pos); + }return -EINVAL ; + } evsel = __add_event(list, &parse_state->idx, &attr, get_config_name(head_config), pmu,
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
Ian Rogers
reviewerPATCH v6 9/10 perf tools: add a deep delete for parse event terms
In reply to Ian RogersAdd a parse_events_term deep delete function so that owned strings and arrays are freed.
--- tools/perf/util/parse-events.c | 16 +++++++++++++--- tools/perf/util/parse-events.h | 1 + tools/perf/util/parse-events.y | 12 ++---------- tools/perf/util/pmu.c | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-)
tools/perf/util/parse-events.c +13 -3
@@ -2812,6 +2812,18 @@ int parse_events_term__clone(struct parse_events_term **new,return new_term (new, &temp, str,0 ); } +void parse_events_term__delete (struct parse_events_term *term) +{ +if (term->array.nr_ranges) +zfree (&term->array.ranges); + +if (term->type_val !=PARSE_EVENTS__TERM_TYPE_NUM ) +zfree (&term->val.str); + +zfree (&term->config); +free (term); +} +int parse_events_copy_term_list (struct list_head *old,struct list_head **new) {
@@ -2842,10 +2854,8 @@ void parse_events_terms__purge(struct list_head *terms)struct parse_events_term *term, *h;list_for_each_entry_safe (term, h, terms, list) { -if (term->array.nr_ranges) -zfree (&term->array.ranges);list_del_init (&term->list); -free (term); +parse_events_term__delete (term); } }
tools/perf/util/parse-events.h +1 -0
@@ -139,6 +139,7 @@ int parse_events_term__sym_hw(struct parse_events_term **term, char *config, unsigned idx);int parse_events_term__clone (struct parse_events_term **new,struct parse_events_term *term); +void parse_events_term__delete (struct parse_events_term *term);void parse_events_terms__delete (struct list_head *terms);void parse_events_terms__purge (struct list_head *terms);void parse_events__clear_array (struct parse_events_array *a);
tools/perf/util/parse-events.y +2 -10
@@ -49,14 +49,6 @@ static void free_list_evsel(struct list_head* list_evsel) free(list_evsel); } -static void free_term(struct parse_events_term *term) -{ - if (term->type_val == PARSE_EVENTS__TERM_TYPE_STR) - free(term->val.str); - zfree(&term->array.ranges); - free(term); -} - static void inc_group_count(struct list_head *list, struct parse_events_state *parse_state) {
@@ -99,7 +91,7 @@ static void inc_group_count(struct list_head *list, %type <str> PE_DRV_CFG_TERM %destructor { free ($$); } <str> %type <term> event_term -%destructor { free_term ($$); } <term> +%destructor { parse_events_term__delete ($$); } <term> %type <list_terms> event_config %type <list_terms> opt_event_config %type <list_terms> opt_pmu_config
@@ -694,7 +686,7 @@ event_config ',' event_term struct parse_events_term *term = $3; if (!head) { - free_term(term); + parse_events_term__delete(term); YYABORT; } list_add_tail(&term->list, head);
tools/perf/util/pmu.c +1 -1
@@ -1260,7 +1260,7 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms, info->metric_name = alias->metric_name;list_del_init (&term->list); -free (term); +parse_events_term__delete (term); }/*
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
Ian Rogers
reviewerPATCH v6 10/10 perf tools: report initial event parsing error
In reply to Ian RogersRecord the first event parsing error and report. Implementing feedback from Jiri Olsa:
https://lkml.org/lkml/2019/10/28/680
An example error is:
$ tools/perf/perf stat -e c/c/
WARNING: multiple event parsing errors
event syntax error: 'c/c/'
\___ unknown termvalid terms: event,filter_rem,filter_opc0,edge,filter_isoc,filter_tid,filter_loc,filter_nc,inv,umask,filter_opc1,tid_en,thresh,filter_all_op,filter_not_nm,filter_state,filter_nm,config,config1,config2,name,period,percore
Initial error:
event syntax error: 'c/c/'
\___ Cannot find PMU `c'. Missing kernel support?
Run 'perf list' for a list of valid events
Usage: perf stat [<options>] [<command>]
-e, --event <event> event selector. use 'perf list' to list available events
--- tools/perf/arch/powerpc/util/kvm-stat.c | 9 ++- tools/perf/builtin-stat.c | 2 + tools/perf/builtin-trace.c | 16 ++++-- tools/perf/tests/parse-events.c | 3 +- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/parse-events.c | 76 ++++++++++++++++++------- tools/perf/util/parse-events.h | 4 ++ 7 files changed, 84 insertions(+), 28 deletions(-)
tools/perf/arch/powerpc/util/kvm-stat.c +7 -2
@@ -113,10 +113,15 @@ static int is_tracepoint_available(const char *str, struct evlist *evlist)struct parse_events_error err;int ret; - err.str =NULL ; +bzero (&err,sizeof (err)); ret =parse_events (evlist, str, &err); -if (err.str) +if (err.str) {pr_err ("%s : %s\n" , str, err.str); +free (&err->str); +free (&err->help); +free (&err->first_str); +free (&err->first_help); + }return ret; }
tools/perf/builtin-stat.c +2 -0
@@ -1260,6 +1260,7 @@ static int add_default_attributes(void)if (stat_config.null_run)return 0 ; +bzero (&errinfo,sizeof (errinfo));if (transaction_run) {/* Handle -T as -M transaction. Once platform specific metrics * support has been added to the json files, all archictures
@@ -1317,6 +1318,7 @@ static int add_default_attributes(void)return -1 ; }if (err) { +parse_events_print_error (&errinfo, smi_cost_attrs);fprintf (stderr,"Cannot set up SMI cost events\n" );return -1 ; }
tools/perf/builtin-trace.c +12 -4
@@ -3016,11 +3016,18 @@ static bool evlist__add_vfs_getname(struct evlist *evlist) {bool found = false;struct evsel *evsel, *tmp; -struct parse_events_error err = { .idx =0 , }; -int ret =parse_events (evlist,"probe:vfs_getname*" , &err); +struct parse_events_error err; +int ret; -if (ret) +bzero (&err,sizeof (err)); + ret =parse_events (evlist,"probe:vfs_getname*" , &err); +if (ret) { +free (err.str); +free (err.help); +free (err.first_str); +free (err.first_help);return false; + }evlist__for_each_entry_safe (evlist, evsel, tmp) {if (!strstarts (perf_evsel__name (evsel),"probe:vfs_getname" ))
@@ -4832,8 +4839,9 @@ int cmd_trace(int argc, const char **argv)* wrong in more detail. */ if (trace.perfconfig_events !=NULL ) { -struct parse_events_error parse_err = { .idx =0 , }; +struct parse_events_error parse_err; +bzero (&parse_err,sizeof (parse_err)); err =parse_events (trace.evlist, trace.perfconfig_events, &parse_err);if (err) {parse_events_print_error (&parse_err, trace.perfconfig_events);
tools/perf/tests/parse-events.c +2 -1
@@ -1768,10 +1768,11 @@ static struct terms_test test__terms[] = {static int test_event (struct evlist_test *e) { -struct parse_events_error err = { .idx =0 , }; +struct parse_events_error err;struct evlist *evlist;int ret; +bzero (&err,sizeof (err));if (e->valid && !e->valid ()) {pr_debug ("... SKIP" );return 0 ;
tools/perf/util/metricgroup.c +1 -1
@@ -523,7 +523,7 @@ int metricgroup__parse_groups(const struct option *opt,if (ret)return ret;pr_debug ("adding %s\n" , extra_events.buf); -memset (&parse_error,0 ,sizeof (struct parse_events_error )); +bzero (&parse_error,sizeof (parse_error)); ret =parse_events (perf_evlist, extra_events.buf, &parse_error);if (ret) {parse_events_print_error (&parse_error, extra_events.buf);
tools/perf/util/parse-events.c +56 -20
115 lines not on this page · raw message
tools/perf/util/parse-events.h +4 -0
@@ -110,9 +110,13 @@ struct parse_events_term { };struct parse_events_error { +int num_errors;/* number of errors encountered */ int idx;/* index in the parsed string */ char *str;/* string to display at the index */ char *help;/* optional help string */ +int first_idx;/* as above, but for the first encountered error */ +char *first_str; +char *first_help; };struct parse_events_state {
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
Re: [PATCH v6 00/10] Improvements to memory usage by parse events
In reply to Ian RogersEm Thu, Nov 07, 2019 at 02:14:18PM -0800, Ian Rogers escreveu:
Quoted 5 lines
The parse events parser leaks memory for certain expressions as well as allowing a char* to reference stack, heap or .rodata. This series of patches improves the hygeine and adds free-ing operations to reclaim memory in the parser in error and non-error situations.
Quoted 7 lines
The series of patches was generated with LLVM's address sanitizer and libFuzzer:
https://llvm.org/docs/LibFuzzer.html
called on theparse_eventsfunction with randomly generated input. With the patches no leaks or memory corruption issues were present.The v6 patches address a C90 compilation issue.
Please take a look at what is in my perf/core branch, to see what is left, if something needs fixing, please send a patch on top of that,
Thanks,
- Arnaldo
Quoted 42 lines
The v5 patches add initial error print to the set, as requested by Jiri Olsa. They also fix additional 2 missed frees in the patch 'before yyabort-ing free components' and remove a redundant
new_strvariable from the patch 'add parse events handle error' as spotted by Stephane Eranian.The v4 patches address review comments from Jiri Olsa, turning a long error message into a single warning, fixing the data type in a list iterator and reordering patches.
The v3 patches address review comments from Jiri Olsa improving commit messages, handling ENOMEM errors from strdup better, and removing a printed warning if an invalid event is passed.
The v2 patches are preferable to an earlier proposed patch:
perf tools: avoid reading out of scope arrayIan Rogers (10):
perf tools: add parse events handle error perf tools: moveALLOC_LISTinto a function perf tools: avoid a malloc for array events perf tools: splice events onto evlist even on error perf tools: ensure config and str in terms are unique perf tools: add destructors for parse event terms perf tools: before yyabort-ing free components perf tools: if pmu configuration fails free terms perf tools: add a deep delete for parse event terms perf tools: report initial event parsing errortools/perf/arch/powerpc/util/kvm-stat.c | 9 +- tools/perf/builtin-stat.c | 2 + tools/perf/builtin-trace.c | 16 +- tools/perf/tests/parse-events.c | 3 +- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/parse-events.c | 239 +++++++++++---- tools/perf/util/parse-events.h | 7 + tools/perf/util/parse-events.y | 390 +++++++++++++++++------- tools/perf/util/pmu.c | 32 +- 9 files changed, 511 insertions(+), 189 deletions(-)Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
Signature · 1 line
- Arnaldo
Ian Rogers
reviewerPATCH 1/1 perf tools: report initial event parsing error
Record the first event parsing error and report. Implementing feedback from Jiri Olsa:
https://lkml.org/lkml/2019/10/28/680
An example error is:
$ tools/perf/perf stat -e c/c/
WARNING: multiple event parsing errors
event syntax error: 'c/c/'
\___ unknown termvalid terms: event,filter_rem,filter_opc0,edge,filter_isoc,filter_tid,filter_loc,filter_nc,inv,umask,filter_opc1,tid_en,thresh,filter_all_op,filter_not_nm,filter_state,filter_nm,config,config1,config2,name,period,percore
Initial error:
event syntax error: 'c/c/'
\___ Cannot find PMU `c'. Missing kernel support?
Run 'perf list' for a list of valid events
Usage: perf stat [<options>] [<command>]
-e, --event <event> event selector. use 'perf list' to list available events
--- tools/perf/arch/powerpc/util/kvm-stat.c | 9 ++- tools/perf/builtin-stat.c | 2 + tools/perf/builtin-trace.c | 16 ++++-- tools/perf/tests/parse-events.c | 3 +- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/parse-events.c | 76 ++++++++++++++++++------- tools/perf/util/parse-events.h | 4 ++ 7 files changed, 84 insertions(+), 28 deletions(-)
tools/perf/arch/powerpc/util/kvm-stat.c +7 -2
@@ -113,10 +113,15 @@ static int is_tracepoint_available(const char *str, struct evlist *evlist)struct parse_events_error err;int ret; - err.str =NULL ; +bzero (&err,sizeof (err)); ret =parse_events (evlist, str, &err); -if (err.str) +if (err.str) {pr_err ("%s : %s\n" , str, err.str); +free (&err->str); +free (&err->help); +free (&err->first_str); +free (&err->first_help); + }return ret; }
tools/perf/builtin-stat.c +2 -0
@@ -1307,6 +1307,7 @@ static int add_default_attributes(void)if (stat_config.null_run)return 0 ; +bzero (&errinfo,sizeof (errinfo));if (transaction_run) {/* Handle -T as -M transaction. Once platform specific metrics * support has been added to the json files, all archictures
@@ -1364,6 +1365,7 @@ static int add_default_attributes(void)return -1 ; }if (err) { +parse_events_print_error (&errinfo, smi_cost_attrs);fprintf (stderr,"Cannot set up SMI cost events\n" );return -1 ; }
tools/perf/builtin-trace.c +12 -4
@@ -3016,11 +3016,18 @@ static bool evlist__add_vfs_getname(struct evlist *evlist) {bool found = false;struct evsel *evsel, *tmp; -struct parse_events_error err = { .idx =0 , }; -int ret =parse_events (evlist,"probe:vfs_getname*" , &err); +struct parse_events_error err; +int ret; -if (ret) +bzero (&err,sizeof (err)); + ret =parse_events (evlist,"probe:vfs_getname*" , &err); +if (ret) { +free (err.str); +free (err.help); +free (err.first_str); +free (err.first_help);return false; + }evlist__for_each_entry_safe (evlist, evsel, tmp) {if (!strstarts (perf_evsel__name (evsel),"probe:vfs_getname" ))
@@ -4832,8 +4839,9 @@ int cmd_trace(int argc, const char **argv)* wrong in more detail. */ if (trace.perfconfig_events !=NULL ) { -struct parse_events_error parse_err = { .idx =0 , }; +struct parse_events_error parse_err; +bzero (&parse_err,sizeof (parse_err)); err =parse_events (trace.evlist, trace.perfconfig_events, &parse_err);if (err) {parse_events_print_error (&parse_err, trace.perfconfig_events);
tools/perf/tests/parse-events.c +2 -1
@@ -1768,10 +1768,11 @@ static struct terms_test test__terms[] = {static int test_event (struct evlist_test *e) { -struct parse_events_error err = { .idx =0 , }; +struct parse_events_error err;struct evlist *evlist;int ret; +bzero (&err,sizeof (err));if (e->valid && !e->valid ()) {pr_debug ("... SKIP" );return 0 ;
tools/perf/util/metricgroup.c +1 -1
@@ -523,7 +523,7 @@ int metricgroup__parse_groups(const struct option *opt,if (ret)return ret;pr_debug ("adding %s\n" , extra_events.buf); -memset (&parse_error,0 ,sizeof (struct parse_events_error )); +bzero (&parse_error,sizeof (parse_error)); ret =parse_events (perf_evlist, extra_events.buf, &parse_error);if (ret) {parse_events_print_error (&parse_error, extra_events.buf);
tools/perf/util/parse-events.c +56 -20
115 lines not on this page · raw message
tools/perf/util/parse-events.h +4 -0
@@ -110,9 +110,13 @@ struct parse_events_term { };struct parse_events_error { +int num_errors;/* number of errors encountered */ int idx;/* index in the parsed string */ char *str;/* string to display at the index */ char *help;/* optional help string */ +int first_idx;/* as above, but for the first encountered error */ +char *first_str; +char *first_help; };struct parse_events_state {
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
Re: [PATCH] perf tools: report initial event parsing error
Em Fri, Nov 08, 2019 at 10:15:33AM -0800, Ian Rogers escreveu:
Quoted 13 lines
Record the first event parsing error and report. Implementing feedback from Jiri Olsa:
https://lkml.org/lkml/2019/10/28/680An example error is:
$ tools/perf/perf stat -e c/c/ WARNING: multiple event parsing errors event syntax error: 'c/c/' \___ unknown termvalid terms: event,filter_rem,filter_opc0,edge,filter_isoc,filter_tid,filter_loc,filter_nc,inv,umask,filter_opc1,tid_en,thresh,filter_all_op,filter_not_nm,filter_state,filter_nm,config,config1,config2,name,period,percore
Quoted 8 lines
Initial error:
event syntax error: 'c/c/'
\___ Cannot find PMU `c'. Missing kernel support?
Run 'perf list' for a list of valid eventsUsage: perf stat [<options>] [<command>]
-e, --event <event> event selector. use 'perf list' to list available events
Jiri, I couldn't find your Acked-by for this one, have you provided it?
- Arnaldo
Quoted 264 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/arch/powerpc/util/kvm-stat.c | 9 ++- tools/perf/builtin-stat.c | 2 + tools/perf/builtin-trace.c | 16 ++++-- tools/perf/tests/parse-events.c | 3 +- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/parse-events.c | 76 ++++++++++++++++++------- tools/perf/util/parse-events.h | 4 ++ 7 files changed, 84 insertions(+), 28 deletions(-)tools/perf/arch/powerpc/util/kvm-stat.c +7
-2@@ -113,10 +113,15 @@ static int is_tracepoint_available(const char *str, struct evlist *evlist)struct parse_events_error err;int ret; - err.str =NULL ; +bzero (&err,sizeof (err)); ret =parse_events (evlist, str, &err); -if (err.str) +if (err.str) {pr_err ("%s : %s\n" , str, err.str); +free (&err->str); +free (&err->help); +free (&err->first_str); +free (&err->first_help); + }return ret; }tools/perf/builtin-stat.c +2
-0@@ -1307,6 +1307,7 @@ static int add_default_attributes(void)if (stat_config.null_run)return 0 ; +bzero (&errinfo,sizeof (errinfo));if (transaction_run) {/* Handle -T as -M transaction. Once platform specific metrics * support has been added to the json files, all archictures @@ -1364,6 +1365,7 @@ static int add_default_attributes(void)return -1 ; }if (err) { +parse_events_print_error (&errinfo, smi_cost_attrs);fprintf (stderr,"Cannot set up SMI cost events\n" );return -1 ; }tools/perf/builtin-trace.c +12
-4@@ -3016,11 +3016,18 @@ static bool evlist__add_vfs_getname(struct evlist *evlist) {bool found = false;struct evsel *evsel, *tmp; -struct parse_events_error err = { .idx =0 , }; -int ret =parse_events (evlist,"probe:vfs_getname*" , &err); +struct parse_events_error err; +int ret; -if (ret) +bzero (&err,sizeof (err)); + ret =parse_events (evlist,"probe:vfs_getname*" , &err); +if (ret) { +free (err.str); +free (err.help); +free (err.first_str); +free (err.first_help);return false; + }evlist__for_each_entry_safe (evlist, evsel, tmp) {if (!strstarts (perf_evsel__name (evsel),"probe:vfs_getname" ))@@ -4832,8 +4839,9 @@ int cmd_trace(int argc, const char **argv)* wrong in more detail. */ if (trace.perfconfig_events !=NULL ) { -struct parse_events_error parse_err = { .idx =0 , }; +struct parse_events_error parse_err; +bzero (&parse_err,sizeof (parse_err)); err =parse_events (trace.evlist, trace.perfconfig_events, &parse_err);if (err) {parse_events_print_error (&parse_err, trace.perfconfig_events);tools/perf/tests/parse-events.c +2
-1@@ -1768,10 +1768,11 @@ static struct terms_test test__terms[] = {static int test_event (struct evlist_test *e) { -struct parse_events_error err = { .idx =0 , }; +struct parse_events_error err;struct evlist *evlist;int ret; +bzero (&err,sizeof (err));if (e->valid && !e->valid ()) {pr_debug ("... SKIP" );return 0 ;tools/perf/util/metricgroup.c +1
-1@@ -523,7 +523,7 @@ int metricgroup__parse_groups(const struct option *opt,if (ret)return ret;pr_debug ("adding %s\n" , extra_events.buf); -memset (&parse_error,0 ,sizeof (struct parse_events_error )); +bzero (&parse_error,sizeof (parse_error)); ret =parse_events (perf_evlist, extra_events.buf, &parse_error);if (ret) {parse_events_print_error (&parse_error, extra_events.buf);tools/perf/util/parse-events.c +56
-20@@ -189,12 +189,29 @@ void parse_events__handle_error(struct parse_events_error *err, int idx,free (help);return ; } -WARN_ONCE (err->str,"WARNING: multiple event parsing errors\n" ); - err->idx = idx; -free (err->str); - err->str = str; -free (err->help); - err->help = help; +switch (err->num_errors) { +case 0 : + err->idx = idx; + err->str = str; + err->help = help; +break ; +case 1 : + err->first_idx = err->idx; + err->idx = idx; + err->first_str = err->str; + err->str = str; + err->first_help = err->help; + err->help = help; +break ; +default : +WARN_ONCE (1 ,"WARNING: multiple event parsing errors\n" ); +free (err->str); + err->str = str; +free (err->help); + err->help = help; +break ; + } + err->num_errors++; }struct tracepoint_path *tracepoint_id_to_path (u64 config)@@ -2007,15 +2024,14 @@ static int get_term_width(void)return ws.ws_col >MAX_WIDTH ?MAX_WIDTH : ws.ws_col; } -void parse_events_print_error (struct parse_events_error *err, -const char *event) +static void __parse_events_print_error (int err_idx,const char *err_str, +const char *err_help,const char *event) {const char *str ="invalid or unsupported event: " ;char _buf[MAX_WIDTH ];char *buf = (char *) event;int idx =0 ; - -if (err->str) { +if (err_str) {/* -2 for extra '' in the final fprintf */ int width =get_term_width () -2 ;int len_event =strlen (event);@@ -2038,8 +2054,8 @@ void parse_events_print_error(struct parse_events_error *err, buf = _buf;/* We're cutting from the beginning. */ -if (err->idx > max_err_idx) - cut = err->idx - max_err_idx; +if (err_idx > max_err_idx) + cut = err_idx - max_err_idx;strncpy (buf, event + cut, max_len);@@ -2052,16 +2068,33 @@ void parse_events_print_error(struct parse_events_error *err, buf[max_len] =0 ; } - idx = len_str + err->idx - cut; + idx = len_str + err_idx - cut; }fprintf (stderr,"%s'%s'\n" , str, buf);if (idx) { -fprintf (stderr,"%*s\\___ %s\n" , idx +1 ,"" , err->str); -if (err->help) -fprintf (stderr,"\n%s\n" , err->help); -zfree (&err->str); -zfree (&err->help); +fprintf (stderr,"%*s\\___ %s\n" , idx +1 ,"" , err_str); +if (err_help) +fprintf (stderr,"\n%s\n" , err_help); + } +} + +void parse_events_print_error (struct parse_events_error *err, +const char *event) +{ +if (!err->num_errors) +return ; + +__parse_events_print_error (err->idx, err->str, err->help, event); +zfree (&err->str); +zfree (&err->help); + +if (err->num_errors >1 ) { +fputs ("\nInitial error:\n" , stderr); +__parse_events_print_error (err->first_idx, err->first_str, + err->first_help, event); +zfree (&err->first_str); +zfree (&err->first_help); } }@@ -2071,8 +2104,11 @@ int parse_events_option(const struct option *opt, const char *str, int unset __maybe_unused) {struct evlist *evlist = *(struct evlist **)opt->value; -struct parse_events_error err = { .idx =0 , }; -int ret =parse_events (evlist, str, &err); +struct parse_events_error err; +int ret; + +bzero (&err,sizeof (err)); + ret =parse_events (evlist, str, &err);if (ret) {parse_events_print_error (&err, str);tools/perf/util/parse-events.h +4
-0@@ -110,9 +110,13 @@ struct parse_events_term { };struct parse_events_error { +int num_errors;/* number of errors encountered */ int idx;/* index in the parsed string */ char *str;/* string to display at the index */ char *help;/* optional help string */ +int first_idx;/* as above, but for the first encountered error */ +char *first_str; +char *first_help; };struct parse_events_state {Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
Signature · 1 line
- Arnaldo
Re: [PATCH] perf tools: report initial event parsing error
In reply to Ian RogersOn Fri, Nov 08, 2019 at 10:15:33AM -0800, Ian Rogers wrote:
SNIP
Quoted 5 lines
tools/perf/builtin-trace.c +0
-0
tools/perf/builtin-trace.c static bool evlist__add_vfs_getname(struct evlist *evlist) · line 3022
Quoted 10 lines
tools/perf/builtin-trace.c +3
-3@@ -3016,11 +3016,18 @@ static bool evlist__add_vfs_getname(struct evlist *evlist) {bool found = false;struct evsel *evsel, *tmp; -struct parse_events_error err = { .idx =0 , }; -int ret =parse_events (evlist,"probe:vfs_getname*" , &err); +struct parse_events_error err; +int ret; -if (ret) +bzero (&err,sizeof (err));
hum, what's the problem with the zero init above?
jirka
Ian Rogers
reviewerRe: [PATCH] perf tools: report initial event parsing error
Quoted 18 lines · Jiri Olsa
On Fri, Nov 08, 2019 at 10:15:33AM -0800, Ian Rogers wrote:
SNIP
Quoted 13 lines
tools/perf/builtin-trace.c +2
-2@@ -3016,11 +3016,18 @@ static bool evlist__add_vfs_getname(struct evlist *evlist) {bool found = false;struct evsel *evsel, *tmp; -struct parse_events_error err = { .idx =0 , }; -int ret =parse_events (evlist,"probe:vfs_getname*" , &err); +struct parse_events_error err; +int ret;
Quoted 4 lines
tools/perf/builtin-trace.c static bool evlist__add_vfs_getname(struct evlist *evlist) · line 3022
Quoted 2 lines
tools/perf/builtin-trace.c +1
-1-if (ret) +bzero (&err,sizeof (err));hum, what's the problem with the zero init above?
There are 3 patterns for initializing parse_events_error in the code, bzero, memset and {.idx =0,}. I made all instances use bzero for consistency.
Thanks,
Ian
Quoted 2 lines
jirka
Re: [PATCH] perf tools: report initial event parsing error
In reply to Ian RogersQuoted 11 lines · Ian Rogers
Record the first event parsing error and report. Implementing feedback from Jiri Olsa:
https://lkml.org/lkml/2019/10/28/680An example error is:
$ tools/perf/perf stat -e c/c/ WARNING: multiple event parsing errors event syntax error: 'c/c/' \___ unknown term
Quoted 5 lines
valid terms: event,filter_rem,filter_opc0,edge,filter_isoc,filter_tid,filter_loc,filter_nc,inv,umask,filter_opc1,tid_en,thresh,filter_all_op,filter_not_nm,filter_state,filter_nm,config,config1,config2,name,period,percore
Initial error:
event syntax error: 'c/c/'
\___ Cannot find PMU `c'. Missing kernel support?
not sure where this got lost or if it was there before, but the index should point to zero to have the 'arrow' aligned
jirka
---
tools/perf/util/parse-events.c +1 -1
@@ -1366,7 +1366,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,if (asprintf (&err_str,"Cannot find PMU `%s'. Missing kernel support?" , name) >=0 ) -parse_events__handle_error (err,-1 , err_str,NULL ); +parse_events__handle_error (err,0 , err_str,NULL );return -EINVAL ; }
Ian Rogers
reviewerRe: [PATCH] perf tools: report initial event parsing error
Quoted 13 lines · Jiri Olsa
Quoted 11 lines · Ian Rogers
Record the first event parsing error and report. Implementing feedback from Jiri Olsa:
https://lkml.org/lkml/2019/10/28/680An example error is:
$ tools/perf/perf stat -e c/c/ WARNING: multiple event parsing errors event syntax error: 'c/c/' \___ unknown term
Quoted 8 lines
Quoted 5 lines
valid terms: event,filter_rem,filter_opc0,edge,filter_isoc,filter_tid,filter_loc,filter_nc,inv,umask,filter_opc1,tid_en,thresh,filter_all_op,filter_not_nm,filter_state,filter_nm,config,config1,config2,name,period,percore
Initial error:
event syntax error: 'c/c/'
\___ Cannot find PMU `c'. Missing kernel support?not sure where this got lost or if it was there before, but the index should point to zero to have the 'arrow' aligned
This happened in:448d732cefb3 perf parse: Add parse events handle error When the code wasn't clear on the value of idx it was set to -1. Fixed in v2 but perhaps there are other instances from 448d732cefb3 that should be addressed.
Thanks,
Ian
Quoted 18 lines
jirka
---
tools/perf/util/parse-events.c +1
-1@@ -1366,7 +1366,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,if (asprintf (&err_str,"Cannot find PMU `%s'. Missing kernel support?" , name) >=0 ) -parse_events__handle_error (err,-1 , err_str,NULL ); +parse_events__handle_error (err,0 , err_str,NULL );return -EINVAL ; }
Re: [PATCH] perf tools: report initial event parsing error
In reply to Ian RogersQuoted 41 lines · Ian Rogers
Record the first event parsing error and report. Implementing feedback from Jiri Olsa:
https://lkml.org/lkml/2019/10/28/680An example error is:
$ tools/perf/perf stat -e c/c/ WARNING: multiple event parsing errors event syntax error: 'c/c/' \___ unknown termvalid terms: event,filter_rem,filter_opc0,edge,filter_isoc,filter_tid,filter_loc,filter_nc,inv,umask,filter_opc1,tid_en,thresh,filter_all_op,filter_not_nm,filter_state,filter_nm,config,config1,config2,name,period,percore
Initial error:
event syntax error: 'c/c/'
\___ Cannot find PMU `c'. Missing kernel support?
Run 'perf list' for a list of valid eventsUsage: perf stat [<options>] [<command>]
-e, --event <event> event selector. use 'perf list' to list available events
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/arch/powerpc/util/kvm-stat.c | 9 ++- tools/perf/builtin-stat.c | 2 + tools/perf/builtin-trace.c | 16 ++++-- tools/perf/tests/parse-events.c | 3 +- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/parse-events.c | 76 ++++++++++++++++++------- tools/perf/util/parse-events.h | 4 ++ 7 files changed, 84 insertions(+), 28 deletions(-)tools/perf/arch/powerpc/util/kvm-stat.c +0
-0@@ -113,10 +113,15 @@ static int is_tracepoint_available(const char *str, struct evlist *evlist)struct parse_events_error err;int ret;
tools/perf/arch/powerpc/util/kvm-stat.c static int is_tracepoint_available(const char *str, struct evlist *evlist) · line 123
Quoted 10 lines
tools/perf/arch/powerpc/util/kvm-stat.c +6
-2- err.str =NULL ; +bzero (&err,sizeof (err)); ret =parse_events (evlist, str, &err); -if (err.str) +if (err.str) {pr_err ("%s : %s\n" , str, err.str); +free (&err->str); +free (&err->help); +free (&err->first_str); +free (&err->first_help);
it's used in other places, so it's better to put it in parse_events_error__exit or such..
jirka
Ian Rogers
reviewerRe: [PATCH] perf tools: report initial event parsing error
Quoted 43 lines · Jiri Olsa
Quoted 41 lines · Ian Rogers
Record the first event parsing error and report. Implementing feedback from Jiri Olsa:
https://lkml.org/lkml/2019/10/28/680An example error is:
$ tools/perf/perf stat -e c/c/ WARNING: multiple event parsing errors event syntax error: 'c/c/' \___ unknown termvalid terms: event,filter_rem,filter_opc0,edge,filter_isoc,filter_tid,filter_loc,filter_nc,inv,umask,filter_opc1,tid_en,thresh,filter_all_op,filter_not_nm,filter_state,filter_nm,config,config1,config2,name,period,percore
Initial error:
event syntax error: 'c/c/'
\___ Cannot find PMU `c'. Missing kernel support?
Run 'perf list' for a list of valid eventsUsage: perf stat [<options>] [<command>]
-e, --event <event> event selector. use 'perf list' to list available events
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/arch/powerpc/util/kvm-stat.c | 9 ++- tools/perf/builtin-stat.c | 2 + tools/perf/builtin-trace.c | 16 ++++-- tools/perf/tests/parse-events.c | 3 +- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/parse-events.c | 76 ++++++++++++++++++------- tools/perf/util/parse-events.h | 4 ++ 7 files changed, 84 insertions(+), 28 deletions(-)tools/perf/arch/powerpc/util/kvm-stat.c +0
-0@@ -113,10 +113,15 @@ static int is_tracepoint_available(const char *str, struct evlist *evlist)struct parse_events_error err;int ret;
Quoted 13 lines
tools/perf/arch/powerpc/util/kvm-stat.c static int is_tracepoint_available(const char *str, struct evlist *evlist) · line 123
Quoted 10 lines
tools/perf/arch/powerpc/util/kvm-stat.c +6
-2- err.str =NULL ; +bzero (&err,sizeof (err)); ret =parse_events (evlist, str, &err); -if (err.str) +if (err.str) {pr_err ("%s : %s\n" , str, err.str); +free (&err->str); +free (&err->help); +free (&err->first_str); +free (&err->first_help);it's used in other places, so it's better to put it in
parse_events_error__exitor such..
Done, using parse_events_print_error like other callers. This may affect the output on error.
Thanks,
Ian
Quoted 2 lines
jirka
Ian Rogers
reviewerPATCH v2 1/1 perf tools: report initial event parsing error
In reply to Ian RogersRecord the first event parsing error and report. Implementing feedback from Jiri Olsa:
https://lkml.org/lkml/2019/10/28/680
An example error is:
$ tools/perf/perf stat -e c/c/
WARNING: multiple event parsing errors
event syntax error: 'c/c/'
\___ unknown termvalid terms: event,filter_rem,filter_opc0,edge,filter_isoc,filter_tid,filter_loc,filter_nc,inv,umask,filter_opc1,tid_en,thresh,filter_all_op,filter_not_nm,filter_state,filter_nm,config,config1,config2,name,period,percore
Initial error:
event syntax error: 'c/c/'
\___ Cannot find PMU `c'. Missing kernel support?
Run 'perf list' for a list of valid events
Usage: perf stat [<options>] [<command>]
-e, --event <event> event selector. use 'perf list' to list available events
--- tools/perf/arch/powerpc/util/kvm-stat.c | 4 +- tools/perf/builtin-stat.c | 2 + tools/perf/builtin-trace.c | 16 +++-- tools/perf/tests/parse-events.c | 3 +- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/parse-events.c | 78 ++++++++++++++++++------- tools/perf/util/parse-events.h | 4 ++ 7 files changed, 80 insertions(+), 29 deletions(-)
tools/perf/arch/powerpc/util/kvm-stat.c +2 -2
@@ -113,10 +113,10 @@ static int is_tracepoint_available(const char *str, struct evlist *evlist)struct parse_events_error err;int ret; - err.str =NULL ; +bzero (&err,sizeof (err)); ret =parse_events (evlist, str, &err);if (err.str) -pr_err ("%s : %s\n" , str, err.str); +parse_events_print_error (&err,"tracepoint" );return ret; }
tools/perf/builtin-stat.c +2 -0
@@ -1307,6 +1307,7 @@ static int add_default_attributes(void)if (stat_config.null_run)return 0 ; +bzero (&errinfo,sizeof (errinfo));if (transaction_run) {/* Handle -T as -M transaction. Once platform specific metrics * support has been added to the json files, all archictures
@@ -1364,6 +1365,7 @@ static int add_default_attributes(void)return -1 ; }if (err) { +parse_events_print_error (&errinfo, smi_cost_attrs);fprintf (stderr,"Cannot set up SMI cost events\n" );return -1 ; }
tools/perf/builtin-trace.c +12 -4
@@ -3016,11 +3016,18 @@ static bool evlist__add_vfs_getname(struct evlist *evlist) {bool found = false;struct evsel *evsel, *tmp; -struct parse_events_error err = { .idx =0 , }; -int ret =parse_events (evlist,"probe:vfs_getname*" , &err); +struct parse_events_error err; +int ret; -if (ret) +bzero (&err,sizeof (err)); + ret =parse_events (evlist,"probe:vfs_getname*" , &err); +if (ret) { +free (err.str); +free (err.help); +free (err.first_str); +free (err.first_help);return false; + }evlist__for_each_entry_safe (evlist, evsel, tmp) {if (!strstarts (perf_evsel__name (evsel),"probe:vfs_getname" ))
@@ -4832,8 +4839,9 @@ int cmd_trace(int argc, const char **argv)* wrong in more detail. */ if (trace.perfconfig_events !=NULL ) { -struct parse_events_error parse_err = { .idx =0 , }; +struct parse_events_error parse_err; +bzero (&parse_err,sizeof (parse_err)); err =parse_events (trace.evlist, trace.perfconfig_events, &parse_err);if (err) {parse_events_print_error (&parse_err, trace.perfconfig_events);
tools/perf/tests/parse-events.c +2 -1
@@ -1768,10 +1768,11 @@ static struct terms_test test__terms[] = {static int test_event (struct evlist_test *e) { -struct parse_events_error err = { .idx =0 , }; +struct parse_events_error err;struct evlist *evlist;int ret; +bzero (&err,sizeof (err));if (e->valid && !e->valid ()) {pr_debug ("... SKIP" );return 0 ;
tools/perf/util/metricgroup.c +1 -1
@@ -523,7 +523,7 @@ int metricgroup__parse_groups(const struct option *opt,if (ret)return ret;pr_debug ("adding %s\n" , extra_events.buf); -memset (&parse_error,0 ,sizeof (struct parse_events_error )); +bzero (&parse_error,sizeof (parse_error)); ret =parse_events (perf_evlist, extra_events.buf, &parse_error);if (ret) {parse_events_print_error (&parse_error, extra_events.buf);
tools/perf/util/parse-events.c +57 -21
123 lines not on this page · raw message
tools/perf/util/parse-events.h +4 -0
@@ -110,9 +110,13 @@ struct parse_events_term { };struct parse_events_error { +int num_errors;/* number of errors encountered */ int idx;/* index in the parsed string */ char *str;/* string to display at the index */ char *help;/* optional help string */ +int first_idx;/* as above, but for the first encountered error */ +char *first_str; +char *first_help; };struct parse_events_state {
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
Re: [PATCH v2] perf tools: report initial event parsing error
Em Fri, Nov 15, 2019 at 11:46:52PM -0800, Ian Rogers escreveu:
Quoted 13 lines
Record the first event parsing error and report. Implementing feedback from Jiri Olsa:
https://lkml.org/lkml/2019/10/28/680An example error is:
$ tools/perf/perf stat -e c/c/ WARNING: multiple event parsing errors event syntax error: 'c/c/' \___ unknown termvalid terms: event,filter_rem,filter_opc0,edge,filter_isoc,filter_tid,filter_loc,filter_nc,inv,umask,filter_opc1,tid_en,thresh,filter_all_op,filter_not_nm,filter_state,filter_nm,config,config1,config2,name,period,percore
Quoted 8 lines
Initial error:
event syntax error: 'c/c/'
\___ Cannot find PMU `c'. Missing kernel support?
Run 'perf list' for a list of valid eventsUsage: perf stat [<options>] [<command>]
-e, --event <event> event selector. use 'perf list' to list available events
Thanks, tested and applied.
Jiri, please holler if something is still problematic,
- Arnaldo
Quoted 268 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/arch/powerpc/util/kvm-stat.c | 4 +- tools/perf/builtin-stat.c | 2 + tools/perf/builtin-trace.c | 16 +++-- tools/perf/tests/parse-events.c | 3 +- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/parse-events.c | 78 ++++++++++++++++++------- tools/perf/util/parse-events.h | 4 ++ 7 files changed, 80 insertions(+), 29 deletions(-)tools/perf/arch/powerpc/util/kvm-stat.c +2
-2@@ -113,10 +113,10 @@ static int is_tracepoint_available(const char *str, struct evlist *evlist)struct parse_events_error err;int ret; - err.str =NULL ; +bzero (&err,sizeof (err)); ret =parse_events (evlist, str, &err);if (err.str) -pr_err ("%s : %s\n" , str, err.str); +parse_events_print_error (&err,"tracepoint" );return ret; }tools/perf/builtin-stat.c +2
-0@@ -1307,6 +1307,7 @@ static int add_default_attributes(void)if (stat_config.null_run)return 0 ; +bzero (&errinfo,sizeof (errinfo));if (transaction_run) {/* Handle -T as -M transaction. Once platform specific metrics * support has been added to the json files, all archictures @@ -1364,6 +1365,7 @@ static int add_default_attributes(void)return -1 ; }if (err) { +parse_events_print_error (&errinfo, smi_cost_attrs);fprintf (stderr,"Cannot set up SMI cost events\n" );return -1 ; }tools/perf/builtin-trace.c +12
-4@@ -3016,11 +3016,18 @@ static bool evlist__add_vfs_getname(struct evlist *evlist) {bool found = false;struct evsel *evsel, *tmp; -struct parse_events_error err = { .idx =0 , }; -int ret =parse_events (evlist,"probe:vfs_getname*" , &err); +struct parse_events_error err; +int ret; -if (ret) +bzero (&err,sizeof (err)); + ret =parse_events (evlist,"probe:vfs_getname*" , &err); +if (ret) { +free (err.str); +free (err.help); +free (err.first_str); +free (err.first_help);return false; + }evlist__for_each_entry_safe (evlist, evsel, tmp) {if (!strstarts (perf_evsel__name (evsel),"probe:vfs_getname" ))@@ -4832,8 +4839,9 @@ int cmd_trace(int argc, const char **argv)* wrong in more detail. */ if (trace.perfconfig_events !=NULL ) { -struct parse_events_error parse_err = { .idx =0 , }; +struct parse_events_error parse_err; +bzero (&parse_err,sizeof (parse_err)); err =parse_events (trace.evlist, trace.perfconfig_events, &parse_err);if (err) {parse_events_print_error (&parse_err, trace.perfconfig_events);tools/perf/tests/parse-events.c +2
-1@@ -1768,10 +1768,11 @@ static struct terms_test test__terms[] = {static int test_event (struct evlist_test *e) { -struct parse_events_error err = { .idx =0 , }; +struct parse_events_error err;struct evlist *evlist;int ret; +bzero (&err,sizeof (err));if (e->valid && !e->valid ()) {pr_debug ("... SKIP" );return 0 ;tools/perf/util/metricgroup.c +1
-1@@ -523,7 +523,7 @@ int metricgroup__parse_groups(const struct option *opt,if (ret)return ret;pr_debug ("adding %s\n" , extra_events.buf); -memset (&parse_error,0 ,sizeof (struct parse_events_error )); +bzero (&parse_error,sizeof (parse_error)); ret =parse_events (perf_evlist, extra_events.buf, &parse_error);if (ret) {parse_events_print_error (&parse_error, extra_events.buf);tools/perf/util/parse-events.c +57
-21@@ -189,12 +189,29 @@ void parse_events__handle_error(struct parse_events_error *err, int idx,free (help);return ; } -WARN_ONCE (err->str,"WARNING: multiple event parsing errors\n" ); - err->idx = idx; -free (err->str); - err->str = str; -free (err->help); - err->help = help; +switch (err->num_errors) { +case 0 : + err->idx = idx; + err->str = str; + err->help = help; +break ; +case 1 : + err->first_idx = err->idx; + err->idx = idx; + err->first_str = err->str; + err->str = str; + err->first_help = err->help; + err->help = help; +break ; +default : +WARN_ONCE (1 ,"WARNING: multiple event parsing errors\n" ); +free (err->str); + err->str = str; +free (err->help); + err->help = help; +break ; + } + err->num_errors++; }struct tracepoint_path *tracepoint_id_to_path (u64 config)@@ -1349,7 +1366,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,if (asprintf (&err_str,"Cannot find PMU `%s'. Missing kernel support?" , name) >=0 ) -parse_events__handle_error (err,-1 , err_str,NULL ); +parse_events__handle_error (err,0 , err_str,NULL );return -EINVAL ; }@@ -2007,15 +2024,14 @@ static int get_term_width(void)return ws.ws_col >MAX_WIDTH ?MAX_WIDTH : ws.ws_col; } -void parse_events_print_error (struct parse_events_error *err, -const char *event) +static void __parse_events_print_error (int err_idx,const char *err_str, +const char *err_help,const char *event) {const char *str ="invalid or unsupported event: " ;char _buf[MAX_WIDTH ];char *buf = (char *) event;int idx =0 ; - -if (err->str) { +if (err_str) {/* -2 for extra '' in the final fprintf */ int width =get_term_width () -2 ;int len_event =strlen (event);@@ -2038,8 +2054,8 @@ void parse_events_print_error(struct parse_events_error *err, buf = _buf;/* We're cutting from the beginning. */ -if (err->idx > max_err_idx) - cut = err->idx - max_err_idx; +if (err_idx > max_err_idx) + cut = err_idx - max_err_idx;strncpy (buf, event + cut, max_len);@@ -2052,16 +2068,33 @@ void parse_events_print_error(struct parse_events_error *err, buf[max_len] =0 ; } - idx = len_str + err->idx - cut; + idx = len_str + err_idx - cut; }fprintf (stderr,"%s'%s'\n" , str, buf);if (idx) { -fprintf (stderr,"%*s\\___ %s\n" , idx +1 ,"" , err->str); -if (err->help) -fprintf (stderr,"\n%s\n" , err->help); -zfree (&err->str); -zfree (&err->help); +fprintf (stderr,"%*s\\___ %s\n" , idx +1 ,"" , err_str); +if (err_help) +fprintf (stderr,"\n%s\n" , err_help); + } +} + +void parse_events_print_error (struct parse_events_error *err, +const char *event) +{ +if (!err->num_errors) +return ; + +__parse_events_print_error (err->idx, err->str, err->help, event); +zfree (&err->str); +zfree (&err->help); + +if (err->num_errors >1 ) { +fputs ("\nInitial error:\n" , stderr); +__parse_events_print_error (err->first_idx, err->first_str, + err->first_help, event); +zfree (&err->first_str); +zfree (&err->first_help); } }@@ -2071,8 +2104,11 @@ int parse_events_option(const struct option *opt, const char *str, int unset __maybe_unused) {struct evlist *evlist = *(struct evlist **)opt->value; -struct parse_events_error err = { .idx =0 , }; -int ret =parse_events (evlist, str, &err); +struct parse_events_error err; +int ret; + +bzero (&err,sizeof (err)); + ret =parse_events (evlist, str, &err);if (ret) {parse_events_print_error (&err, str);tools/perf/util/parse-events.h +4
-0@@ -110,9 +110,13 @@ struct parse_events_term { };struct parse_events_error { +int num_errors;/* number of errors encountered */ int idx;/* index in the parsed string */ char *str;/* string to display at the index */ char *help;/* optional help string */ +int first_idx;/* as above, but for the first encountered error */ +char *first_str; +char *first_help; };struct parse_events_state {Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
Signature · 1 line
- Arnaldo
[tip: perf/core] perf parse: Report initial event parsing error
In reply to Ian RogersThe following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: a910e4666d61712840c78de33cc7f89de8affa78 Gitweb: https://git.kernel.org/tip/a910e4666d61712840c78de33cc7f89de8affa78 Author: Ian Rogers <[email protected]> AuthorDate: Fri, 15 Nov 2019 23:46:52 -08:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 18 Nov 2019 19:14:29 -03:00
perf parse: Report initial event parsing error
Record the first event parsing error and report. Implementing feedback from Jiri Olsa:
https://lkml.org/lkml/2019/10/28/680
An example error is:
$ tools/perf/perf stat -e c/c/
WARNING: multiple event parsing errors
event syntax error: 'c/c/'
\___ unknown termvalid terms: event,filter_rem,filter_opc0,edge,filter_isoc,filter_tid,filter_loc,filter_nc,inv,umask,filter_opc1,tid_en,thresh,filter_all_op,filter_not_nm,filter_state,filter_nm,config,config1,config2,name,period,percore
Initial error:
event syntax error: 'c/c/'
\___ Cannot find PMU `c'. Missing kernel support?
Run 'perf list' for a list of valid events
Usage: perf stat [<options>] [<command>]
-e, --event <event> event selector. use 'perf list' to list available events
--- tools/perf/arch/powerpc/util/kvm-stat.c | 4 +- tools/perf/builtin-stat.c | 2 +- tools/perf/builtin-trace.c | 16 +++-- tools/perf/tests/parse-events.c | 3 +- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/parse-events.c | 78 +++++++++++++++++------- tools/perf/util/parse-events.h | 4 +- 7 files changed, 80 insertions(+), 29 deletions(-)
tools/perf/arch/powerpc/util/kvm-stat.c +2 -2
@@ -113,10 +113,10 @@ static int is_tracepoint_available(const char *str, struct evlist *evlist)struct parse_events_error err;int ret; - err.str =NULL ; +bzero (&err,sizeof (err)); ret =parse_events (evlist, str, &err);if (err.str) -pr_err ("%s : %s\n" , str, err.str); +parse_events_print_error (&err,"tracepoint" );return ret; }
tools/perf/builtin-stat.c +2 -0
@@ -1307,6 +1307,7 @@ static int add_default_attributes(void)if (stat_config.null_run)return 0 ; +bzero (&errinfo,sizeof (errinfo));if (transaction_run) {/* Handle -T as -M transaction. Once platform specific metrics * support has been added to the json files, all archictures
@@ -1364,6 +1365,7 @@ static int add_default_attributes(void)return -1 ; }if (err) { +parse_events_print_error (&errinfo, smi_cost_attrs);fprintf (stderr,"Cannot set up SMI cost events\n" );return -1 ; }
tools/perf/builtin-trace.c +12 -4
@@ -3016,11 +3016,18 @@ static bool evlist__add_vfs_getname(struct evlist *evlist) {bool found = false;struct evsel *evsel, *tmp; -struct parse_events_error err = { .idx =0 , }; -int ret =parse_events (evlist,"probe:vfs_getname*" , &err); +struct parse_events_error err; +int ret; -if (ret) +bzero (&err,sizeof (err)); + ret =parse_events (evlist,"probe:vfs_getname*" , &err); +if (ret) { +free (err.str); +free (err.help); +free (err.first_str); +free (err.first_help);return false; + }evlist__for_each_entry_safe (evlist, evsel, tmp) {if (!strstarts (perf_evsel__name (evsel),"probe:vfs_getname" ))
@@ -4832,8 +4839,9 @@ int cmd_trace(int argc, const char **argv)* wrong in more detail. */ if (trace.perfconfig_events !=NULL ) { -struct parse_events_error parse_err = { .idx =0 , }; +struct parse_events_error parse_err; +bzero (&parse_err,sizeof (parse_err)); err =parse_events (trace.evlist, trace.perfconfig_events, &parse_err);if (err) {parse_events_print_error (&parse_err, trace.perfconfig_events);
tools/perf/tests/parse-events.c +2 -1
@@ -1768,10 +1768,11 @@ static struct terms_test test__terms[] = {static int test_event (struct evlist_test *e) { -struct parse_events_error err = { .idx =0 , }; +struct parse_events_error err;struct evlist *evlist;int ret; +bzero (&err,sizeof (err));if (e->valid && !e->valid ()) {pr_debug ("... SKIP" );return 0 ;
tools/perf/util/metricgroup.c +1 -1
@@ -523,7 +523,7 @@ int metricgroup__parse_groups(const struct option *opt,if (ret)return ret;pr_debug ("adding %s\n" , extra_events.buf); -memset (&parse_error,0 ,sizeof (struct parse_events_error )); +bzero (&parse_error,sizeof (parse_error)); ret =parse_events (perf_evlist, extra_events.buf, &parse_error);if (ret) {parse_events_print_error (&parse_error, extra_events.buf);
tools/perf/util/parse-events.c +57 -21
123 lines not on this page · raw message
tools/perf/util/parse-events.h +4 -0
@@ -110,9 +110,13 @@ struct parse_events_term { };struct parse_events_error { +int num_errors;/* number of errors encountered */ int idx;/* index in the parsed string */ char *str;/* string to display at the index */ char *help;/* optional help string */ +int first_idx;/* as above, but for the first encountered error */ +char *first_str; +char *first_help; };struct parse_events_state {
Ian Rogers
reviewerRe: [PATCH v6 00/10] Improvements to memory usage by parse events
In reply to Arnaldo Carvalho de MeloQuoted 13 lines · Arnaldo Carvalho de Melo
Em Thu, Nov 07, 2019 at 02:14:18PM -0800, Ian Rogers escreveu:
Quoted 11 lines
The parse events parser leaks memory for certain expressions as well as allowing a char* to reference stack, heap or .rodata. This series of patches improves the hygeine and adds free-ing operations to reclaim memory in the parser in error and non-error situations.
The series of patches was generated with LLVM's address sanitizer and libFuzzer:
https://llvm.org/docs/LibFuzzer.html
called on theparse_eventsfunction with randomly generated input. With the patches no leaks or memory corruption issues were present.
Quoted 4 lines
Quoted 1 line
The v6 patches address a C90 compilation issue.
Please take a look at what is in my perf/core branch, to see what is left, if something needs fixing, please send a patch on top of that,
Thanks, just the last patch remaining. I resent it rebased on your perf/core branch:
https://lkml.org/lkml/2019/11/8/1103
https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git/log/?h=perf/core
Thanks,
Ian
Quoted 55 lines
Thanks,
- Arnaldo
Quoted 40 lines
The v5 patches add initial error print to the set, as requested by Jiri Olsa. They also fix additional 2 missed frees in the patch 'before yyabort-ing free components' and remove a redundant
new_strvariable from the patch 'add parse events handle error' as spotted by Stephane Eranian.The v4 patches address review comments from Jiri Olsa, turning a long error message into a single warning, fixing the data type in a list iterator and reordering patches.
The v3 patches address review comments from Jiri Olsa improving commit messages, handling ENOMEM errors from strdup better, and removing a printed warning if an invalid event is passed.
The v2 patches are preferable to an earlier proposed patch:
perf tools: avoid reading out of scope arrayIan Rogers (10):
perf tools: add parse events handle error perf tools: moveALLOC_LISTinto a function perf tools: avoid a malloc for array events perf tools: splice events onto evlist even on error perf tools: ensure config and str in terms are unique perf tools: add destructors for parse event terms perf tools: before yyabort-ing free components perf tools: if pmu configuration fails free terms perf tools: add a deep delete for parse event terms perf tools: report initial event parsing errortools/perf/arch/powerpc/util/kvm-stat.c | 9 +- tools/perf/builtin-stat.c | 2 + tools/perf/builtin-trace.c | 16 +- tools/perf/tests/parse-events.c | 3 +- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/parse-events.c | 239 +++++++++++---- tools/perf/util/parse-events.h | 7 + tools/perf/util/parse-events.y | 390 +++++++++++++++++------- tools/perf/util/pmu.c | 32 +- 9 files changed, 511 insertions(+), 189 deletions(-)Quoted 2 lines
--
2.24.0.432.g9d3f5f5b63-goog--
- Arnaldo
--
You received this message because you are subscribed to the Google Groups "Clang Built Linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20191107222315.GA7261%40kernel.org.
Quoted 34 lines · Ian Rogers
Modify tracepoint name into 2 sys components and assemble at use. This avoids the
sys_namearray being out of scope at the point of use. Bug caught with LLVM's address sanitizer with fuzz generated input of ":cs\1" toparse_events.Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/parse-events.y | 36 +++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-)tools/perf/util/parse-events.y +5
-4@@ -104,7 +104,8 @@ static void inc_group_count(struct list_head *list, struct list_head *head; struct parse_events_term *term; struct tracepoint_name { - char *sys; + char *sys1; + char *sys2; char *event; } tracepoint_name; struct parse_events_array array;@@ -425,9 +426,19 @@ tracepoint_name opt_event_config if (error) error->idx = @1.first_column; - if (parse_events_add_tracepoint(list, &parse_state->idx, $1.sys, $1.event, - error, $2)) - return -1; + if ($1.sys2) { + char sys_name[128]; + snprintf(&sys_name, sizeof(sys_name), "%s-%s",
tools/perf/util/parse-events.y tracepoint_name opt_event_config · line 441
Quoted 10 lines
tools/perf/util/parse-events.y +10
-0+ $1.sys1, $1.sys2); + if (parse_events_add_tracepoint(list, &parse_state->idx, + sys_name, $1.event, + error, $2)) + return -1; + } else + if (parse_events_add_tracepoint(list, &parse_state->idx, + $1.sys1, $1.event, + error, $2)) + return -1;
nice catch, please enclose all multiline condition legs with {}
other than that
thanks,
jirka
Quoted 36 lines
tools/perf/util/parse-events.y +10
-7$$ = list; }@@ -435,19 +446,22 @@ tracepoint_name opt_event_config tracepoint_name: PE_NAME '-' PE_NAME ':' PE_NAME { - char sys_name[128]; - struct tracepoint_name tracepoint; - - snprintf(&sys_name, 128, "%s-%s", $1, $3); - tracepoint.sys = &sys_name; - tracepoint.event = $5; + struct tracepoint_name tracepoint = { + .sys1 = $1, + .sys2 = $3, + .event = $5, + }; $$ = tracepoint; } | PE_NAME ':' PE_NAME { - struct tracepoint_name tracepoint = {$1, $3}; + struct tracepoint_name tracepoint = { + .sys1 = $1, + .sys2 = NULL, + .event = $3, + }; $$ = tracepoint; }Signature · 1 line
2.23.0.700.g56cf767bdb-goog
Em Wed, Oct 23, 2019 at 10:29:12AM +0200, Jiri Olsa escreveu:
Quoted 48 lines · Ian Rogers
Quoted 34 lines
Modify tracepoint name into 2 sys components and assemble at use. This avoids the
sys_namearray being out of scope at the point of use. Bug caught with LLVM's address sanitizer with fuzz generated input of ":cs\1" toparse_events.Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/parse-events.y | 36 +++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-)tools/perf/util/parse-events.y +5
-4@@ -104,7 +104,8 @@ static void inc_group_count(struct list_head *list, struct list_head *head; struct parse_events_term *term; struct tracepoint_name { - char *sys; + char *sys1; + char *sys2; char *event; } tracepoint_name; struct parse_events_array array;@@ -425,9 +426,19 @@ tracepoint_name opt_event_config if (error) error->idx = @1.first_column; - if (parse_events_add_tracepoint(list, &parse_state->idx, $1.sys, $1.event, - error, $2)) - return -1; + if ($1.sys2) { + char sys_name[128]; + snprintf(&sys_name, sizeof(sys_name), "%s-%s",tools/perf/util/parse-events.y tracepoint_name opt_event_config · line 441
Quoted 10 lines
tools/perf/util/parse-events.y +10
-0+ $1.sys1, $1.sys2); + if (parse_events_add_tracepoint(list, &parse_state->idx, + sys_name, $1.event, + error, $2)) + return -1; + } else + if (parse_events_add_tracepoint(list, &parse_state->idx, + $1.sys1, $1.event, + error, $2)) + return -1;nice catch, please enclose all multiline condition legs with {}
Quoted 3 lines
other than that
Acked-by Jiri Olsa <[email protected]>
Ian, this one isn't applying to my perf/core branch, can you please address Jiri's comment and resubmit?
- arnaldo
Ian Rogers
reviewerThanks Arnaldo, this patch shouldn't be added. It was replaced with the longer v2 patch that addressed the memory issues properly. That was followed by a number of improved versions.
Ian
Quoted 58 lines · Arnaldo Carvalho de Melo
Em Wed, Oct 23, 2019 at 10:29:12AM +0200, Jiri Olsa escreveu:
Quoted 48 lines · Ian Rogers
Quoted 34 lines
Modify tracepoint name into 2 sys components and assemble at use. This avoids the
sys_namearray being out of scope at the point of use. Bug caught with LLVM's address sanitizer with fuzz generated input of ":cs\1" toparse_events.Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/parse-events.y | 36 +++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-)tools/perf/util/parse-events.y +5
-4@@ -104,7 +104,8 @@ static void inc_group_count(struct list_head *list, struct list_head *head; struct parse_events_term *term; struct tracepoint_name { - char *sys; + char *sys1; + char *sys2; char *event; } tracepoint_name; struct parse_events_array array;@@ -425,9 +426,19 @@ tracepoint_name opt_event_config if (error) error->idx = @1.first_column; - if (parse_events_add_tracepoint(list, &parse_state->idx, $1.sys, $1.event, - error, $2)) - return -1; + if ($1.sys2) { + char sys_name[128]; + snprintf(&sys_name, sizeof(sys_name), "%s-%s",tools/perf/util/parse-events.y tracepoint_name opt_event_config · line 441
Quoted 10 lines
tools/perf/util/parse-events.y +10
-0+ $1.sys1, $1.sys2); + if (parse_events_add_tracepoint(list, &parse_state->idx, + sys_name, $1.event, + error, $2)) + return -1; + } else + if (parse_events_add_tracepoint(list, &parse_state->idx, + $1.sys1, $1.event, + error, $2)) + return -1;nice catch, please enclose all multiline condition legs with {}
Quoted 3 lines
other than that
Acked-by Jiri Olsa <[email protected]>Ian, this one isn't applying to my perf/core branch, can you please address Jiri's comment and resubmit?
- arnaldo
Em Mon, Nov 11, 2019 at 12:34:23PM -0800, Ian Rogers escreveu:
Quoted 3 lines
Thanks Arnaldo, this patch shouldn't be added. It was replaced with the longer v2 patch that addressed the memory issues properly. That was followed by a number of improved versions.
Thanks for checking,
- Arnaldo
Quoted 62 lines
Ian
Quoted 58 lines · Arnaldo Carvalho de Melo
Em Wed, Oct 23, 2019 at 10:29:12AM +0200, Jiri Olsa escreveu:
Quoted 48 lines · Ian Rogers
Quoted 34 lines
Modify tracepoint name into 2 sys components and assemble at use. This avoids the
sys_namearray being out of scope at the point of use. Bug caught with LLVM's address sanitizer with fuzz generated input of ":cs\1" toparse_events.Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/parse-events.y | 36 +++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-)tools/perf/util/parse-events.y +5
-4@@ -104,7 +104,8 @@ static void inc_group_count(struct list_head *list, struct list_head *head; struct parse_events_term *term; struct tracepoint_name { - char *sys; + char *sys1; + char *sys2; char *event; } tracepoint_name; struct parse_events_array array;@@ -425,9 +426,19 @@ tracepoint_name opt_event_config if (error) error->idx = @1.first_column; - if (parse_events_add_tracepoint(list, &parse_state->idx, $1.sys, $1.event, - error, $2)) - return -1; + if ($1.sys2) { + char sys_name[128]; + snprintf(&sys_name, sizeof(sys_name), "%s-%s",tools/perf/util/parse-events.y tracepoint_name opt_event_config · line 441
Quoted 10 lines
tools/perf/util/parse-events.y +10
-0+ $1.sys1, $1.sys2); + if (parse_events_add_tracepoint(list, &parse_state->idx, + sys_name, $1.event, + error, $2)) + return -1; + } else + if (parse_events_add_tracepoint(list, &parse_state->idx, + $1.sys1, $1.event, + error, $2)) + return -1;nice catch, please enclose all multiline condition legs with {}
Quoted 3 lines
other than that
Acked-by Jiri Olsa <[email protected]>Ian, this one isn't applying to my perf/core branch, can you please address Jiri's comment and resubmit?
- arnaldo
Signature · 1 line
- Arnaldo