From nobody Wed Dec 17 06:31:53 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9F92B1B143E; Mon, 17 Jun 2024 13:44:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718631880; cv=none; b=IJiQ4XSltteBTJPoEkuny96lwosuwHVs3/QOGsyPAl+fEtn5xzc8EOyabIgW3v0ASXHmB216y9SZjC96e3XZrXhLamc1gHj51nLFKQ7NBu7g+9cDt5xY9R9l2XTYvxtJDv2qNKhoVd8HSKhjUK7GriojrskzfOdKR+qsYs/XgWY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718631880; c=relaxed/simple; bh=3cC+4+y8xB1j+0LO1Zw8OHDfYwPSnBW9fkPoMBdyqPo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lf9L3TW5YEoos5fQcIsnblzd/N7MCWlCUZksu9ucLmZivhmQiE9TzQ1ZSmJ9s9GEVAiDTCKFBSj61PI942/g85juZVKnU8uKq5kauK3XiS69qVjdm8aQ6g6ZxwkMka6jjNoWgk+2kt6/hB971J4HN2Auv7M9IVb+o/0UV+tgAwA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C751EFEC; Mon, 17 Jun 2024 06:45:02 -0700 (PDT) Received: from e127643.broadband (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E603C3F64C; Mon, 17 Jun 2024 06:44:33 -0700 (PDT) From: James Clark To: linux-perf-users@vger.kernel.org, irogers@google.com, robin.murphy@arm.com Cc: James Clark , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , "Liang, Kan" , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] perf pmu: Restore full PMU name wildcard support Date: Mon, 17 Jun 2024 14:43:44 +0100 Message-Id: <20240617134348.208241-2-james.clark@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240617134348.208241-1-james.clark@arm.com> References: <20240617134348.208241-1-james.clark@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Commit b2b9d3a3f021 ("perf pmu: Support wildcards on pmu name in dynamic pmu events") gives the following example for wildcarding a subset of PMUs: E.g., in a system with the following dynamic pmus: mypmu_0 mypmu_1 mypmu_2 mypmu_4 perf stat -e mypmu_[01]// Since commit f91fa2ae6360 ("perf pmu: Refactor perf_pmu__match()"), only "*" has been supported, removing the ability to subset PMUs, even though parse-events.l still supports ? and [] characters. Fix it by using fnmatch() when any glob character is detected and add a test which covers that and other scenarios of perf_pmu__match_ignoring_suffix(). Fixes: f91fa2ae6360 ("perf pmu: Refactor perf_pmu__match()") Signed-off-by: James Clark --- tools/perf/tests/pmu.c | 78 ++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/pmu.c | 2 +- 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/tools/perf/tests/pmu.c b/tools/perf/tests/pmu.c index cc88b5920c3e..fd07331b2d6e 100644 --- a/tools/perf/tests/pmu.c +++ b/tools/perf/tests/pmu.c @@ -437,12 +437,90 @@ static int test__name_cmp(struct test_suite *test __m= aybe_unused, int subtest __ return TEST_OK; } =20 +/** + * Test perf_pmu__match() that's used to search for a PMU given a name pas= sed + * on the command line. The name that's passed may also be a filename type= glob + * match. + */ +static int test__pmu_match(struct test_suite *test __maybe_unused, int sub= test __maybe_unused) +{ + struct perf_pmu test_pmu; + + test_pmu.name =3D "pmuname"; + TEST_ASSERT_EQUAL("Exact match", perf_pmu__match(&test_pmu, "pmuname"), = true); + TEST_ASSERT_EQUAL("Longer token", perf_pmu__match(&test_pmu, "longertoken= "), false); + TEST_ASSERT_EQUAL("Shorter token", perf_pmu__match(&test_pmu, "pmu"), = false); + + test_pmu.name =3D "pmuname_10"; + TEST_ASSERT_EQUAL("Diff suffix_", perf_pmu__match(&test_pmu, "pmuname_2")= , false); + TEST_ASSERT_EQUAL("Sub suffix_", perf_pmu__match(&test_pmu, "pmuname_1")= , true); + TEST_ASSERT_EQUAL("Same suffix_", perf_pmu__match(&test_pmu, "pmuname_10"= ), true); + TEST_ASSERT_EQUAL("No suffix_", perf_pmu__match(&test_pmu, "pmuname"), = true); + TEST_ASSERT_EQUAL("Underscore_", perf_pmu__match(&test_pmu, "pmuname_"),= true); + TEST_ASSERT_EQUAL("Substring_", perf_pmu__match(&test_pmu, "pmuna"), = false); + + test_pmu.name =3D "pmuname_ab23"; + TEST_ASSERT_EQUAL("Diff suffix hex_", perf_pmu__match(&test_pmu, "pmuname= _2"), false); + TEST_ASSERT_EQUAL("Sub suffix hex_", perf_pmu__match(&test_pmu, "pmuname= _ab"), true); + TEST_ASSERT_EQUAL("Same suffix hex_", perf_pmu__match(&test_pmu, "pmuname= _ab23"), true); + TEST_ASSERT_EQUAL("No suffix hex_", perf_pmu__match(&test_pmu, "pmuname= "), true); + TEST_ASSERT_EQUAL("Underscore hex_", perf_pmu__match(&test_pmu, "pmuname= _"), true); + TEST_ASSERT_EQUAL("Substring hex_", perf_pmu__match(&test_pmu, "pmuna")= , false); + + test_pmu.name =3D "pmuname10"; + TEST_ASSERT_EQUAL("Diff suffix", perf_pmu__match(&test_pmu, "pmuname2"), = false); + TEST_ASSERT_EQUAL("Sub suffix", perf_pmu__match(&test_pmu, "pmuname1"), = true); + TEST_ASSERT_EQUAL("Same suffix", perf_pmu__match(&test_pmu, "pmuname10"),= true); + TEST_ASSERT_EQUAL("No suffix", perf_pmu__match(&test_pmu, "pmuname"), = true); + TEST_ASSERT_EQUAL("Underscore", perf_pmu__match(&test_pmu, "pmuname_"), = false); + TEST_ASSERT_EQUAL("Substring", perf_pmu__match(&test_pmu, "pmuna"), = false); + + test_pmu.name =3D "pmunameab23"; + TEST_ASSERT_EQUAL("Diff suffix hex", perf_pmu__match(&test_pmu, "pmuname2= "), false); + TEST_ASSERT_EQUAL("Sub suffix hex", perf_pmu__match(&test_pmu, "pmunamea= b"), true); + TEST_ASSERT_EQUAL("Same suffix hex", perf_pmu__match(&test_pmu, "pmunamea= b23"), true); + TEST_ASSERT_EQUAL("No suffix hex", perf_pmu__match(&test_pmu, "pmuname"= ), true); + TEST_ASSERT_EQUAL("Underscore hex", perf_pmu__match(&test_pmu, "pmuname_= "), false); + TEST_ASSERT_EQUAL("Substring hex", perf_pmu__match(&test_pmu, "pmuna"),= false); + + /* + * 2 hex chars or less are not considered suffixes so it shouldn't be + * possible to wildcard by skipping the suffix. Therefore there are more + * false results here than above. + */ + test_pmu.name =3D "pmuname_a3"; + TEST_ASSERT_EQUAL("Diff suffix 2 hex_", perf_pmu__match(&test_pmu, "pmuna= me_2"), false); + /* + * This one should be false, but because pmuname_a3 ends in 3 which is + * decimal, it's not possible to determine if it's a short hex suffix or + * a normal decimal suffix following text. And we want to match on any + * length of decimal suffix. Run the test anyway and expect the wrong + * result. And slightly fuzzy matching shouldn't do too much harm. + */ + TEST_ASSERT_EQUAL("Sub suffix 2 hex_", perf_pmu__match(&test_pmu, "pmuna= me_a"), true); + TEST_ASSERT_EQUAL("Same suffix 2 hex_", perf_pmu__match(&test_pmu, "pmuna= me_a3"), true); + TEST_ASSERT_EQUAL("No suffix 2 hex_", perf_pmu__match(&test_pmu, "pmuna= me"), false); + TEST_ASSERT_EQUAL("Underscore 2 hex_", perf_pmu__match(&test_pmu, "pmuna= me_"), false); + TEST_ASSERT_EQUAL("Substring 2 hex_", perf_pmu__match(&test_pmu, "pmuna= "), false); + + test_pmu.name =3D "pmuname_5"; + TEST_ASSERT_EQUAL("Glob 1", perf_pmu__match(&test_pmu, "pmu*"), true); + TEST_ASSERT_EQUAL("Glob 2", perf_pmu__match(&test_pmu, "nomatch*"), fa= lse); + TEST_ASSERT_EQUAL("Seq 1", perf_pmu__match(&test_pmu, "pmuname_[12345]")= , true); + TEST_ASSERT_EQUAL("Seq 2", perf_pmu__match(&test_pmu, "pmuname_[67890]")= , false); + TEST_ASSERT_EQUAL("? 1", perf_pmu__match(&test_pmu, "pmuname_?"), t= rue); + TEST_ASSERT_EQUAL("? 2", perf_pmu__match(&test_pmu, "pmuname_1?"), = false); + + return TEST_OK; +} + static struct test_case tests__pmu[] =3D { TEST_CASE("Parsing with PMU format directory", pmu_format), TEST_CASE("Parsing with PMU event", pmu_events), TEST_CASE("PMU event names", pmu_event_names), TEST_CASE("PMU name combining", name_len), TEST_CASE("PMU name comparison", name_cmp), + TEST_CASE("PMU cmdline match", pmu_match), { .name =3D NULL, } }; =20 diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index c94a91645b21..97d74fe6d816 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -2150,7 +2150,7 @@ void perf_pmu__warn_invalid_config(struct perf_pmu *p= mu, __u64 config, bool perf_pmu__match(const struct perf_pmu *pmu, const char *tok) { const char *name =3D pmu->name; - bool need_fnmatch =3D strchr(tok, '*') !=3D NULL; + bool need_fnmatch =3D strisglob(tok); =20 if (!strncmp(tok, "uncore_", 7)) tok +=3D 7; --=20 2.34.1 From nobody Wed Dec 17 06:31:53 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C67C21B1500; Mon, 17 Jun 2024 13:44:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718631885; cv=none; b=M/eYuPBkwzjUtrz9wS69NQ4aOJF+IN4ZXsmFDtpc5YsZ/MIbjSV0Lhduc2Rt1CDB3y/MbnfUEvyIq/01+IiyXFQpyyZ2S6Vh3sVmRgRvfEQus+uQETIA3eKHEcB6xWwkXBprcQmiBS4ULvNVHjceOXF1yzg+8f1uXh2sZpvtcEs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718631885; c=relaxed/simple; bh=Gsnd0zvN4Us9YUc6L20+5iLhVWMkT+Vfavnt0sxap00=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=L4KMd4wLGTBPRQb4BvzEVUiYBFuj9tJ1YIshLMLyFQnC2Ba77FP3uvRmRrzauIw8s1mGoNuDa1ULL2D63avVjzOu8sRgM6EYeT5Jtp/pXvhbSZ+Wx3euMhKnsGcaKYos8WYPFcImn1yIByZNItxw7PjKSBNST7ZyWkeSNbkevyw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D1E2FDA7; Mon, 17 Jun 2024 06:45:07 -0700 (PDT) Received: from e127643.broadband (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id AA0683F64C; Mon, 17 Jun 2024 06:44:40 -0700 (PDT) From: James Clark To: linux-perf-users@vger.kernel.org, irogers@google.com, robin.murphy@arm.com Cc: James Clark , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , "Liang, Kan" , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] perf pmu: Don't de-duplicate core PMUs Date: Mon, 17 Jun 2024 14:43:45 +0100 Message-Id: <20240617134348.208241-3-james.clark@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240617134348.208241-1-james.clark@arm.com> References: <20240617134348.208241-1-james.clark@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Arm PMUs have a suffix, either a single decimal (armv8_pmuv3_0) or 3 hex digits which (armv8_cortex_a53) which Perf assumes are both strippable suffixes for the purposes of deduplication. S390 "cpum_cf" is a similarly suffixed core PMU but is only two characters so is not treated as strippable because the rules are a minimum of 3 hex characters or 1 decimal character. There are two paths involved in listing PMU events: * HW/cache event printing assumes core PMUs don't have suffixes so doesn't try to strip. * Sysfs PMU events share the printing function with uncore PMUs which strips. This results in slightly inconsistent Perf list behavior if a core PMU has a suffix: # perf list ... armv8_pmuv3_0/branch-load-misses/ armv8_pmuv3/l3d_cache_wb/ [Kernel PMU event] ... Fix it by partially reverting back to the old list behavior where stripping was only done for uncore PMUs. For example commit 8d9f5146f5da ("perf pmus: Sort pmus by name then suffix") mentions that only PMUs starting 'uncore_' are considered to have a potential suffix. This change doesn't go back that far, but does only strip PMUs that are !is_core. This keeps the desirable behavior where the many possibly duplicated uncore PMUs aren't repeated, but it doesn't break listing for core PMUs. Searching for a PMU continues to use the new stripped comparison functions, meaning that it's still possible to request an event by specifying the common part of a PMU name, or even open events on multiple similarly named PMUs. For example: # perf stat -e armv8_cortex/inst_retired/ 5777173628 armv8_cortex_a53/inst_retired/ (99.93%) 7469626951 armv8_cortex_a57/inst_retired/ (49.88%) Fixes: 3241d46f5f54 ("perf pmus: Sort/merge/aggregate PMUs like mrvl_ddr_pm= u") Signed-off-by: James Clark --- tools/perf/util/pmu.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 97d74fe6d816..b73946ba9d05 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -847,6 +847,22 @@ __weak const struct pmu_metrics_table *pmu_metrics_tab= le__find(void) return perf_pmu__find_metrics_table(NULL); } =20 +/** + * Return the length of the PMU name not including the suffix for uncore P= MUs. + * + * We want to deduplicate many similar uncore PMUs by stripping their suff= ixes, + * but there are never going to be too many core PMUs and the suffixes mig= ht be + * interesting. "arm_cortex_a53" vs "arm_cortex_a57" or "cpum_cf" for exam= ple. + * + * @skip_duplicate_pmus: False in verbose mode so all uncore PMUs are visi= ble + */ +static size_t pmu_deduped_name_len(const struct perf_pmu *pmu, bool skip_d= uplicate_pmus) +{ + return skip_duplicate_pmus && !pmu->is_core + ? pmu_name_len_no_suffix(pmu->name) + : strlen(pmu->name); +} + /** * perf_pmu__match_ignoring_suffix - Does the pmu_name match tok ignoring = any * trailing suffix? The Suffix must be i= n form @@ -1796,9 +1812,7 @@ static char *format_alias(char *buf, int len, const s= truct perf_pmu *pmu, const struct perf_pmu_alias *alias, bool skip_duplicate_pmus) { struct parse_events_term *term; - size_t pmu_name_len =3D skip_duplicate_pmus - ? pmu_name_len_no_suffix(pmu->name) - : strlen(pmu->name); + size_t pmu_name_len =3D pmu_deduped_name_len(pmu, skip_duplicate_pmus); int used =3D snprintf(buf, len, "%.*s/%s", (int)pmu_name_len, pmu->name, = alias->name); =20 list_for_each_entry(term, &alias->terms.terms, list) { @@ -1839,9 +1853,7 @@ int perf_pmu__for_each_event(struct perf_pmu *pmu, bo= ol skip_duplicate_pmus, size_t buf_used, pmu_name_len; =20 info.pmu_name =3D event->pmu_name ?: pmu->name; - pmu_name_len =3D skip_duplicate_pmus - ? pmu_name_len_no_suffix(info.pmu_name) - : strlen(info.pmu_name); + pmu_name_len =3D pmu_deduped_name_len(pmu, skip_duplicate_pmus); info.alias =3D NULL; if (event->desc) { info.name =3D event->name; --=20 2.34.1