Messages in this thread Patch in this message | | | From | Jin Yao <> | Subject | [PATCH] perf pmu: Create x86 specific perf_pmu__valid_suffix | Date | Tue, 20 Jul 2021 16:20:44 +0800 |
| |
The commit c47a5599eda3 ("perf tools: Fix pattern matching for same substring in different PMU type") breaks arm64 system because it assumes the first token must be followed by a '_', but it is possibly a numeric on arm64.
For example, perf_pmu__valid_suffix("hisi_sccl3_l3c7", "hisi_sccl") fails. "hisi_sccl3_l3c7" is pmu name and "hisi_sccl" is token. "hisi_sccl" is followed by a digit but not followed by a '_' ('3' in this example).
Since the PMU alias format on arm64 has difference than the format on x86. Create a x86 specific perf_pmu__valid_suffix. For other arch, the weak function always returns true to keep original behavior unchanged.
Fixes: c47a5599eda3 ("perf tools: Fix pattern matching for same substring in different PMU type") Signed-off-by: Jin Yao <yao.jin@linux.intel.com> Reported-by: John Garry <john.garry@huawei.com> --- tools/perf/arch/x86/util/pmu.c | 22 ++++++++++++++++++++++ tools/perf/util/pmu.c | 27 ++++++--------------------- tools/perf/util/pmu.h | 1 + 3 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c index d48d608517fd..519da0811308 100644 --- a/tools/perf/arch/x86/util/pmu.c +++ b/tools/perf/arch/x86/util/pmu.c @@ -3,6 +3,7 @@ #include <linux/stddef.h> #include <linux/perf_event.h> +#include <linux/ctype.h> #include "../../../util/intel-pt.h" #include "../../../util/intel-bts.h" @@ -18,3 +19,24 @@ struct perf_event_attr *perf_pmu__get_default_config(struct perf_pmu *pmu __mayb #endif return NULL; } + +bool perf_pmu__valid_suffix(char *pmu_name, char *tok) +{ + char *p; + + if (strncmp(pmu_name, tok, strlen(tok))) + return false; + + p = pmu_name + strlen(tok); + if (*p == 0) + return true; + + if (*p != '_') + return false; + + ++p; + if (*p == 0 || !isdigit(*p)) + return false; + + return true; +} diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 44b90d638ad5..a671b16f2d3e 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -742,27 +742,6 @@ struct pmu_events_map *__weak pmu_events_map__find(void) return perf_pmu__find_map(NULL); } -static bool perf_pmu__valid_suffix(char *pmu_name, char *tok) -{ - char *p; - - if (strncmp(pmu_name, tok, strlen(tok))) - return false; - - p = pmu_name + strlen(tok); - if (*p == 0) - return true; - - if (*p != '_') - return false; - - ++p; - if (*p == 0 || !isdigit(*p)) - return false; - - return true; -} - bool pmu_uncore_alias_match(const char *pmu_name, const char *name) { char *tmp = NULL, *tok, *str; @@ -1906,3 +1885,9 @@ int perf_pmu__match(char *pattern, char *name, char *tok) return 0; } + +bool __weak perf_pmu__valid_suffix(char *pmu_name __maybe_unused, + char *tok __maybe_unused) +{ + return true; +} diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 926da483a141..901812987b79 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -134,5 +134,6 @@ void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config, bool perf_pmu__has_hybrid(void); int perf_pmu__match(char *pattern, char *name, char *tok); +bool perf_pmu__valid_suffix(char *pmu_name, char *tok); #endif /* __PMU_H */ -- 2.17.1
| |