Commit 2246c244 authored by Zide Chen's avatar Zide Chen Committed by Peter Zijlstra
Browse files

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: default avatarDapeng Mi <dapeng1.mi@linux.intel.com>
Signed-off-by: default avatarDapeng Mi <dapeng1.mi@linux.intel.com>
Signed-off-by: default avatarZide Chen <zide.chen@intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarDapeng Mi <dapeng1.mi@linux.intel.com>
Link: https://patch.msgid.link/20251231224233.113839-12-zide.chen@intel.com
parent 171b5292

tools/perf/util/pmu.c

+8 −6
Original line number Diff line number Diff line
@@ -939,6 +939,7 @@ static bool perf_pmu__match_wildcard(const char *pmu_name, const char *tok) 
{

	const char *p, *suffix;

	bool has_hex = false;

	bool has_underscore = false;

	size_t tok_len = strlen(tok);



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

		return true;



	if (*p == '_') {

	/* Ensure we end in a number or a mix of number and "_". */

	while (1) {

		if (!has_underscore && (*p == '_')) {

			has_underscore = true;

			++p;

			++suffix;

		}



	/* Ensure we end in a number */

	while (1) {

		if (!isxdigit(*p))

			return false;

		if (!has_hex)