powerpc/perf: Factor out PPMU_ONLY_COUNT_RUN check code from power8

There are some hardware events on Power systems which only count when
the processor is not idle, and there are some fixed-function counters
which count such events. For example, the "run cycles" event counts
cycles when the processor is not idle. If the user asks to count
cycles, we can use "run cycles" if this is a per-task event, since the
processor is running when the task is running, by definition. We can't
use "run cycles" if the user asks for "cycles" on a system-wide
counter.

Currently in power8 this check is done using PPMU_ONLY_COUNT_RUN flag
in power8_get_alternatives() function. Based on the flag, events are
switched if needed. This function should also be enabled in power9, so
factor out the code to isa207_get_alternatives().

Fixes: efe881afdd999 ('powerpc/perf: Factor out event_alternative function')
Reported-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/perf/isa207-common.c b/arch/powerpc/perf/isa207-common.c
index 582ed2c9bc56ad45bc10ac125a5d758ce76f8575..2efee3f196f56efe845d7aa833755bf1491d910b 100644 (file)
--- a/arch/powerpc/perf/isa207-common.c
+++ b/arch/powerpc/perf/isa207-common.c
@@ -488,8 +488,8 @@ static int find_alternative(u64 event, const unsigned int ev_alt[][MAX_ALT], int
        return -1;
 }
 
-int isa207_get_alternatives(u64 event, u64 alt[],
-                               const unsigned int ev_alt[][MAX_ALT], int size)
+int isa207_get_alternatives(u64 event, u64 alt[], int size, unsigned int flags,
+                                       const unsigned int ev_alt[][MAX_ALT])
 {
        int i, j, num_alt = 0;
        u64 alt_event;
@@ -505,5 +505,30 @@ int isa207_get_alternatives(u64 event, u64 alt[],
                }
        }
 
+       if (flags & PPMU_ONLY_COUNT_RUN) {
+               /*
+                * We're only counting in RUN state, so PM_CYC is equivalent to
+                * PM_RUN_CYC and PM_INST_CMPL === PM_RUN_INST_CMPL.
+                */
+               j = num_alt;
+               for (i = 0; i < num_alt; ++i) {
+                       switch (alt[i]) {
+                       case 0x1e:                      /* PMC_CYC */
+                               alt[j++] = 0x600f4;     /* PM_RUN_CYC */
+                               break;
+                       case 0x600f4:
+                               alt[j++] = 0x1e;
+                               break;
+                       case 0x2:                       /* PM_INST_CMPL */
+                               alt[j++] = 0x500fa;     /* PM_RUN_INST_CMPL */
+                               break;
+                       case 0x500fa:
+                               alt[j++] = 0x2;
+                               break;
+                       }
+               }
+               num_alt = j;
+       }
+
        return num_alt;
 }

diff --git a/arch/powerpc/perf/isa207-common.h b/arch/powerpc/perf/isa207-common.h
index 7a0228bf283c3a7994060eecd21dfc642fb3121e..6c737d675792ed6a7e513fb0729aec1698875d02 100644 (file)
--- a/arch/powerpc/perf/isa207-common.h
+++ b/arch/powerpc/perf/isa207-common.h
@@ -288,8 +288,8 @@ int isa207_compute_mmcr(u64 event[], int n_ev,
                                unsigned int hwc[], unsigned long mmcr[],
                                struct perf_event *pevents[]);
 void isa207_disable_pmc(unsigned int pmc, unsigned long mmcr[]);
-int isa207_get_alternatives(u64 event, u64 alt[],
-                               const unsigned int ev_alt[][MAX_ALT], int size);
+int isa207_get_alternatives(u64 event, u64 alt[], int size, unsigned int flags,
+                                       const unsigned int ev_alt[][MAX_ALT]);
 void isa207_get_mem_data_src(union perf_mem_data_src *dsrc, u32 flags,
                                                        struct pt_regs *regs);
 void isa207_get_mem_weight(u64 *weight);

diff --git a/arch/powerpc/perf/power8-pmu.c b/arch/powerpc/perf/power8-pmu.c
index 5463516e369b679e8a0682975e4ee8e94e1398fa..c9356955cab4c6096078b74352b894e5e44cd673 100644 (file)
--- a/arch/powerpc/perf/power8-pmu.c
+++ b/arch/powerpc/perf/power8-pmu.c
@@ -50,34 +50,11 @@ static const unsigned int event_alternatives[][MAX_ALT] = {
 
 static int power8_get_alternatives(u64 event, unsigned int flags, u64 alt[])
 {
-       int i, j, num_alt = 0;
-
-       num_alt = isa207_get_alternatives(event, alt, event_alternatives,
-                                       (int)ARRAY_SIZE(event_alternatives));
-       if (flags & PPMU_ONLY_COUNT_RUN) {
-               /*
-                * We're only counting in RUN state, so PM_CYC is equivalent to
-                * PM_RUN_CYC and PM_INST_CMPL === PM_RUN_INST_CMPL.
-                */
-               j = num_alt;
-               for (i = 0; i < num_alt; ++i) {
-                       switch (alt[i]) {
-                       case PM_CYC:
-                               alt[j++] = PM_RUN_CYC;
-                               break;
-                       case PM_RUN_CYC:
-                               alt[j++] = PM_CYC;
-                               break;
-                       case PM_INST_CMPL:
-                               alt[j++] = PM_RUN_INST_CMPL;
-                               break;
-                       case PM_RUN_INST_CMPL:
-                               alt[j++] = PM_INST_CMPL;
-                               break;
-                       }
-               }
-               num_alt = j;
-       }
+       int num_alt = 0;
+
+       num_alt = isa207_get_alternatives(event, alt,
+                                         ARRAY_SIZE(event_alternatives), flags,
+                                         event_alternatives);
 
        return num_alt;
 }

diff --git a/arch/powerpc/perf/power9-pmu.c b/arch/powerpc/perf/power9-pmu.c
index 2280cf87ff9c9423ad27f84d212dbc1fafe963ca..d83aa24b77d46ffbc88e07dca2372a0c5e0ed080 100644 (file)
--- a/arch/powerpc/perf/power9-pmu.c
+++ b/arch/powerpc/perf/power9-pmu.c
@@ -115,8 +115,9 @@ static int power9_get_alternatives(u64 event, unsigned int flags, u64 alt[])
 {
        int num_alt = 0;
 
-       num_alt = isa207_get_alternatives(event, alt, power9_event_alternatives,
-                               (int)ARRAY_SIZE(power9_event_alternatives));
+       num_alt = isa207_get_alternatives(event, alt,
+                                         ARRAY_SIZE(power9_event_alternatives), flags,
+                                         power9_event_alternatives);
 
        return num_alt;
 }