Commit fe5908bc authored by Thomas Richter's avatar Thomas Richter Committed by Martin Schwidefsky
Browse files

s390/cpum_cf_diag: Add support for s390 counter facility diagnostic trace 



Introduce a PMU device named cpum_cf_diag. It extracts the
values of all counters in all authorized counter sets and stores
them as event raw data. This is done with the STORE CPU COUNTER
MULTIPLE instruction to speed up access. All counter sets
fit into one buffer. The values of each counter are taken
when the event is started on the performance sub-system and when
the event is stopped.
This results in counter values available at the start and
at the end of the measurement time frame. The difference is
calculated for each counter. The differences of all
counters are then saved as event raw data in the perf.data
file.

The counter values are accompanied by the time stamps
when the counter set was started and when the counter set
was stopped. This data is part of a trailer entry which
describes the time frame, counter set version numbers,
CPU speed, and machine type for later analysis.

Signed-off-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Reviewed-by: default avatarHendrik Brueckner <brueckner@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 86c0b757

arch/s390/include/asm/cpu_mcf.h

+26 −0
Original line number Diff line number Diff line
@@ -49,6 +49,26 @@ static inline void ctr_set_stop(u64 *state, int ctr_set) 
	*state &= ~(cpumf_ctr_ctl[ctr_set] << CPUMF_LCCTL_ACTCTL_SHIFT);

}



static inline void ctr_set_multiple_enable(u64 *state, u64 ctrsets)

{

	*state |= ctrsets << CPUMF_LCCTL_ENABLE_SHIFT;

}



static inline void ctr_set_multiple_disable(u64 *state, u64 ctrsets)

{

	*state &= ~(ctrsets << CPUMF_LCCTL_ENABLE_SHIFT);

}



static inline void ctr_set_multiple_start(u64 *state, u64 ctrsets)

{

	*state |= ctrsets << CPUMF_LCCTL_ACTCTL_SHIFT;

}



static inline void ctr_set_multiple_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) {
@@ -97,4 +117,10 @@ static inline void kernel_cpumcf_end(void) 
	preempt_enable();

}



/* Return true if store counter set multiple instruction is available */

static inline int stccm_avail(void)

{

	return test_facility(142);

}



#endif /* _ASM_S390_CPU_MCF_H */

arch/s390/include/asm/perf_event.h

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ struct perf_sf_sde_regs { 
#define PERF_CPUM_SF_MAX_CTR		2

#define PERF_EVENT_CPUM_SF		0xB0000UL /* Event: Basic-sampling */

#define PERF_EVENT_CPUM_SF_DIAG		0xBD000UL /* Event: Combined-sampling */

#define PERF_EVENT_CPUM_CF_DIAG		0xBC000UL /* Event: Counter sets */

#define PERF_CPUM_SF_BASIC_MODE		0x0001	  /* Basic-sampling flag */

#define PERF_CPUM_SF_DIAG_MODE		0x0002	  /* Diagnostic-sampling flag */

#define PERF_CPUM_SF_MODE_MASK		(PERF_CPUM_SF_BASIC_MODE| \

arch/s390/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ obj-$(CONFIG_KEXEC_FILE) += kexec_elf.o 
obj-$(CONFIG_PERF_EVENTS)	+= perf_event.o perf_cpum_cf_common.o

obj-$(CONFIG_PERF_EVENTS)	+= perf_cpum_cf.o perf_cpum_sf.o

obj-$(CONFIG_PERF_EVENTS)	+= perf_cpum_cf_events.o perf_regs.o

obj-$(CONFIG_PERF_EVENTS)	+= perf_cpum_cf_diag.o



obj-$(CONFIG_TRACEPOINTS)	+= trace.o

arch/s390/kernel/perf_cpum_cf_diag.c

0 → 100644
+693 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE