mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-04 16:25:34 +00:00
a029a4eab3
Commit cf6acb8bdb ("s390/cpumf: Add support for complete counter set extraction")
allows access to the CPU Measurement Counter Facility via character
device /dev/hwctr. The access was exclusive via this device or
via perf_event_open() system call. Only one path at a time was
permitted. The CPU Measurement Counter Facility device driver blocked
access to other processes.
This patch removes this restriction and allows concurrent access to
the CPU Measurement Counter Facility from multiple processes at the same
time via perf_event_open() SVC and via /dev/hwctr device. The access
via /dev/hwctr device is still exclusive, only one process is allowed to
access this device.
This patch
- moves the /dev/hwctr device access from file perf_cpum_cf_diag.c.
to file perf_cpum_cf.c.
- use only one trace buffer .../s390dbf/cpum_cf.
- remove cfset_csd structure and includes its members it into the
structure cpu_cf_events. This results in one data structure and
simplifies the access.
- rework function familiy ctr_set_enable, ctr_set_disable, ctr_set_start
and ctr_set_stop which operate on a counter set number.
Now they operate on a counter set bit mask.
- move CF_DIAG event functionality to file perf_cpum_cf.c. It now
contains the complete functionality of the CPU Measurement Counter
Facility:
- Performance measurement support for counters using perf stat.
- Support for complete counter set extraction with device /dev/hwctr.
- Support for counter set extraction event CF_DIAG attached to
samples using perf record.
- removes file perf_cpum_cf_diag.c
Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Reviewed-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
119 lines
3.2 KiB
C
119 lines
3.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* Counter facility support definitions for the Linux perf
|
|
*
|
|
* Copyright IBM Corp. 2019
|
|
* Author(s): Hendrik Brueckner <brueckner@linux.ibm.com>
|
|
*/
|
|
#ifndef _ASM_S390_CPU_MCF_H
|
|
#define _ASM_S390_CPU_MCF_H
|
|
|
|
#include <linux/perf_event.h>
|
|
#include <asm/cpu_mf.h>
|
|
|
|
enum cpumf_ctr_set {
|
|
CPUMF_CTR_SET_BASIC = 0, /* Basic Counter Set */
|
|
CPUMF_CTR_SET_USER = 1, /* Problem-State Counter Set */
|
|
CPUMF_CTR_SET_CRYPTO = 2, /* Crypto-Activity Counter Set */
|
|
CPUMF_CTR_SET_EXT = 3, /* Extended Counter Set */
|
|
CPUMF_CTR_SET_MT_DIAG = 4, /* MT-diagnostic Counter Set */
|
|
|
|
/* Maximum number of counter sets */
|
|
CPUMF_CTR_SET_MAX,
|
|
};
|
|
|
|
#define CPUMF_LCCTL_ENABLE_SHIFT 16
|
|
#define CPUMF_LCCTL_ACTCTL_SHIFT 0
|
|
static const u64 cpumf_ctr_ctl[CPUMF_CTR_SET_MAX] = {
|
|
[CPUMF_CTR_SET_BASIC] = 0x02,
|
|
[CPUMF_CTR_SET_USER] = 0x04,
|
|
[CPUMF_CTR_SET_CRYPTO] = 0x08,
|
|
[CPUMF_CTR_SET_EXT] = 0x01,
|
|
[CPUMF_CTR_SET_MT_DIAG] = 0x20,
|
|
};
|
|
|
|
static inline void ctr_set_enable(u64 *state, u64 ctrsets)
|
|
{
|
|
*state |= ctrsets << CPUMF_LCCTL_ENABLE_SHIFT;
|
|
}
|
|
|
|
static inline void ctr_set_disable(u64 *state, u64 ctrsets)
|
|
{
|
|
*state &= ~(ctrsets << CPUMF_LCCTL_ENABLE_SHIFT);
|
|
}
|
|
|
|
static inline void ctr_set_start(u64 *state, u64 ctrsets)
|
|
{
|
|
*state |= ctrsets << CPUMF_LCCTL_ACTCTL_SHIFT;
|
|
}
|
|
|
|
static inline void ctr_set_stop(u64 *state, u64 ctrsets)
|
|
{
|
|
*state &= ~(ctrsets << CPUMF_LCCTL_ACTCTL_SHIFT);
|
|
}
|
|
|
|
static inline int ctr_stcctm(enum cpumf_ctr_set set, u64 range, u64 *dest)
|
|
{
|
|
switch (set) {
|
|
case CPUMF_CTR_SET_BASIC:
|
|
return stcctm(BASIC, range, dest);
|
|
case CPUMF_CTR_SET_USER:
|
|
return stcctm(PROBLEM_STATE, range, dest);
|
|
case CPUMF_CTR_SET_CRYPTO:
|
|
return stcctm(CRYPTO_ACTIVITY, range, dest);
|
|
case CPUMF_CTR_SET_EXT:
|
|
return stcctm(EXTENDED, range, dest);
|
|
case CPUMF_CTR_SET_MT_DIAG:
|
|
return stcctm(MT_DIAG_CLEARING, range, dest);
|
|
case CPUMF_CTR_SET_MAX:
|
|
return 3;
|
|
}
|
|
return 3;
|
|
}
|
|
|
|
struct cpu_cf_events {
|
|
struct cpumf_ctr_info info;
|
|
atomic_t ctr_set[CPUMF_CTR_SET_MAX];
|
|
atomic64_t alert;
|
|
u64 state; /* For perf_event_open SVC */
|
|
u64 dev_state; /* For /dev/hwctr */
|
|
unsigned int flags;
|
|
size_t used; /* Bytes used in data */
|
|
size_t usedss; /* Bytes used in start/stop */
|
|
unsigned char start[PAGE_SIZE]; /* Counter set at event add */
|
|
unsigned char stop[PAGE_SIZE]; /* Counter set at event delete */
|
|
unsigned char data[PAGE_SIZE]; /* Counter set at /dev/hwctr */
|
|
unsigned int sets; /* # Counter set saved in memory */
|
|
};
|
|
DECLARE_PER_CPU(struct cpu_cf_events, cpu_cf_events);
|
|
|
|
bool kernel_cpumcf_avail(void);
|
|
int __kernel_cpumcf_begin(void);
|
|
unsigned long kernel_cpumcf_alert(int clear);
|
|
void __kernel_cpumcf_end(void);
|
|
|
|
static inline int kernel_cpumcf_begin(void)
|
|
{
|
|
if (!cpum_cf_avail())
|
|
return -ENODEV;
|
|
|
|
preempt_disable();
|
|
return __kernel_cpumcf_begin();
|
|
}
|
|
static inline void kernel_cpumcf_end(void)
|
|
{
|
|
__kernel_cpumcf_end();
|
|
preempt_enable();
|
|
}
|
|
|
|
/* Return true if store counter set multiple instruction is available */
|
|
static inline int stccm_avail(void)
|
|
{
|
|
return test_facility(142);
|
|
}
|
|
|
|
size_t cpum_cf_ctrset_size(enum cpumf_ctr_set ctrset,
|
|
struct cpumf_ctr_info *info);
|
|
int cfset_online_cpu(unsigned int cpu);
|
|
int cfset_offline_cpu(unsigned int cpu);
|
|
#endif /* _ASM_S390_CPU_MCF_H */
|