| .. | .. |
|---|
| 2 | 2 | /* |
|---|
| 3 | 3 | * Performance event support for s390x - CPU-measurement Counter Facility |
|---|
| 4 | 4 | * |
|---|
| 5 | | - * Copyright IBM Corp. 2012, 2017 |
|---|
| 6 | | - * Author(s): Hendrik Brueckner <brueckner@linux.vnet.ibm.com> |
|---|
| 5 | + * Copyright IBM Corp. 2012, 2019 |
|---|
| 6 | + * Author(s): Hendrik Brueckner <brueckner@linux.ibm.com> |
|---|
| 7 | 7 | */ |
|---|
| 8 | 8 | #define KMSG_COMPONENT "cpum_cf" |
|---|
| 9 | 9 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
|---|
| 10 | 10 | |
|---|
| 11 | 11 | #include <linux/kernel.h> |
|---|
| 12 | 12 | #include <linux/kernel_stat.h> |
|---|
| 13 | | -#include <linux/perf_event.h> |
|---|
| 14 | 13 | #include <linux/percpu.h> |
|---|
| 15 | 14 | #include <linux/notifier.h> |
|---|
| 16 | 15 | #include <linux/init.h> |
|---|
| 17 | 16 | #include <linux/export.h> |
|---|
| 18 | | -#include <asm/ctl_reg.h> |
|---|
| 19 | | -#include <asm/irq.h> |
|---|
| 20 | | -#include <asm/cpu_mf.h> |
|---|
| 21 | | - |
|---|
| 22 | | -enum cpumf_ctr_set { |
|---|
| 23 | | - CPUMF_CTR_SET_BASIC = 0, /* Basic Counter Set */ |
|---|
| 24 | | - CPUMF_CTR_SET_USER = 1, /* Problem-State Counter Set */ |
|---|
| 25 | | - CPUMF_CTR_SET_CRYPTO = 2, /* Crypto-Activity Counter Set */ |
|---|
| 26 | | - CPUMF_CTR_SET_EXT = 3, /* Extended Counter Set */ |
|---|
| 27 | | - CPUMF_CTR_SET_MT_DIAG = 4, /* MT-diagnostic Counter Set */ |
|---|
| 28 | | - |
|---|
| 29 | | - /* Maximum number of counter sets */ |
|---|
| 30 | | - CPUMF_CTR_SET_MAX, |
|---|
| 31 | | -}; |
|---|
| 32 | | - |
|---|
| 33 | | -#define CPUMF_LCCTL_ENABLE_SHIFT 16 |
|---|
| 34 | | -#define CPUMF_LCCTL_ACTCTL_SHIFT 0 |
|---|
| 35 | | -static const u64 cpumf_state_ctl[CPUMF_CTR_SET_MAX] = { |
|---|
| 36 | | - [CPUMF_CTR_SET_BASIC] = 0x02, |
|---|
| 37 | | - [CPUMF_CTR_SET_USER] = 0x04, |
|---|
| 38 | | - [CPUMF_CTR_SET_CRYPTO] = 0x08, |
|---|
| 39 | | - [CPUMF_CTR_SET_EXT] = 0x01, |
|---|
| 40 | | - [CPUMF_CTR_SET_MT_DIAG] = 0x20, |
|---|
| 41 | | -}; |
|---|
| 42 | | - |
|---|
| 43 | | -static void ctr_set_enable(u64 *state, int ctr_set) |
|---|
| 44 | | -{ |
|---|
| 45 | | - *state |= cpumf_state_ctl[ctr_set] << CPUMF_LCCTL_ENABLE_SHIFT; |
|---|
| 46 | | -} |
|---|
| 47 | | -static void ctr_set_disable(u64 *state, int ctr_set) |
|---|
| 48 | | -{ |
|---|
| 49 | | - *state &= ~(cpumf_state_ctl[ctr_set] << CPUMF_LCCTL_ENABLE_SHIFT); |
|---|
| 50 | | -} |
|---|
| 51 | | -static void ctr_set_start(u64 *state, int ctr_set) |
|---|
| 52 | | -{ |
|---|
| 53 | | - *state |= cpumf_state_ctl[ctr_set] << CPUMF_LCCTL_ACTCTL_SHIFT; |
|---|
| 54 | | -} |
|---|
| 55 | | -static void ctr_set_stop(u64 *state, int ctr_set) |
|---|
| 56 | | -{ |
|---|
| 57 | | - *state &= ~(cpumf_state_ctl[ctr_set] << CPUMF_LCCTL_ACTCTL_SHIFT); |
|---|
| 58 | | -} |
|---|
| 59 | | - |
|---|
| 60 | | -/* Local CPUMF event structure */ |
|---|
| 61 | | -struct cpu_hw_events { |
|---|
| 62 | | - struct cpumf_ctr_info info; |
|---|
| 63 | | - atomic_t ctr_set[CPUMF_CTR_SET_MAX]; |
|---|
| 64 | | - u64 state, tx_state; |
|---|
| 65 | | - unsigned int flags; |
|---|
| 66 | | - unsigned int txn_flags; |
|---|
| 67 | | -}; |
|---|
| 68 | | -static DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events) = { |
|---|
| 69 | | - .ctr_set = { |
|---|
| 70 | | - [CPUMF_CTR_SET_BASIC] = ATOMIC_INIT(0), |
|---|
| 71 | | - [CPUMF_CTR_SET_USER] = ATOMIC_INIT(0), |
|---|
| 72 | | - [CPUMF_CTR_SET_CRYPTO] = ATOMIC_INIT(0), |
|---|
| 73 | | - [CPUMF_CTR_SET_EXT] = ATOMIC_INIT(0), |
|---|
| 74 | | - [CPUMF_CTR_SET_MT_DIAG] = ATOMIC_INIT(0), |
|---|
| 75 | | - }, |
|---|
| 76 | | - .state = 0, |
|---|
| 77 | | - .flags = 0, |
|---|
| 78 | | - .txn_flags = 0, |
|---|
| 79 | | -}; |
|---|
| 17 | +#include <asm/cpu_mcf.h> |
|---|
| 80 | 18 | |
|---|
| 81 | 19 | static enum cpumf_ctr_set get_counter_set(u64 event) |
|---|
| 82 | 20 | { |
|---|
| .. | .. |
|---|
| 88 | 26 | set = CPUMF_CTR_SET_USER; |
|---|
| 89 | 27 | else if (event < 128) |
|---|
| 90 | 28 | set = CPUMF_CTR_SET_CRYPTO; |
|---|
| 91 | | - else if (event < 256) |
|---|
| 29 | + else if (event < 288) |
|---|
| 92 | 30 | set = CPUMF_CTR_SET_EXT; |
|---|
| 93 | 31 | else if (event >= 448 && event < 496) |
|---|
| 94 | 32 | set = CPUMF_CTR_SET_MT_DIAG; |
|---|
| .. | .. |
|---|
| 98 | 36 | |
|---|
| 99 | 37 | static int validate_ctr_version(const struct hw_perf_event *hwc) |
|---|
| 100 | 38 | { |
|---|
| 101 | | - struct cpu_hw_events *cpuhw; |
|---|
| 39 | + struct cpu_cf_events *cpuhw; |
|---|
| 102 | 40 | int err = 0; |
|---|
| 103 | 41 | u16 mtdiag_ctl; |
|---|
| 104 | 42 | |
|---|
| 105 | | - cpuhw = &get_cpu_var(cpu_hw_events); |
|---|
| 43 | + cpuhw = &get_cpu_var(cpu_cf_events); |
|---|
| 106 | 44 | |
|---|
| 107 | 45 | /* check required version for counter sets */ |
|---|
| 108 | 46 | switch (hwc->config_base) { |
|---|
| .. | .. |
|---|
| 112 | 50 | err = -EOPNOTSUPP; |
|---|
| 113 | 51 | break; |
|---|
| 114 | 52 | case CPUMF_CTR_SET_CRYPTO: |
|---|
| 53 | + if ((cpuhw->info.csvn >= 1 && cpuhw->info.csvn <= 5 && |
|---|
| 54 | + hwc->config > 79) || |
|---|
| 55 | + (cpuhw->info.csvn >= 6 && hwc->config > 83)) |
|---|
| 56 | + err = -EOPNOTSUPP; |
|---|
| 57 | + break; |
|---|
| 115 | 58 | case CPUMF_CTR_SET_EXT: |
|---|
| 116 | 59 | if (cpuhw->info.csvn < 1) |
|---|
| 117 | 60 | err = -EOPNOTSUPP; |
|---|
| 118 | 61 | if ((cpuhw->info.csvn == 1 && hwc->config > 159) || |
|---|
| 119 | 62 | (cpuhw->info.csvn == 2 && hwc->config > 175) || |
|---|
| 120 | | - (cpuhw->info.csvn > 2 && hwc->config > 255)) |
|---|
| 63 | + (cpuhw->info.csvn >= 3 && cpuhw->info.csvn <= 5 |
|---|
| 64 | + && hwc->config > 255) || |
|---|
| 65 | + (cpuhw->info.csvn >= 6 && hwc->config > 287)) |
|---|
| 121 | 66 | err = -EOPNOTSUPP; |
|---|
| 122 | 67 | break; |
|---|
| 123 | 68 | case CPUMF_CTR_SET_MT_DIAG: |
|---|
| .. | .. |
|---|
| 135 | 80 | * Thus, the counters can only be used if SMT is on and the |
|---|
| 136 | 81 | * counter set is enabled and active. |
|---|
| 137 | 82 | */ |
|---|
| 138 | | - mtdiag_ctl = cpumf_state_ctl[CPUMF_CTR_SET_MT_DIAG]; |
|---|
| 83 | + mtdiag_ctl = cpumf_ctr_ctl[CPUMF_CTR_SET_MT_DIAG]; |
|---|
| 139 | 84 | if (!((cpuhw->info.auth_ctl & mtdiag_ctl) && |
|---|
| 140 | 85 | (cpuhw->info.enable_ctl & mtdiag_ctl) && |
|---|
| 141 | 86 | (cpuhw->info.act_ctl & mtdiag_ctl))) |
|---|
| .. | .. |
|---|
| 143 | 88 | break; |
|---|
| 144 | 89 | } |
|---|
| 145 | 90 | |
|---|
| 146 | | - put_cpu_var(cpu_hw_events); |
|---|
| 91 | + put_cpu_var(cpu_cf_events); |
|---|
| 147 | 92 | return err; |
|---|
| 148 | 93 | } |
|---|
| 149 | 94 | |
|---|
| 150 | 95 | static int validate_ctr_auth(const struct hw_perf_event *hwc) |
|---|
| 151 | 96 | { |
|---|
| 152 | | - struct cpu_hw_events *cpuhw; |
|---|
| 97 | + struct cpu_cf_events *cpuhw; |
|---|
| 153 | 98 | u64 ctrs_state; |
|---|
| 154 | 99 | int err = 0; |
|---|
| 155 | 100 | |
|---|
| 156 | | - cpuhw = &get_cpu_var(cpu_hw_events); |
|---|
| 101 | + cpuhw = &get_cpu_var(cpu_cf_events); |
|---|
| 157 | 102 | |
|---|
| 158 | 103 | /* Check authorization for cpu counter sets. |
|---|
| 159 | 104 | * If the particular CPU counter set is not authorized, |
|---|
| 160 | 105 | * return with -ENOENT in order to fall back to other |
|---|
| 161 | 106 | * PMUs that might suffice the event request. |
|---|
| 162 | 107 | */ |
|---|
| 163 | | - ctrs_state = cpumf_state_ctl[hwc->config_base]; |
|---|
| 108 | + ctrs_state = cpumf_ctr_ctl[hwc->config_base]; |
|---|
| 164 | 109 | if (!(ctrs_state & cpuhw->info.auth_ctl)) |
|---|
| 165 | 110 | err = -ENOENT; |
|---|
| 166 | 111 | |
|---|
| 167 | | - put_cpu_var(cpu_hw_events); |
|---|
| 112 | + put_cpu_var(cpu_cf_events); |
|---|
| 168 | 113 | return err; |
|---|
| 169 | 114 | } |
|---|
| 170 | 115 | |
|---|
| .. | .. |
|---|
| 175 | 120 | */ |
|---|
| 176 | 121 | static void cpumf_pmu_enable(struct pmu *pmu) |
|---|
| 177 | 122 | { |
|---|
| 178 | | - struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events); |
|---|
| 123 | + struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events); |
|---|
| 179 | 124 | int err; |
|---|
| 180 | 125 | |
|---|
| 181 | 126 | if (cpuhw->flags & PMU_F_ENABLED) |
|---|
| .. | .. |
|---|
| 198 | 143 | */ |
|---|
| 199 | 144 | static void cpumf_pmu_disable(struct pmu *pmu) |
|---|
| 200 | 145 | { |
|---|
| 201 | | - struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events); |
|---|
| 146 | + struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events); |
|---|
| 202 | 147 | int err; |
|---|
| 203 | 148 | u64 inactive; |
|---|
| 204 | 149 | |
|---|
| .. | .. |
|---|
| 222 | 167 | /* Used to avoid races in calling reserve/release_cpumf_hardware */ |
|---|
| 223 | 168 | static DEFINE_MUTEX(pmc_reserve_mutex); |
|---|
| 224 | 169 | |
|---|
| 225 | | -/* CPU-measurement alerts for the counter facility */ |
|---|
| 226 | | -static void cpumf_measurement_alert(struct ext_code ext_code, |
|---|
| 227 | | - unsigned int alert, unsigned long unused) |
|---|
| 228 | | -{ |
|---|
| 229 | | - struct cpu_hw_events *cpuhw; |
|---|
| 230 | | - |
|---|
| 231 | | - if (!(alert & CPU_MF_INT_CF_MASK)) |
|---|
| 232 | | - return; |
|---|
| 233 | | - |
|---|
| 234 | | - inc_irq_stat(IRQEXT_CMC); |
|---|
| 235 | | - cpuhw = this_cpu_ptr(&cpu_hw_events); |
|---|
| 236 | | - |
|---|
| 237 | | - /* Measurement alerts are shared and might happen when the PMU |
|---|
| 238 | | - * is not reserved. Ignore these alerts in this case. */ |
|---|
| 239 | | - if (!(cpuhw->flags & PMU_F_RESERVED)) |
|---|
| 240 | | - return; |
|---|
| 241 | | - |
|---|
| 242 | | - /* counter authorization change alert */ |
|---|
| 243 | | - if (alert & CPU_MF_INT_CF_CACA) |
|---|
| 244 | | - qctri(&cpuhw->info); |
|---|
| 245 | | - |
|---|
| 246 | | - /* loss of counter data alert */ |
|---|
| 247 | | - if (alert & CPU_MF_INT_CF_LCDA) |
|---|
| 248 | | - pr_err("CPU[%i] Counter data was lost\n", smp_processor_id()); |
|---|
| 249 | | - |
|---|
| 250 | | - /* loss of MT counter data alert */ |
|---|
| 251 | | - if (alert & CPU_MF_INT_CF_MTDA) |
|---|
| 252 | | - pr_warn("CPU[%i] MT counter data was lost\n", |
|---|
| 253 | | - smp_processor_id()); |
|---|
| 254 | | -} |
|---|
| 255 | | - |
|---|
| 256 | | -#define PMC_INIT 0 |
|---|
| 257 | | -#define PMC_RELEASE 1 |
|---|
| 258 | | -static void setup_pmc_cpu(void *flags) |
|---|
| 259 | | -{ |
|---|
| 260 | | - struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events); |
|---|
| 261 | | - |
|---|
| 262 | | - switch (*((int *) flags)) { |
|---|
| 263 | | - case PMC_INIT: |
|---|
| 264 | | - memset(&cpuhw->info, 0, sizeof(cpuhw->info)); |
|---|
| 265 | | - qctri(&cpuhw->info); |
|---|
| 266 | | - cpuhw->flags |= PMU_F_RESERVED; |
|---|
| 267 | | - break; |
|---|
| 268 | | - |
|---|
| 269 | | - case PMC_RELEASE: |
|---|
| 270 | | - cpuhw->flags &= ~PMU_F_RESERVED; |
|---|
| 271 | | - break; |
|---|
| 272 | | - } |
|---|
| 273 | | - |
|---|
| 274 | | - /* Disable CPU counter sets */ |
|---|
| 275 | | - lcctl(0); |
|---|
| 276 | | -} |
|---|
| 277 | | - |
|---|
| 278 | | -/* Initialize the CPU-measurement facility */ |
|---|
| 279 | | -static int reserve_pmc_hardware(void) |
|---|
| 280 | | -{ |
|---|
| 281 | | - int flags = PMC_INIT; |
|---|
| 282 | | - |
|---|
| 283 | | - on_each_cpu(setup_pmc_cpu, &flags, 1); |
|---|
| 284 | | - irq_subclass_register(IRQ_SUBCLASS_MEASUREMENT_ALERT); |
|---|
| 285 | | - |
|---|
| 286 | | - return 0; |
|---|
| 287 | | -} |
|---|
| 288 | | - |
|---|
| 289 | | -/* Release the CPU-measurement facility */ |
|---|
| 290 | | -static void release_pmc_hardware(void) |
|---|
| 291 | | -{ |
|---|
| 292 | | - int flags = PMC_RELEASE; |
|---|
| 293 | | - |
|---|
| 294 | | - on_each_cpu(setup_pmc_cpu, &flags, 1); |
|---|
| 295 | | - irq_subclass_unregister(IRQ_SUBCLASS_MEASUREMENT_ALERT); |
|---|
| 296 | | -} |
|---|
| 297 | | - |
|---|
| 298 | 170 | /* Release the PMU if event is the last perf event */ |
|---|
| 299 | 171 | static void hw_perf_event_destroy(struct perf_event *event) |
|---|
| 300 | 172 | { |
|---|
| 301 | 173 | if (!atomic_add_unless(&num_events, -1, 1)) { |
|---|
| 302 | 174 | mutex_lock(&pmc_reserve_mutex); |
|---|
| 303 | 175 | if (atomic_dec_return(&num_events) == 0) |
|---|
| 304 | | - release_pmc_hardware(); |
|---|
| 176 | + __kernel_cpumcf_end(); |
|---|
| 305 | 177 | mutex_unlock(&pmc_reserve_mutex); |
|---|
| 306 | 178 | } |
|---|
| 307 | 179 | } |
|---|
| .. | .. |
|---|
| 327 | 199 | [PERF_COUNT_HW_BUS_CYCLES] = -1, |
|---|
| 328 | 200 | }; |
|---|
| 329 | 201 | |
|---|
| 330 | | -static int __hw_perf_event_init(struct perf_event *event) |
|---|
| 202 | +static int __hw_perf_event_init(struct perf_event *event, unsigned int type) |
|---|
| 331 | 203 | { |
|---|
| 332 | 204 | struct perf_event_attr *attr = &event->attr; |
|---|
| 333 | 205 | struct hw_perf_event *hwc = &event->hw; |
|---|
| 334 | 206 | enum cpumf_ctr_set set; |
|---|
| 335 | | - int err; |
|---|
| 207 | + int err = 0; |
|---|
| 336 | 208 | u64 ev; |
|---|
| 337 | 209 | |
|---|
| 338 | | - switch (attr->type) { |
|---|
| 210 | + switch (type) { |
|---|
| 339 | 211 | case PERF_TYPE_RAW: |
|---|
| 340 | 212 | /* Raw events are used to access counters directly, |
|---|
| 341 | 213 | * hence do not permit excludes */ |
|---|
| .. | .. |
|---|
| 402 | 274 | /* Initialize for using the CPU-measurement counter facility */ |
|---|
| 403 | 275 | if (!atomic_inc_not_zero(&num_events)) { |
|---|
| 404 | 276 | mutex_lock(&pmc_reserve_mutex); |
|---|
| 405 | | - if (atomic_read(&num_events) == 0 && reserve_pmc_hardware()) |
|---|
| 277 | + if (atomic_read(&num_events) == 0 && __kernel_cpumcf_begin()) |
|---|
| 406 | 278 | err = -EBUSY; |
|---|
| 407 | 279 | else |
|---|
| 408 | 280 | atomic_inc(&num_events); |
|---|
| 409 | 281 | mutex_unlock(&pmc_reserve_mutex); |
|---|
| 410 | 282 | } |
|---|
| 283 | + if (err) |
|---|
| 284 | + return err; |
|---|
| 411 | 285 | event->destroy = hw_perf_event_destroy; |
|---|
| 412 | 286 | |
|---|
| 413 | 287 | /* Finally, validate version and authorization of the counter set */ |
|---|
| .. | .. |
|---|
| 418 | 292 | return err; |
|---|
| 419 | 293 | } |
|---|
| 420 | 294 | |
|---|
| 295 | +/* Events CPU_CYLCES and INSTRUCTIONS can be submitted with two different |
|---|
| 296 | + * attribute::type values: |
|---|
| 297 | + * - PERF_TYPE_HARDWARE: |
|---|
| 298 | + * - pmu->type: |
|---|
| 299 | + * Handle both type of invocations identical. They address the same hardware. |
|---|
| 300 | + * The result is different when event modifiers exclude_kernel and/or |
|---|
| 301 | + * exclude_user are also set. |
|---|
| 302 | + */ |
|---|
| 303 | +static int cpumf_pmu_event_type(struct perf_event *event) |
|---|
| 304 | +{ |
|---|
| 305 | + u64 ev = event->attr.config; |
|---|
| 306 | + |
|---|
| 307 | + if (cpumf_generic_events_basic[PERF_COUNT_HW_CPU_CYCLES] == ev || |
|---|
| 308 | + cpumf_generic_events_basic[PERF_COUNT_HW_INSTRUCTIONS] == ev || |
|---|
| 309 | + cpumf_generic_events_user[PERF_COUNT_HW_CPU_CYCLES] == ev || |
|---|
| 310 | + cpumf_generic_events_user[PERF_COUNT_HW_INSTRUCTIONS] == ev) |
|---|
| 311 | + return PERF_TYPE_HARDWARE; |
|---|
| 312 | + return PERF_TYPE_RAW; |
|---|
| 313 | +} |
|---|
| 314 | + |
|---|
| 421 | 315 | static int cpumf_pmu_event_init(struct perf_event *event) |
|---|
| 422 | 316 | { |
|---|
| 317 | + unsigned int type = event->attr.type; |
|---|
| 423 | 318 | int err; |
|---|
| 424 | 319 | |
|---|
| 425 | | - switch (event->attr.type) { |
|---|
| 426 | | - case PERF_TYPE_HARDWARE: |
|---|
| 427 | | - case PERF_TYPE_HW_CACHE: |
|---|
| 428 | | - case PERF_TYPE_RAW: |
|---|
| 429 | | - err = __hw_perf_event_init(event); |
|---|
| 430 | | - break; |
|---|
| 431 | | - default: |
|---|
| 320 | + if (type == PERF_TYPE_HARDWARE || type == PERF_TYPE_RAW) |
|---|
| 321 | + err = __hw_perf_event_init(event, type); |
|---|
| 322 | + else if (event->pmu->type == type) |
|---|
| 323 | + /* Registered as unknown PMU */ |
|---|
| 324 | + err = __hw_perf_event_init(event, cpumf_pmu_event_type(event)); |
|---|
| 325 | + else |
|---|
| 432 | 326 | return -ENOENT; |
|---|
| 433 | | - } |
|---|
| 434 | 327 | |
|---|
| 435 | 328 | if (unlikely(err) && event->destroy) |
|---|
| 436 | 329 | event->destroy(event); |
|---|
| .. | .. |
|---|
| 488 | 381 | |
|---|
| 489 | 382 | static void cpumf_pmu_start(struct perf_event *event, int flags) |
|---|
| 490 | 383 | { |
|---|
| 491 | | - struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events); |
|---|
| 384 | + struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events); |
|---|
| 492 | 385 | struct hw_perf_event *hwc = &event->hw; |
|---|
| 493 | 386 | |
|---|
| 494 | 387 | if (WARN_ON_ONCE(!(hwc->state & PERF_HES_STOPPED))) |
|---|
| .. | .. |
|---|
| 519 | 412 | |
|---|
| 520 | 413 | static void cpumf_pmu_stop(struct perf_event *event, int flags) |
|---|
| 521 | 414 | { |
|---|
| 522 | | - struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events); |
|---|
| 415 | + struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events); |
|---|
| 523 | 416 | struct hw_perf_event *hwc = &event->hw; |
|---|
| 524 | 417 | |
|---|
| 525 | 418 | if (!(hwc->state & PERF_HES_STOPPED)) { |
|---|
| .. | .. |
|---|
| 540 | 433 | |
|---|
| 541 | 434 | static int cpumf_pmu_add(struct perf_event *event, int flags) |
|---|
| 542 | 435 | { |
|---|
| 543 | | - struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events); |
|---|
| 436 | + struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events); |
|---|
| 544 | 437 | |
|---|
| 545 | 438 | /* Check authorization for the counter set to which this |
|---|
| 546 | 439 | * counter belongs. |
|---|
| .. | .. |
|---|
| 564 | 457 | |
|---|
| 565 | 458 | static void cpumf_pmu_del(struct perf_event *event, int flags) |
|---|
| 566 | 459 | { |
|---|
| 567 | | - struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events); |
|---|
| 460 | + struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events); |
|---|
| 568 | 461 | |
|---|
| 569 | 462 | cpumf_pmu_stop(event, PERF_EF_UPDATE); |
|---|
| 570 | 463 | |
|---|
| .. | .. |
|---|
| 592 | 485 | */ |
|---|
| 593 | 486 | static void cpumf_pmu_start_txn(struct pmu *pmu, unsigned int txn_flags) |
|---|
| 594 | 487 | { |
|---|
| 595 | | - struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events); |
|---|
| 488 | + struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events); |
|---|
| 596 | 489 | |
|---|
| 597 | 490 | WARN_ON_ONCE(cpuhw->txn_flags); /* txn already in flight */ |
|---|
| 598 | 491 | |
|---|
| .. | .. |
|---|
| 612 | 505 | static void cpumf_pmu_cancel_txn(struct pmu *pmu) |
|---|
| 613 | 506 | { |
|---|
| 614 | 507 | unsigned int txn_flags; |
|---|
| 615 | | - struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events); |
|---|
| 508 | + struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events); |
|---|
| 616 | 509 | |
|---|
| 617 | 510 | WARN_ON_ONCE(!cpuhw->txn_flags); /* no txn in flight */ |
|---|
| 618 | 511 | |
|---|
| .. | .. |
|---|
| 633 | 526 | */ |
|---|
| 634 | 527 | static int cpumf_pmu_commit_txn(struct pmu *pmu) |
|---|
| 635 | 528 | { |
|---|
| 636 | | - struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events); |
|---|
| 529 | + struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events); |
|---|
| 637 | 530 | u64 state; |
|---|
| 638 | 531 | |
|---|
| 639 | 532 | WARN_ON_ONCE(!cpuhw->txn_flags); /* no txn in flight */ |
|---|
| .. | .. |
|---|
| 671 | 564 | .cancel_txn = cpumf_pmu_cancel_txn, |
|---|
| 672 | 565 | }; |
|---|
| 673 | 566 | |
|---|
| 674 | | -static int cpumf_pmf_setup(unsigned int cpu, int flags) |
|---|
| 675 | | -{ |
|---|
| 676 | | - local_irq_disable(); |
|---|
| 677 | | - setup_pmc_cpu(&flags); |
|---|
| 678 | | - local_irq_enable(); |
|---|
| 679 | | - return 0; |
|---|
| 680 | | -} |
|---|
| 681 | | - |
|---|
| 682 | | -static int s390_pmu_online_cpu(unsigned int cpu) |
|---|
| 683 | | -{ |
|---|
| 684 | | - return cpumf_pmf_setup(cpu, PMC_INIT); |
|---|
| 685 | | -} |
|---|
| 686 | | - |
|---|
| 687 | | -static int s390_pmu_offline_cpu(unsigned int cpu) |
|---|
| 688 | | -{ |
|---|
| 689 | | - return cpumf_pmf_setup(cpu, PMC_RELEASE); |
|---|
| 690 | | -} |
|---|
| 691 | | - |
|---|
| 692 | 567 | static int __init cpumf_pmu_init(void) |
|---|
| 693 | 568 | { |
|---|
| 694 | 569 | int rc; |
|---|
| 695 | 570 | |
|---|
| 696 | | - if (!cpum_cf_avail()) |
|---|
| 571 | + if (!kernel_cpumcf_avail()) |
|---|
| 697 | 572 | return -ENODEV; |
|---|
| 698 | 573 | |
|---|
| 699 | | - /* clear bit 15 of cr0 to unauthorize problem-state to |
|---|
| 700 | | - * extract measurement counters */ |
|---|
| 701 | | - ctl_clear_bit(0, 48); |
|---|
| 702 | | - |
|---|
| 703 | | - /* register handler for measurement-alert interruptions */ |
|---|
| 704 | | - rc = register_external_irq(EXT_IRQ_MEASURE_ALERT, |
|---|
| 705 | | - cpumf_measurement_alert); |
|---|
| 706 | | - if (rc) { |
|---|
| 707 | | - pr_err("Registering for CPU-measurement alerts " |
|---|
| 708 | | - "failed with rc=%i\n", rc); |
|---|
| 709 | | - return rc; |
|---|
| 710 | | - } |
|---|
| 711 | | - |
|---|
| 712 | 574 | cpumf_pmu.attr_groups = cpumf_cf_event_group(); |
|---|
| 713 | | - rc = perf_pmu_register(&cpumf_pmu, "cpum_cf", PERF_TYPE_RAW); |
|---|
| 714 | | - if (rc) { |
|---|
| 575 | + rc = perf_pmu_register(&cpumf_pmu, "cpum_cf", -1); |
|---|
| 576 | + if (rc) |
|---|
| 715 | 577 | pr_err("Registering the cpum_cf PMU failed with rc=%i\n", rc); |
|---|
| 716 | | - unregister_external_irq(EXT_IRQ_MEASURE_ALERT, |
|---|
| 717 | | - cpumf_measurement_alert); |
|---|
| 718 | | - return rc; |
|---|
| 719 | | - } |
|---|
| 720 | | - return cpuhp_setup_state(CPUHP_AP_PERF_S390_CF_ONLINE, |
|---|
| 721 | | - "perf/s390/cf:online", |
|---|
| 722 | | - s390_pmu_online_cpu, s390_pmu_offline_cpu); |
|---|
| 578 | + return rc; |
|---|
| 723 | 579 | } |
|---|
| 724 | | -early_initcall(cpumf_pmu_init); |
|---|
| 580 | +subsys_initcall(cpumf_pmu_init); |
|---|