perf tools: Fix event's PMU name parsing
Jin Yao reported parser error for software event:
# perf stat -e software/r1a/ -a -- sleep 1
event syntax error: 'software/r1a/'
\___ parser error
This happens after commit 8c3b1ba0e7 ("drm/i915/gt: Track the
overall awake/busy time"), where new software-gt-awake-time event's
non-pmu-event-style makes event parser conflict with software PMU.
If we allow PE_PMU_EVENT_PRE to be parsed as PMU name, we fix the
conflict and the following character '/' for PMU or '-' for
non-pmu-event-style event allows parser to decide what even is
specified.
Fixes: 8c3b1ba0e7 ("drm/i915/gt: Track the overall awake/busy time")
Reported-by: Jin Yao <yao.jin@linux.intel.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ian Rogers <irogers@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20210301122315.63471-1-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
36bc511f63
commit
84ea603650
|
|
@ -89,6 +89,7 @@ static void inc_group_count(struct list_head *list,
|
|||
%type <str> PE_EVENT_NAME
|
||||
%type <str> PE_PMU_EVENT_PRE PE_PMU_EVENT_SUF PE_KERNEL_PMU_EVENT PE_PMU_EVENT_FAKE
|
||||
%type <str> PE_DRV_CFG_TERM
|
||||
%type <str> event_pmu_name
|
||||
%destructor { free ($$); } <str>
|
||||
%type <term> event_term
|
||||
%destructor { parse_events_term__delete ($$); } <term>
|
||||
|
|
@ -272,8 +273,11 @@ event_def: event_pmu |
|
|||
event_legacy_raw sep_dc |
|
||||
event_bpf_file
|
||||
|
||||
event_pmu_name:
|
||||
PE_NAME | PE_PMU_EVENT_PRE
|
||||
|
||||
event_pmu:
|
||||
PE_NAME opt_pmu_config
|
||||
event_pmu_name opt_pmu_config
|
||||
{
|
||||
struct parse_events_state *parse_state = _parse_state;
|
||||
struct parse_events_error *error = parse_state->error;
|
||||
|
|
|
|||
Loading…
Reference in New Issue