UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf parse-events: Avoid string for PE_BP_COLON, PE_BP_SLASH 

There's no need to read the string ':' or '/' for PE_BP_COLON or
PE_BP_SLASH and doing so causes parse-events.y to leak memory.

The original patch has a committer note about not using these tokens
presumably as yacc spotted they were a memory leak because no
%destructor could be run. Remove the unused token workaround as there
is now no value associated with these tokens.

Fixes: f0617f526c ("perf parse: Allow config terms with breakpoints")
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>
Cc: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20230613182629.1500317-1-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2023-06-13 11:26:29 -07:00 committed by Arnaldo Carvalho de Melo
parent e4c4e8a538
commit 6ec9503f45
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/perf/util/parse-events.h
View File

@ -228,10 +228,6 @@ void parse_events_error__handle(struct parse_events_error *err, int idx,
void parse_events_error__print(struct parse_events_error *err, void parse_events_error__print(struct parse_events_error *err,
const char *event); const char *event);
static inline void parse_events_unused_value(const void *x __maybe_unused)
{
}
#ifdef HAVE_LIBELF_SUPPORT #ifdef HAVE_LIBELF_SUPPORT
/* /*
* If the probe point starts with '%', * If the probe point starts with '%',

4
tools/perf/util/parse-events.l
View File

@ -315,13 +315,13 @@ r0x{num_raw_hex} { return str(yyscanner, PE_RAW); }
* are the same, so trailing context can be used disambiguate the two * are the same, so trailing context can be used disambiguate the two
* cases. * cases.
*/ */
":"/{modifier_bp} { return str(yyscanner, PE_BP_COLON); } ":"/{modifier_bp} { return PE_BP_COLON; }
/* /*
* The slash before memory length can get mixed up with the slash before * The slash before memory length can get mixed up with the slash before
* config terms. Fortunately config terms do not start with a numeric * config terms. Fortunately config terms do not start with a numeric
* digit, so trailing context can be used disambiguate the two cases. * digit, so trailing context can be used disambiguate the two cases.
*/ */
"/"/{digit} { return str(yyscanner, PE_BP_SLASH); } "/"/{digit} { return PE_BP_SLASH; }
"/"/{non_digit} { BEGIN(config); return '/'; } "/"/{non_digit} { BEGIN(config); return '/'; }
{num_dec} { return value(yyscanner, 10); } {num_dec} { return value(yyscanner, 10); }
{num_hex} { return value(yyscanner, 16); } {num_hex} { return value(yyscanner, 16); }

9
tools/perf/util/parse-events.y
View File

@ -80,8 +80,6 @@ static void free_list_evsel(struct list_head* list_evsel)
%type <str> PE_LEGACY_CACHE %type <str> PE_LEGACY_CACHE
%type <str> PE_MODIFIER_EVENT %type <str> PE_MODIFIER_EVENT
%type <str> PE_MODIFIER_BP %type <str> PE_MODIFIER_BP
%type <str> PE_BP_COLON
%type <str> PE_BP_SLASH
%type <str> PE_EVENT_NAME %type <str> PE_EVENT_NAME
%type <str> PE_KERNEL_PMU_EVENT PE_PMU_EVENT_FAKE %type <str> PE_KERNEL_PMU_EVENT PE_PMU_EVENT_FAKE
%type <str> PE_DRV_CFG_TERM %type <str> PE_DRV_CFG_TERM
@ -510,9 +508,6 @@ PE_PREFIX_MEM PE_VALUE PE_BP_SLASH PE_VALUE PE_BP_COLON PE_MODIFIER_BP opt_event
struct list_head *list; struct list_head *list;
int err; int err;
parse_events_unused_value(&$3);
parse_events_unused_value(&$5);
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
err = parse_events_add_breakpoint(_parse_state, list, err = parse_events_add_breakpoint(_parse_state, list,
@ -531,8 +526,6 @@ PE_PREFIX_MEM PE_VALUE PE_BP_SLASH PE_VALUE opt_event_config
struct list_head *list; struct list_head *list;
int err; int err;
parse_events_unused_value(&$3);
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
err = parse_events_add_breakpoint(_parse_state, list, err = parse_events_add_breakpoint(_parse_state, list,
@ -550,8 +543,6 @@ PE_PREFIX_MEM PE_VALUE PE_BP_COLON PE_MODIFIER_BP opt_event_config
struct list_head *list; struct list_head *list;
int err; int err;
parse_events_unused_value(&$3);
list = alloc_list(); list = alloc_list();
ABORT_ON(!list); ABORT_ON(!list);
err = parse_events_add_breakpoint(_parse_state, list, err = parse_events_add_breakpoint(_parse_state, list,