62 lines
2.1 KiB
Diff
62 lines
2.1 KiB
Diff
From 305bfee3d03a50055518a3831a790798fee0bd7f Mon Sep 17 00:00:00 2001
|
|
From: Ian Rogers <irogers@google.com>
|
|
Date: Fri, 1 May 2020 10:33:22 -0700
|
|
Subject: [PATCH 071/201] perf expr: Allow for unlimited escaped characters in
|
|
a symbol
|
|
|
|
mainline inclusion
|
|
from mainline-v5.8-rc1
|
|
commit 5b3141d02645a36ccf9f08a67e08e8186dfef12c
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5b3141d02645a36ccf9f08a67e08e8186dfef12c
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Current expression allows 2 escaped '-,=' characters. However, some
|
|
metrics require more, for example Haswell DRAM_BW_Use.
|
|
|
|
Fixes: 26226a97724d (perf expr: Move expr lexer to flex)
|
|
Signed-off-by: Ian Rogers <irogers@google.com>
|
|
Acked-by: Jiri Olsa <jolsa@redhat.com>
|
|
Tested-by: Kajol Jain <kjain@linux.ibm.com>
|
|
Cc: Adrian Hunter <adrian.hunter@intel.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Haiyan Song <haiyanx.song@intel.com>
|
|
Cc: Jin Yao <yao.jin@linux.intel.com>
|
|
Cc: John Garry <john.garry@huawei.com>
|
|
Cc: Kan Liang <kan.liang@linux.intel.com>
|
|
Cc: Leo Yan <leo.yan@linaro.org>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Paul Clarke <pc@us.ibm.com>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
|
|
Cc: Song Liu <songliubraving@fb.com>
|
|
Cc: Stephane Eranian <eranian@google.com>
|
|
Link: http://lore.kernel.org/lkml/20200501173333.227162-2-irogers@google.com
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/util/expr.l | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l
|
|
index 74b9b59b1aa5..73db6a9ef97e 100644
|
|
--- a/tools/perf/util/expr.l
|
|
+++ b/tools/perf/util/expr.l
|
|
@@ -86,7 +86,7 @@ number [0-9]+
|
|
sch [-,=]
|
|
spec \\{sch}
|
|
sym [0-9a-zA-Z_\.:@?]+
|
|
-symbol {spec}*{sym}*{spec}*{sym}*{spec}*{sym}
|
|
+symbol ({spec}|{sym})+
|
|
|
|
%%
|
|
struct expr_scanner_ctx *sctx = expr_get_extra(yyscanner);
|
|
--
|
|
2.27.0
|
|
|