From: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Will.Deacon@arm.com, catalin.marinas@arm.com, mark.rutland@arm.com, acme@kernel.org, alexander.shishkin@linux.intel.com, peterz@infradead.org, mingo@redhat.com, jnair@caviumnetworks.com, zhangshaokun@hisilicon.com, Jonathan.Cameron@huawei.com, Robert.Richter@cavium.com, gklkml16@gmail.com Subject: [PATCH v9 3/5] perf utils: use pmu->is_uncore to detect PMU UNCORE devices Date: Tue, 17 Oct 2017 00:02:20 +0530 [thread overview] Message-ID: <20171016183222.25750-4-ganapatrao.kulkarni@cavium.com> (raw) In-Reply-To: <20171016183222.25750-1-ganapatrao.kulkarni@cavium.com> PMU CORE devices are identified using sysfs filename cpu, however on some platforms(like arm/arm64), PMU CORE sysfs name is not cpu. Hence cpu cannot be used to differentiate PMU CORE/UNCORE devices. commit: 66ec1191 ("perf pmu: Unbreak perf record for arm/arm64 with events with explicit PMU") has introduced pmu->is_uncore, which is set to PMU UNCORE devices only. Adding changes to use pmu->is_uncore to identify UNCORE devices. Acked-by: Will Deacon <will.deacon@arm.com> Tested-by: Shaokun Zhang <zhangshaokun@hisilicon.com> Signed-off-by: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com> --- tools/perf/util/pmu.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 8b17db5..9110718 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -603,7 +603,6 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu) */ i = 0; while (1) { - const char *pname; pe = &map->table[i++]; if (!pe->name) { @@ -612,9 +611,13 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu) break; } - pname = pe->pmu ? pe->pmu : "cpu"; - if (strncmp(pname, name, strlen(pname))) - continue; + if (pmu->is_uncore) { + /* check for uncore devices */ + if (pe->pmu == NULL) + continue; + if (strncmp(pe->pmu, name, strlen(pe->pmu))) + continue; + } /* need type casts to override 'const' */ __perf_pmu__new_alias(head, NULL, (char *)pe->name, -- 2.9.4
WARNING: multiple messages have this Message-ID (diff)
From: ganapatrao.kulkarni@cavium.com (Ganapatrao Kulkarni) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v9 3/5] perf utils: use pmu->is_uncore to detect PMU UNCORE devices Date: Tue, 17 Oct 2017 00:02:20 +0530 [thread overview] Message-ID: <20171016183222.25750-4-ganapatrao.kulkarni@cavium.com> (raw) In-Reply-To: <20171016183222.25750-1-ganapatrao.kulkarni@cavium.com> PMU CORE devices are identified using sysfs filename cpu, however on some platforms(like arm/arm64), PMU CORE sysfs name is not cpu. Hence cpu cannot be used to differentiate PMU CORE/UNCORE devices. commit: 66ec1191 ("perf pmu: Unbreak perf record for arm/arm64 with events with explicit PMU") has introduced pmu->is_uncore, which is set to PMU UNCORE devices only. Adding changes to use pmu->is_uncore to identify UNCORE devices. Acked-by: Will Deacon <will.deacon@arm.com> Tested-by: Shaokun Zhang <zhangshaokun@hisilicon.com> Signed-off-by: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com> --- tools/perf/util/pmu.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 8b17db5..9110718 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -603,7 +603,6 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu) */ i = 0; while (1) { - const char *pname; pe = &map->table[i++]; if (!pe->name) { @@ -612,9 +611,13 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu) break; } - pname = pe->pmu ? pe->pmu : "cpu"; - if (strncmp(pname, name, strlen(pname))) - continue; + if (pmu->is_uncore) { + /* check for uncore devices */ + if (pe->pmu == NULL) + continue; + if (strncmp(pe->pmu, name, strlen(pe->pmu))) + continue; + } /* need type casts to override 'const' */ __perf_pmu__new_alias(head, NULL, (char *)pe->name, -- 2.9.4
next prev parent reply other threads:[~2017-10-16 18:33 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-10-16 18:32 [PATCH v9 0/5] Add support for ThunderX2 pmu events using json files Ganapatrao Kulkarni 2017-10-16 18:32 ` Ganapatrao Kulkarni 2017-10-16 18:32 ` [PATCH v9 1/5] perf utils: passing pmu as a parameter to function get_cpuid_str Ganapatrao Kulkarni 2017-10-16 18:32 ` Ganapatrao Kulkarni 2017-12-06 16:38 ` [tip:perf/core] perf pmu: Pass pmu as a parameter to get_cpuid_str() tip-bot for Ganapatrao Kulkarni 2017-10-16 18:32 ` [PATCH v9 2/5] perf tools arm64: Add support for get_cpuid_str function Ganapatrao Kulkarni 2017-10-16 18:32 ` Ganapatrao Kulkarni 2017-12-06 16:39 ` [tip:perf/core] " tip-bot for Ganapatrao Kulkarni 2017-10-16 18:32 ` Ganapatrao Kulkarni [this message] 2017-10-16 18:32 ` [PATCH v9 3/5] perf utils: use pmu->is_uncore to detect PMU UNCORE devices Ganapatrao Kulkarni 2017-12-05 2:12 ` Jin, Yao 2017-12-05 2:12 ` Jin, Yao 2017-12-05 7:12 ` Ganapatrao Kulkarni 2017-12-05 7:12 ` Ganapatrao Kulkarni 2017-12-05 7:23 ` Jin, Yao 2017-12-05 7:23 ` Jin, Yao 2017-12-05 12:35 ` Jin, Yao 2017-12-05 12:35 ` Jin, Yao 2017-12-05 13:56 ` Arnaldo Carvalho de Melo 2017-12-05 13:56 ` Arnaldo Carvalho de Melo 2017-12-05 14:02 ` Ganapatrao Kulkarni 2017-12-05 14:02 ` Ganapatrao Kulkarni 2017-12-05 18:42 ` Arnaldo Carvalho de Melo 2017-12-05 18:42 ` Arnaldo Carvalho de Melo 2017-12-06 0:30 ` Jin, Yao 2017-12-06 0:30 ` Jin, Yao 2017-12-06 13:47 ` Arnaldo Carvalho de Melo 2017-12-06 13:47 ` Arnaldo Carvalho de Melo 2017-12-07 0:49 ` Jin, Yao 2017-12-07 0:49 ` Jin, Yao 2017-12-05 13:58 ` Arnaldo Carvalho de Melo 2017-12-05 13:58 ` Arnaldo Carvalho de Melo 2017-10-16 18:32 ` [PATCH v9 4/5] perf vendor events arm64: Add ThunderX2 implementation defined pmu core events Ganapatrao Kulkarni 2017-10-16 18:32 ` Ganapatrao Kulkarni 2017-12-06 16:39 ` [tip:perf/core] " tip-bot for Ganapatrao Kulkarni 2017-10-16 18:32 ` [PATCH v9 5/5] perf utils: add check for valid cpuid in function perf_pmu__find_map Ganapatrao Kulkarni 2017-10-16 18:32 ` Ganapatrao Kulkarni 2017-12-06 16:40 ` [tip:perf/core] perf pmu: Add check for valid cpuid in perf_pmu__find_map() tip-bot for Ganapatrao Kulkarni 2017-10-18 17:49 ` [PATCH v9 0/5] Add support for ThunderX2 pmu events using json files Ganapatrao Kulkarni 2017-10-18 17:49 ` Ganapatrao Kulkarni 2017-11-06 9:01 ` John Garry 2017-11-06 9:01 ` John Garry 2017-11-07 1:23 ` Will Deacon 2017-11-07 1:23 ` Will Deacon 2017-11-27 10:04 ` John Garry 2017-11-27 10:04 ` John Garry 2017-12-04 4:41 ` Ganapatrao Kulkarni 2017-12-04 4:41 ` Ganapatrao Kulkarni 2017-12-04 15:09 ` Arnaldo Carvalho de Melo 2017-12-04 15:09 ` Arnaldo Carvalho de Melo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20171016183222.25750-4-ganapatrao.kulkarni@cavium.com \ --to=ganapatrao.kulkarni@cavium.com \ --cc=Jonathan.Cameron@huawei.com \ --cc=Robert.Richter@cavium.com \ --cc=Will.Deacon@arm.com \ --cc=acme@kernel.org \ --cc=alexander.shishkin@linux.intel.com \ --cc=catalin.marinas@arm.com \ --cc=gklkml16@gmail.com \ --cc=jnair@caviumnetworks.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mingo@redhat.com \ --cc=peterz@infradead.org \ --cc=zhangshaokun@hisilicon.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.