From: Jeremy Linton <jeremy.linton@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: linux-acpi@vger.kernel.org, will.deacon@arm.com, mark.rutland@arm.com, punit.agrawal@arm.com, steve.capper@arm.com, msalter@redhat.com, mlangsdorf@redhat.com, linux@armlinux.org.uk Subject: [PATCH v12 5/7] arm64: pmu: Detect multiple generic PMUs and append counter Date: Tue, 10 Jan 2017 11:17:50 -0600 [thread overview] Message-ID: <1484068672-15852-6-git-send-email-jeremy.linton@arm.com> (raw) In-Reply-To: <1484068672-15852-1-git-send-email-jeremy.linton@arm.com> In heterogeneous CPU systems its likely that there are multiple PMU types. If a system is using the generic armv8_pmuv3 rather than a PMU with a hard-coded set of events then we want to uniquely identify each PMU in /sys. We do this by appending an "_x" to the pmu name. This then creates PMUs like, "armv8_pmuv3" and "armv8_pmuv3_1", "armv8_pmuv3_2" for a system with 3 PMU types. Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> --- arch/arm64/kernel/perf_event.c | 2 +- drivers/perf/arm_pmu.c | 20 ++++++++++++++++++++ include/linux/perf/arm_pmu.h | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 57ae9d9..0fbd7ef 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -1002,7 +1002,7 @@ static void armv8_pmu_init(struct arm_pmu *cpu_pmu) static int armv8_pmuv3_init(struct arm_pmu *cpu_pmu) { armv8_pmu_init(cpu_pmu); - cpu_pmu->name = "armv8_pmuv3"; + cpu_pmu->name = ARMV8_PMUV3_DESCRIPTION; cpu_pmu->map_event = armv8_pmuv3_map_event; cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] = &armv8_pmuv3_events_attr_group; diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 37e241f..85566f6 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -1035,6 +1035,7 @@ int arm_pmu_device_probe(struct platform_device *pdev, const struct of_device_id *of_table, const struct pmu_probe_info *probe_table) { + static int duplicate_pmus; const struct of_device_id *of_id; const int (*init_fn)(struct arm_pmu *); struct device_node *node = pdev->dev.of_node; @@ -1075,6 +1076,25 @@ int arm_pmu_device_probe(struct platform_device *pdev, goto out_free; } + /* + * if this pmu declaration is a generic pmu and we have + * previously found a generic pmu on this platform + * then append a PMU number to the pmu name. This avoids + * changing the names of PMUs that are specific to a class + * of CPUs. The assumption is that if we match a specific PMU + * then it's unique, and another PMU in the system will match + * a different entry rather than needing the _number to + * assure its unique. + */ + if (!strcmp(pmu->name, ARMV8_PMUV3_DESCRIPTION)) { + if (duplicate_pmus) { + pmu->name = kasprintf(GFP_KERNEL, "%s_%d", + pmu->name, duplicate_pmus); + if (!pmu->name) + goto out_free; + } + duplicate_pmus++; + } ret = cpu_pmu_init(pmu); if (ret) diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index df1ba55..42b5edb 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -161,6 +161,7 @@ int arm_pmu_device_probe(struct platform_device *pdev, const struct pmu_probe_info *probe_table); #define ARMV8_PMU_PDEV_NAME "armv8-pmu" +#define ARMV8_PMUV3_DESCRIPTION "armv8_pmuv3" #endif /* CONFIG_ARM_PMU */ -- 2.5.5
WARNING: multiple messages have this Message-ID (diff)
From: jeremy.linton@arm.com (Jeremy Linton) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v12 5/7] arm64: pmu: Detect multiple generic PMUs and append counter Date: Tue, 10 Jan 2017 11:17:50 -0600 [thread overview] Message-ID: <1484068672-15852-6-git-send-email-jeremy.linton@arm.com> (raw) In-Reply-To: <1484068672-15852-1-git-send-email-jeremy.linton@arm.com> In heterogeneous CPU systems its likely that there are multiple PMU types. If a system is using the generic armv8_pmuv3 rather than a PMU with a hard-coded set of events then we want to uniquely identify each PMU in /sys. We do this by appending an "_x" to the pmu name. This then creates PMUs like, "armv8_pmuv3" and "armv8_pmuv3_1", "armv8_pmuv3_2" for a system with 3 PMU types. Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> --- arch/arm64/kernel/perf_event.c | 2 +- drivers/perf/arm_pmu.c | 20 ++++++++++++++++++++ include/linux/perf/arm_pmu.h | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 57ae9d9..0fbd7ef 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -1002,7 +1002,7 @@ static void armv8_pmu_init(struct arm_pmu *cpu_pmu) static int armv8_pmuv3_init(struct arm_pmu *cpu_pmu) { armv8_pmu_init(cpu_pmu); - cpu_pmu->name = "armv8_pmuv3"; + cpu_pmu->name = ARMV8_PMUV3_DESCRIPTION; cpu_pmu->map_event = armv8_pmuv3_map_event; cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_EVENTS] = &armv8_pmuv3_events_attr_group; diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index 37e241f..85566f6 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -1035,6 +1035,7 @@ int arm_pmu_device_probe(struct platform_device *pdev, const struct of_device_id *of_table, const struct pmu_probe_info *probe_table) { + static int duplicate_pmus; const struct of_device_id *of_id; const int (*init_fn)(struct arm_pmu *); struct device_node *node = pdev->dev.of_node; @@ -1075,6 +1076,25 @@ int arm_pmu_device_probe(struct platform_device *pdev, goto out_free; } + /* + * if this pmu declaration is a generic pmu and we have + * previously found a generic pmu on this platform + * then append a PMU number to the pmu name. This avoids + * changing the names of PMUs that are specific to a class + * of CPUs. The assumption is that if we match a specific PMU + * then it's unique, and another PMU in the system will match + * a different entry rather than needing the _number to + * assure its unique. + */ + if (!strcmp(pmu->name, ARMV8_PMUV3_DESCRIPTION)) { + if (duplicate_pmus) { + pmu->name = kasprintf(GFP_KERNEL, "%s_%d", + pmu->name, duplicate_pmus); + if (!pmu->name) + goto out_free; + } + duplicate_pmus++; + } ret = cpu_pmu_init(pmu); if (ret) diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index df1ba55..42b5edb 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -161,6 +161,7 @@ int arm_pmu_device_probe(struct platform_device *pdev, const struct pmu_probe_info *probe_table); #define ARMV8_PMU_PDEV_NAME "armv8-pmu" +#define ARMV8_PMUV3_DESCRIPTION "armv8_pmuv3" #endif /* CONFIG_ARM_PMU */ -- 2.5.5
next prev parent reply other threads:[~2017-01-10 17:17 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-10 17:17 [PATCH v12 0/7] Enable PMUs in ACPI systems Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-10 17:17 ` [PATCH v12 1/7] arm64: Rename the common MADT parse routine Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-10 17:17 ` [PATCH v12 2/7] arm: arm64: Add routine to determine cpuid of other cpus Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-10 17:17 ` [PATCH v12 3/7] arm64: pmu: Cache PMU interrupt numbers from MADT parse Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-10 17:17 ` [PATCH v12 4/7] arm: arm64: pmu: Assign platform PMU CPU affinity Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton [this message] 2017-01-10 17:17 ` [PATCH v12 5/7] arm64: pmu: Detect multiple generic PMUs and append counter Jeremy Linton 2017-01-10 17:17 ` [PATCH v12 6/7] arm64: pmu: Detect and enable multiple PMUs in an ACPI system Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-16 18:28 ` Lorenzo Pieralisi 2017-01-16 18:28 ` Lorenzo Pieralisi 2017-01-17 19:57 ` Jeremy Linton 2017-01-17 19:57 ` Jeremy Linton 2017-01-10 17:17 ` [PATCH v12 7/7] arm: pmu: Add PMU definitions for cores not initially online Jeremy Linton 2017-01-10 17:17 ` Jeremy Linton 2017-01-14 9:00 ` [PATCH v12 0/7] Enable PMUs in ACPI systems Bamvor Zhang 2017-01-14 9:00 ` Bamvor Zhang
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=1484068672-15852-6-git-send-email-jeremy.linton@arm.com \ --to=jeremy.linton@arm.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux@armlinux.org.uk \ --cc=mark.rutland@arm.com \ --cc=mlangsdorf@redhat.com \ --cc=msalter@redhat.com \ --cc=punit.agrawal@arm.com \ --cc=steve.capper@arm.com \ --cc=will.deacon@arm.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.