Skip to content

Commit 2246c24

Browse files
ZideChen0Peter Zijlstra
authored andcommitted
perf pmu: Relax uncore wildcard matching to allow numeric suffix
Diamond Rapids introduces two types of PCIe related uncore PMUs: "uncore_pcie4_*" and "uncore_pcie6_*". To ensure that generic PCIe events (e.g., UNC_PCIE_CLOCKTICKS) can match and collect events from both PMU types, slightly relax the wildcard matching logic in perf_pmu__match_wildcard(). This change allows a wildcard such as "pcie" to match PMU names that include a numeric suffix, such as "pcie4_*" and "pcie6_*". Co-developed-by: Dapeng Mi <dapeng1.mi@linux.intel.com> Signed-off-by: Dapeng Mi <dapeng1.mi@linux.intel.com> Signed-off-by: Zide Chen <zide.chen@intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Dapeng Mi <dapeng1.mi@linux.intel.com> Link: https://patch.msgid.link/20251231224233.113839-12-zide.chen@intel.com
1 parent 171b529 commit 2246c24

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

tools/perf/util/pmu.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -939,6 +939,7 @@ static bool perf_pmu__match_wildcard(const char *pmu_name, const char *tok)
939939
{
940940
const char *p, *suffix;
941941
bool has_hex = false;
942+
bool has_underscore = false;
942943
size_t tok_len = strlen(tok);
943944

944945
/* Check start of pmu_name for equality. */
@@ -949,13 +950,14 @@ static bool perf_pmu__match_wildcard(const char *pmu_name, const char *tok)
949950
if (*p == 0)
950951
return true;
951952

952-
if (*p == '_') {
953-
++p;
954-
++suffix;
955-
}
956-
957-
/* Ensure we end in a number */
953+
/* Ensure we end in a number or a mix of number and "_". */
958954
while (1) {
955+
if (!has_underscore && (*p == '_')) {
956+
has_underscore = true;
957+
++p;
958+
++suffix;
959+
}
960+
959961
if (!isxdigit(*p))
960962
return false;
961963
if (!has_hex)

0 commit comments

Comments
 (0)