From: Ian Rogers Date: Tue, 5 Sep 2023 03:38:05 +0000 (-0700) Subject: perf parse-events: Fix driver config term X-Git-Tag: v6.5.12~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c44debc30d28dd3d755ff086b78aa1a021fee09;p=thirdparty%2Fkernel%2Fstable.git perf parse-events: Fix driver config term commit 45fc4628c15ab2cb7b2f53354b21db63f0a41f81 upstream. Inadvertently deleted in commit 30f4ade33d649aa0 ("perf tools: Revert enable indices setting syntax for BPF map"). Fixes: 30f4ade33d649aa0 ("perf tools: Revert enable indices setting syntax for BPF map") Reported-by: James Clark Reviewed-by: James Clark Signed-off-by: Ian Rogers Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lore.kernel.org/lkml/20230905033805.3094293-1-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 59108f70d1e45..9cbbc36f01b59 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -870,6 +870,23 @@ PE_TERM $$ = 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; +} sep_dc: ':' |