Skip to content

Commit bd64a16

Browse files
captain5050gregkh
authored andcommitted
perf tools: Revert enable indices setting syntax for BPF map
[ 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]>
1 parent acd50fc commit bd64a16

File tree

3 files changed

+1
-140
lines changed

3 files changed

+1
-140
lines changed

tools/perf/util/parse-events.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -793,13 +793,7 @@ parse_events_config_bpf(struct parse_events_state *parse_state,
793793

794794
parse_events_error__handle(parse_state->error, idx,
795795
strdup(errbuf),
796-
strdup(
797-
"Hint:\tValid config terms:\n"
798-
" \tmap:[<arraymap>].value<indices>=[value]\n"
799-
" \tmap:[<eventmap>].event<indices>=[event]\n"
800-
"\n"
801-
" \twhere <indices> is something like [0,3...5] or [all]\n"
802-
" \t(add -v to see detail)"));
796+
NULL);
803797
return err;
804798
}
805799
}

tools/perf/util/parse-events.l

-11
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ do { \
175175
%x mem
176176
%s config
177177
%x event
178-
%x array
179178

180179
group [^,{}/]*[{][^}]*[}][^,{}/]*
181180
event_pmu [^,{}/]+[/][^/]*[/][^,{}/]*
@@ -251,14 +250,6 @@ non_digit [^0-9]
251250
}
252251
}
253252

254-
<array>{
255-
"]" { BEGIN(config); return ']'; }
256-
{num_dec} { return value(yyscanner, 10); }
257-
{num_hex} { return value(yyscanner, 16); }
258-
, { return ','; }
259-
"\.\.\." { return PE_ARRAY_RANGE; }
260-
}
261-
262253
<config>{
263254
/*
264255
* Please update config_term_names when new static term is added.
@@ -302,8 +293,6 @@ r0x{num_raw_hex} { return str(yyscanner, PE_RAW); }
302293
{lc_type}-{lc_op_result} { return lc_str(yyscanner, _parse_state); }
303294
{lc_type}-{lc_op_result}-{lc_op_result} { return lc_str(yyscanner, _parse_state); }
304295
{name_minus} { return str(yyscanner, PE_NAME); }
305-
\[all\] { return PE_ARRAY_ALL; }
306-
"[" { BEGIN(array); return '['; }
307296
@{drv_cfg_term} { return drv_str(yyscanner, PE_DRV_CFG_TERM); }
308297
}
309298

tools/perf/util/parse-events.y

-122
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ static void free_list_evsel(struct list_head* list_evsel)
6464
%token PE_LEGACY_CACHE
6565
%token PE_PREFIX_MEM PE_PREFIX_RAW PE_PREFIX_GROUP
6666
%token PE_ERROR
67-
%token PE_ARRAY_ALL PE_ARRAY_RANGE
6867
%token PE_DRV_CFG_TERM
6968
%token PE_TERM_HW
7069
%type <num> PE_VALUE
@@ -108,11 +107,6 @@ static void free_list_evsel(struct list_head* list_evsel)
108107
%type <list_evsel> groups
109108
%destructor { free_list_evsel ($$); } <list_evsel>
110109
%type <tracepoint_name> tracepoint_name
111-
%destructor { free ($$.sys); free ($$.event); } <tracepoint_name>
112-
%type <array> array
113-
%type <array> array_term
114-
%type <array> array_terms
115-
%destructor { free ($$.ranges); } <array>
116110
%type <hardware_term> PE_TERM_HW
117111
%destructor { free ($$.str); } <hardware_term>
118112

@@ -127,7 +121,6 @@ static void free_list_evsel(struct list_head* list_evsel)
127121
char *sys;
128122
char *event;
129123
} tracepoint_name;
130-
struct parse_events_array array;
131124
struct hardware_term {
132125
char *str;
133126
u64 num;
@@ -878,121 +871,6 @@ PE_TERM
878871

879872
$$ = term;
880873
}
881-
|
882-
name_or_raw array '=' name_or_legacy
883-
{
884-
struct parse_events_term *term;
885-
int err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, $1, $4, &@1, &@4);
886-
887-
if (err) {
888-
free($1);
889-
free($4);
890-
free($2.ranges);
891-
PE_ABORT(err);
892-
}
893-
term->array = $2;
894-
$$ = term;
895-
}
896-
|
897-
name_or_raw array '=' PE_VALUE
898-
{
899-
struct parse_events_term *term;
900-
int err = parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, $1, $4, false, &@1, &@4);
901-
902-
if (err) {
903-
free($1);
904-
free($2.ranges);
905-
PE_ABORT(err);
906-
}
907-
term->array = $2;
908-
$$ = term;
909-
}
910-
|
911-
PE_DRV_CFG_TERM
912-
{
913-
struct parse_events_term *term;
914-
char *config = strdup($1);
915-
int err;
916-
917-
if (!config)
918-
YYNOMEM;
919-
err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, config, $1, &@1, NULL);
920-
if (err) {
921-
free($1);
922-
free(config);
923-
PE_ABORT(err);
924-
}
925-
$$ = term;
926-
}
927-
928-
array:
929-
'[' array_terms ']'
930-
{
931-
$$ = $2;
932-
}
933-
|
934-
PE_ARRAY_ALL
935-
{
936-
$$.nr_ranges = 0;
937-
$$.ranges = NULL;
938-
}
939-
940-
array_terms:
941-
array_terms ',' array_term
942-
{
943-
struct parse_events_array new_array;
944-
945-
new_array.nr_ranges = $1.nr_ranges + $3.nr_ranges;
946-
new_array.ranges = realloc($1.ranges,
947-
sizeof(new_array.ranges[0]) *
948-
new_array.nr_ranges);
949-
if (!new_array.ranges)
950-
YYNOMEM;
951-
memcpy(&new_array.ranges[$1.nr_ranges], $3.ranges,
952-
$3.nr_ranges * sizeof(new_array.ranges[0]));
953-
free($3.ranges);
954-
$$ = new_array;
955-
}
956-
|
957-
array_term
958-
959-
array_term:
960-
PE_VALUE
961-
{
962-
struct parse_events_array array;
963-
964-
array.nr_ranges = 1;
965-
array.ranges = malloc(sizeof(array.ranges[0]));
966-
if (!array.ranges)
967-
YYNOMEM;
968-
array.ranges[0].start = $1;
969-
array.ranges[0].length = 1;
970-
$$ = array;
971-
}
972-
|
973-
PE_VALUE PE_ARRAY_RANGE PE_VALUE
974-
{
975-
struct parse_events_array array;
976-
977-
if ($3 < $1) {
978-
struct parse_events_state *parse_state = _parse_state;
979-
struct parse_events_error *error = parse_state->error;
980-
char *err_str;
981-
982-
if (asprintf(&err_str, "Expected '%ld' to be less-than '%ld'", $3, $1) < 0)
983-
err_str = NULL;
984-
985-
parse_events_error__handle(error, @1.first_column, err_str, NULL);
986-
YYABORT;
987-
}
988-
array.nr_ranges = 1;
989-
array.ranges = malloc(sizeof(array.ranges[0]));
990-
if (!array.ranges)
991-
YYNOMEM;
992-
array.ranges[0].start = $1;
993-
array.ranges[0].length = $3 - $1 + 1;
994-
$$ = array;
995-
}
996874

997875
sep_dc: ':' |
998876

0 commit comments

Comments
 (0)