Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

perf parse-events: Fix parsing of >30kb event strings

Metrics may generate many particularly uncore event references. The
resulting event string may then be >32kb. The parse events lex is
using "%option reject" which stores backtracking state in a buffer
sized at roughtly 30kb. If the event string is larger than this then a
buffer overflow and typically a crash happens.

The need for "%option reject" was for BPF events which were removed in
commit 3d6dfae88917 ("perf parse-events: Remove BPF event
support"). As "%option reject" is both a memory and performance cost
let's remove it and fix the parsing case for event strings being over
~30kb.

Whilst cleaning up "%option reject" make the header files accurately
reflect functions used in the code and tidy up not requiring yywrap.

Measuring on the "PMU JSON event tests" a modest reduction of 0.41%
user time and 0.27% max resident size was observed. More importantly
this change fixes parsing large metrics and event strings.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Ian Rogers and committed by
Arnaldo Carvalho de Melo
a22d167e 56be0fe5

+3 -14
+3 -14
tools/perf/util/parse-events.l
··· 5 5 %option stack 6 6 %option bison-locations 7 7 %option yylineno 8 - %option reject 8 + %option noyywrap 9 9 10 10 %{ 11 11 #include <errno.h> 12 - #include <sys/types.h> 13 - #include <sys/stat.h> 14 - #include <unistd.h> 12 + #include <stdlib.h> 13 + #include <stdio.h> 15 14 #include "parse-events.h" 16 15 #include "parse-events-bison.h" 17 - #include "evsel.h" 18 16 19 17 char *parse_events_get_text(yyscan_t yyscanner); 20 18 YYSTYPE *parse_events_get_lval(yyscan_t yyscanner); ··· 221 223 yycolumn += yyleng; \ 222 224 } while (0); 223 225 224 - #define USER_REJECT \ 225 - yycolumn -= yyleng; \ 226 - REJECT 227 - 228 226 %} 229 227 230 228 %x mem ··· 419 425 . { } 420 426 421 427 %% 422 - 423 - int parse_events_wrap(void *scanner __maybe_unused) 424 - { 425 - return 1; 426 - }