powerpc/perf: init pmu from core-book3s
PATCH v2 1/2 powerpc/perf: init pmu from core-book3s
Currenty pmu driver file for each ppc64 generation processor has a __init call in itself. Refactor the code by moving the __init call to core-books.c. This also clean's up compat mode pmu driver registration.
---
Changelog v1:
- Added "internal.h" file and moved the extern definitions to that file
arch/powerpc/perf/core-book3s.c | 28 ++++++++++++++++++++++++++++ arch/powerpc/perf/internal.h | 16 ++++++++++++++++ arch/powerpc/perf/power5+-pmu.c | 4 +--- arch/powerpc/perf/power5-pmu.c | 4 +--- arch/powerpc/perf/power6-pmu.c | 4 +--- arch/powerpc/perf/power7-pmu.c | 4 +--- arch/powerpc/perf/power8-pmu.c | 3 +-- arch/powerpc/perf/power9-pmu.c | 3 +-- arch/powerpc/perf/ppc970-pmu.c | 4 +--- 9 files changed, 51 insertions(+), 19 deletions(-) create mode 100644 arch/powerpc/perf/internal.h
arch/powerpc/perf/core-book3s.c +28 -0
@@ -22,6 +22,10 @@#include <asm/ptrace.h> #include <asm/code-patching.h> +#ifdef CONFIG_PPC64 +#include "internal.h" +#endif +#define BHRB_MAX_ENTRIES 32#define BHRB_TARGET 0x0000000000000002#define BHRB_PREDICTION 0x0000000000000001
@@ -2294,3 +2298,27 @@ int register_power_pmu(struct power_pmu *pmu) power_pmu_prepare_cpu, NULL);return 0 ; } + +#ifdef CONFIG_PPC64 +static int __init init_ppc64_pmu (void ) +{ +/* run through all the pmu drivers one at a time */ +if (!init_power5_pmu ()) +return 0 ; +else if (!init_power5p_pmu ()) +return 0 ; +else if (!init_power6_pmu ()) +return 0 ; +else if (!init_power7_pmu ()) +return 0 ; +else if (!init_power8_pmu ()) +return 0 ; +else if (!init_power9_pmu ()) +return 0 ; +else if (!init_ppc970_pmu ()) +return 0 ; +else +return -ENODEV ; +} +early_initcall (init_ppc64_pmu); +#endif
arch/powerpc/perf/internal.h new file +16 -0
@@ -0,0 +1,16 @@ +/* +* Copyright 2019 Madhavan Srinivasan, IBM Corporation. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version +* 2 of the License, or (at your option) any later version. +*/ + +extern int init_ppc970_pmu (void ); +extern int init_power5_pmu (void ); +extern int init_power5p_pmu (void ); +extern int init_power6_pmu (void ); +extern int init_power7_pmu (void ); +extern int init_power8_pmu (void ); +extern int init_power9_pmu (void );
arch/powerpc/perf/power5+-pmu.c +1 -3
@@ -677,7 +677,7 @@ static struct power_pmu power5p_pmu = { .cache_events = &power5p_cache_events, }; -static int __init init_power5p_pmu (void ) +int init_power5p_pmu (void ) { if (!cur_cpu_spec->oprofile_cpu_type || (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5+")
@@ -686,5 +686,3 @@ static int __init init_power5p_pmu(void)return register_power_pmu (&power5p_pmu); } - -early_initcall (init_power5p_pmu);
arch/powerpc/perf/power5-pmu.c +1 -3
@@ -618,7 +618,7 @@ static struct power_pmu power5_pmu = { .flags = PPMU_HAS_SSLOT, }; -static int __init init_power5_pmu (void ) +int init_power5_pmu (void ) {if (!cur_cpu_spec->oprofile_cpu_type ||strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power5" ))
@@ -626,5 +626,3 @@ static int __init init_power5_pmu(void)return register_power_pmu (&power5_pmu); } - -early_initcall (init_power5_pmu);
arch/powerpc/perf/power6-pmu.c +1 -3
@@ -540,7 +540,7 @@ static struct power_pmu power6_pmu = { .cache_events = &power6_cache_events, }; -static int __init init_power6_pmu (void ) +int init_power6_pmu (void ) {if (!cur_cpu_spec->oprofile_cpu_type ||strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power6" ))
@@ -548,5 +548,3 @@ static int __init init_power6_pmu(void)return register_power_pmu (&power6_pmu); } - -early_initcall (init_power6_pmu);
arch/powerpc/perf/power7-pmu.c +1 -3
@@ -445,7 +445,7 @@ static struct power_pmu power7_pmu = { .cache_events = &power7_cache_events, }; -static int __init init_power7_pmu (void ) +int init_power7_pmu (void ) {if (!cur_cpu_spec->oprofile_cpu_type ||strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power7" ))
@@ -456,5 +456,3 @@ static int __init init_power7_pmu(void)return register_power_pmu (&power7_pmu); } - -early_initcall (init_power7_pmu);
arch/powerpc/perf/power8-pmu.c +1 -2
@@ -379,7 +379,7 @@ static struct power_pmu power8_pmu = { .bhrb_nr = 32, }; -static int __init init_power8_pmu (void ) +int init_power8_pmu (void ) {int rc;
@@ -399,4 +399,3 @@ static int __init init_power8_pmu(void)return 0 ; } -early_initcall (init_power8_pmu);
arch/powerpc/perf/power9-pmu.c +1 -2
@@ -437,7 +437,7 @@ static struct power_pmu power9_pmu = { .bhrb_nr = 32, }; -static int __init init_power9_pmu (void ) +int init_power9_pmu (void ) {int rc =0 ;unsigned int pvr =mfspr (SPRN_PVR );
@@ -467,4 +467,3 @@ static int __init init_power9_pmu(void)return 0 ; } -early_initcall (init_power9_pmu);
arch/powerpc/perf/ppc970-pmu.c +1 -3
@@ -490,7 +490,7 @@ static struct power_pmu ppc970_pmu = { .flags = PPMU_NO_SIPR | PPMU_NO_CONT_SAMPLING, }; -static int __init init_ppc970_pmu (void ) +int init_ppc970_pmu (void ) { if (!cur_cpu_spec->oprofile_cpu_type || (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/970")
@@ -499,5 +499,3 @@ static int __init init_ppc970_pmu(void)return register_power_pmu (&ppc970_pmu); } - -early_initcall (init_ppc970_pmu);
Signature · 1 line
2.7.4
PATCH 2/2 powerpc/perf: Add generic compat mode pmu driver
Most of the power processor generation performance monitoring unit (PMU) driver code is bundled in the kernel and one of those is enabled/registered based on the oprofile_cpu_type check at the boot.
But things get little tricky incase of "compat" mode boot. IBM POWER System Server based processors has a compactibility mode feature, which simpily put is, Nth generation processor (lets say POWER8) will act and appear in a mode consistent with an earlier generation (N-1) processor (that is POWER7). And in this "compat" mode boot, kernel modify the "oprofile_cpu_type" to be Nth generation (POWER8). If Nth generation pmu driver is bundled (POWER8), it gets registered.
Key dependency here is to have distro support for latest processor performance monitoring support. Patch here adds a generic "compat-mode" performance monitoring driver to be register in absence of powernv platform specific pmu driver.
Driver supports only "cycles" and "instruction" events. "0x0001e" used as event code for "cycles" and "0x00002" used as event code for "instruction" events. New file called "generic-compat-pmu.c" is created to contain the driver specific code. And base raw event code format modeled on PPMU_ARCH_207S.
--- arch/powerpc/perf/Makefile | 3 +- arch/powerpc/perf/core-book3s.c | 2 +- arch/powerpc/perf/generic-compat-pmu.c | 241 +++++++++++++++++++++++++++++++++ arch/powerpc/perf/internal.h | 1 + 4 files changed, 245 insertions(+), 2 deletions(-) create mode 100644 arch/powerpc/perf/generic-compat-pmu.c
arch/powerpc/perf/Makefile +2 -1
@@ -5,7 +5,8 @@ obj-$(CONFIG_PERF_EVENTS) += callchain.o perf_regs.o obj-$(CONFIG_PPC_PERF_CTRS) += core-book3s.o bhrb.o obj64-$(CONFIG_PPC_PERF_CTRS) += ppc970-pmu.o power5-pmu.o \ power5+-pmu.o power6-pmu.o power7-pmu.o \ - isa207-common.o power8-pmu.o power9-pmu.o + isa207-common.o power8-pmu.o power9-pmu.o \ + generic-compat-pmu.o obj32-$(CONFIG_PPC_PERF_CTRS) += mpc7450-pmu.o obj-$(CONFIG_PPC_POWERNV) += imc-pmu.o
arch/powerpc/perf/core-book3s.c +1 -1
@@ -2318,7 +2318,7 @@ static int __init init_ppc64_pmu(void) else if (!init_ppc970_pmu()) return 0; else - return -ENODEV; + return init_generic_compat_pmu(); }early_initcall (init_ppc64_pmu);#endif
arch/powerpc/perf/generic-compat-pmu.c new file +241 -0
241 lines not on this page · raw message
arch/powerpc/perf/internal.h +1 -0
@@ -14,3 +14,4 @@ extern int init_power6_pmu(void);extern int init_power7_pmu (void );extern int init_power8_pmu (void );extern int init_power9_pmu (void ); +extern int init_generic_compat_pmu (void );
Signature · 1 line
2.7.4
Michael Ellerman
AppliedRe: [PATCH 2/2] powerpc/perf: Add generic compat mode pmu driver
Quoted 19 lines · Madhavan Srinivasan
Most of the power processor generation performance monitoring unit (PMU) driver code is bundled in the kernel and one of those is enabled/registered based on the
oprofile_cpu_typecheck at the boot.But things get little tricky incase of "compat" mode boot. IBM POWER System Server based processors has a compactibility mode feature, which simpily put is, Nth generation processor (lets say POWER8) will act and appear in a mode consistent with an earlier generation (N-1) processor (that is POWER7). And in this "compat" mode boot, kernel modify the "
oprofile_cpu_type" to be Nth generation (POWER8). If Nth generation pmu driver is bundled (POWER8), it gets registered.Key dependency here is to have distro support for latest processor performance monitoring support. Patch here adds a generic "compat-mode" performance monitoring driver to be register in absence of powernv platform specific pmu driver.
Quoted 8 lines
Driver supports only "cycles" and "instruction" events. "
0x0001e" used as event code for "cycles" and "0x00002" used as event code for "instruction" events. New file called "generic-compat-pmu.c" is created to contain the driver specific code. And base raw event code format modeled onPPMU_ARCH_207S.Signed-off-by Madhavan Srinivasan <[email protected]>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/be80e758d0c2ec87eceac7676f08c761
cheers
Michael Ellerman
AppliedQuoted 7 lines · Madhavan Srinivasan
Currenty pmu driver file for each ppc64 generation processor has a
__initcall in itself. Refactor the code by moving the__initcall tocore-books.c. This also clean's up compat mode pmu driver registration.Suggested-by Michael Ellerman <[email protected]>Signed-off-by Madhavan Srinivasan <[email protected]>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/708597daf23486ea6f889ca29cc88389
cheers