Skip to content

Commit

Permalink
perf tools: Revert enable indices setting syntax for BPF map
Browse files Browse the repository at this point in the history 
[ Upstream commit 30f4ade ]

This reverts commit e571e02 ("perf tools: Enable indices setting
syntax for BPF map").

The reverted commit added a notion of arrays that could be set as
event terms for BPF events. The parsing hasn't worked over multiple
Linux releases. Given the broken nature of the parsing it appears the
code isn't in use, nor could I find a way for it to be used to add a
test.

The original commit contains a test in the commit message,
however, running it yields:
```
$ perf record -e './test_bpf_map_3.c/map:channel.value[0,1,2,3...5]=101/' usleep 2
event syntax error: '..pf_map_3.c/map:channel.value[0,1,2,3...5]=101/'
                                  \___ parser error
Run 'perf list' for a list of valid events

 Usage: perf record [<options>] [<command>]
    or: perf record [<options>] -- <command> [<options>]

    -e, --event <event>   event selector. use 'perf list' to list available events
```

Given the code can't be used this commit reverts and removes it.

Signed-off-by: Ian Rogers <[email protected]>
Cc: Adrian Hunter <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Eduard Zingerman <[email protected]>
Cc: He Kuang <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Kan Liang <[email protected]>
Cc: Mark Rutland <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Wang Nan <[email protected]>
Cc: Wang ShaoBo <[email protected]>
Cc: YueHaibing <[email protected]>
Cc: [email protected]
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Stable-dep-of: ede72dc ("perf parse-events: Fix tracepoint name memory leak")
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
@captain5050 @gregkh
captain5050 authored and gregkh committed Nov 20, 2023
1 parent acd50fc commit bd64a16
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 140 deletions.
8 changes: 1 addition & 7 deletions tools/perf/util/parse-events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -793,13 +793,7 @@ parse_events_config_bpf(struct parse_events_state *parse_state,

parse_events_error__handle(parse_state->error, idx,
strdup(errbuf),
strdup(
"Hint:\tValid config terms:\n"
" \tmap:[<arraymap>].value<indices>=[value]\n"
" \tmap:[<eventmap>].event<indices>=[event]\n"
"\n"
" \twhere <indices> is something like [0,3...5] or [all]\n"
" \t(add -v to see detail)"));
NULL);
return err;
}
}
Expand Down
11 changes: 0 additions & 11 deletions tools/perf/util/parse-events.l
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ do { \
%x mem
%s config
%x event
%x array

group [^,{}/]*[{][^}]*[}][^,{}/]*
event_pmu [^,{}/]+[/][^/]*[/][^,{}/]*
Expand Down Expand Up @@ -251,14 +250,6 @@ non_digit [^0-9]
}
}

<array>{
"]" { BEGIN(config); return ']'; }
{num_dec} { return value(yyscanner, 10); }
{num_hex} { return value(yyscanner, 16); }
, { return ','; }
"\.\.\." { return PE_ARRAY_RANGE; }
}

<config>{
/*
* Please update config_term_names when new static term is added.
Expand Down Expand Up @@ -302,8 +293,6 @@ r0x{num_raw_hex} { return str(yyscanner, PE_RAW); }
{lc_type}-{lc_op_result} { return lc_str(yyscanner, _parse_state); }
{lc_type}-{lc_op_result}-{lc_op_result} { return lc_str(yyscanner, _parse_state); }
{name_minus} { return str(yyscanner, PE_NAME); }
\[all\] { return PE_ARRAY_ALL; }
"[" { BEGIN(array); return '['; }
@{drv_cfg_term} { return drv_str(yyscanner, PE_DRV_CFG_TERM); }
}

Expand Down
122 changes: 0 additions & 122 deletions tools/perf/util/parse-events.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ static void free_list_evsel(struct list_head* list_evsel)
%token PE_LEGACY_CACHE
%token PE_PREFIX_MEM PE_PREFIX_RAW PE_PREFIX_GROUP
%token PE_ERROR
%token PE_ARRAY_ALL PE_ARRAY_RANGE
%token PE_DRV_CFG_TERM
%token PE_TERM_HW
%type <num> PE_VALUE
Expand Down Expand Up @@ -108,11 +107,6 @@ static void free_list_evsel(struct list_head* list_evsel)
%type <list_evsel> groups
%destructor { free_list_evsel ($$); } <list_evsel>
%type <tracepoint_name> tracepoint_name
%destructor { free ($$.sys); free ($$.event); } <tracepoint_name>
%type <array> array
%type <array> array_term
%type <array> array_terms
%destructor { free ($$.ranges); } <array>
%type <hardware_term> PE_TERM_HW
%destructor { free ($$.str); } <hardware_term>

Expand All @@ -127,7 +121,6 @@ static void free_list_evsel(struct list_head* list_evsel)
char *sys;
char *event;
} tracepoint_name;
struct parse_events_array array;
struct hardware_term {
char *str;
u64 num;
Expand Down Expand Up @@ -878,121 +871,6 @@ PE_TERM

$$ = term;
}
|
name_or_raw array '=' name_or_legacy
{
struct parse_events_term *term;
int err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, $1, $4, &@1, &@4);

if (err) {
free($1);
free($4);
free($2.ranges);
PE_ABORT(err);
}
term->array = $2;
$$ = term;
}
|
name_or_raw array '=' PE_VALUE
{
struct parse_events_term *term;
int err = parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, $1, $4, false, &@1, &@4);

if (err) {
free($1);
free($2.ranges);
PE_ABORT(err);
}
term->array = $2;
$$ = term;
}
|
PE_DRV_CFG_TERM
{
struct parse_events_term *term;
char *config = strdup($1);
int err;

if (!config)
YYNOMEM;
err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, config, $1, &@1, NULL);
if (err) {
free($1);
free(config);
PE_ABORT(err);
}
$$ = term;
}

array:
'[' array_terms ']'
{
$$ = $2;
}
|
PE_ARRAY_ALL
{
$$.nr_ranges = 0;
$$.ranges = NULL;
}

array_terms:
array_terms ',' array_term
{
struct parse_events_array new_array;

new_array.nr_ranges = $1.nr_ranges + $3.nr_ranges;
new_array.ranges = realloc($1.ranges,
sizeof(new_array.ranges[0]) *
new_array.nr_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);
$$ = new_array;
}
|
array_term

array_term:
PE_VALUE
{
struct parse_events_array array;

array.nr_ranges = 1;
array.ranges = malloc(sizeof(array.ranges[0]));
if (!array.ranges)
YYNOMEM;
array.ranges[0].start = $1;
array.ranges[0].length = 1;
$$ = array;
}
|
PE_VALUE PE_ARRAY_RANGE PE_VALUE
{
struct parse_events_array array;

if ($3 < $1) {
struct parse_events_state *parse_state = _parse_state;
struct parse_events_error *error = parse_state->error;
char *err_str;

if (asprintf(&err_str, "Expected '%ld' to be less-than '%ld'", $3, $1) < 0)
err_str = NULL;

parse_events_error__handle(error, @1.first_column, err_str, NULL);
YYABORT;
}
array.nr_ranges = 1;
array.ranges = malloc(sizeof(array.ranges[0]));
if (!array.ranges)
YYNOMEM;
array.ranges[0].start = $1;
array.ranges[0].length = $3 - $1 + 1;
$$ = array;
}

sep_dc: ':' |

Expand Down

0 comments on commit bd64a16

Please sign in to comment.