Skip to content

L
linux
Commit c9311de7 authored by Thomas Richter's avatar Thomas Richter Committed by Heiko Carstens
Browse files
Options

s390/cpumf: add new extended counter set for IBM z16 

Export the extended counter set counters of the IBM z16 via sysfs.
Signed-off-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Acked-by: default avatarSumanth Korikkar <sumanthk@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 63678eec
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 0 deletions
arch/s390/kernel/perf_cpum_cf_events.c
View file @ c9311de7
......@@ -295,6 +295,76 @@ CPUMF_EVENT_ATTR(cf_z15, DFLT_CC, 0x00108);
CPUMF_EVENT_ATTR(cf_z15, DFLT_CCFINISH, 0x00109);
CPUMF_EVENT_ATTR(cf_z15, MT_DIAG_CYCLES_ONE_THR_ACTIVE, 0x01c0);
CPUMF_EVENT_ATTR(cf_z15, MT_DIAG_CYCLES_TWO_THR_ACTIVE, 0x01c1);
CPUMF_EVENT_ATTR(cf_z16, L1D_RO_EXCL_WRITES, 0x0080);
CPUMF_EVENT_ATTR(cf_z16, DTLB2_WRITES, 0x0081);
CPUMF_EVENT_ATTR(cf_z16, DTLB2_MISSES, 0x0082);
CPUMF_EVENT_ATTR(cf_z16, CRSTE_1MB_WRITES, 0x0083);
CPUMF_EVENT_ATTR(cf_z16, DTLB2_GPAGE_WRITES, 0x0084);
CPUMF_EVENT_ATTR(cf_z16, ITLB2_WRITES, 0x0086);
CPUMF_EVENT_ATTR(cf_z16, ITLB2_MISSES, 0x0087);
CPUMF_EVENT_ATTR(cf_z16, TLB2_PTE_WRITES, 0x0089);
CPUMF_EVENT_ATTR(cf_z16, TLB2_CRSTE_WRITES, 0x008a);
CPUMF_EVENT_ATTR(cf_z16, TLB2_ENGINES_BUSY, 0x008b);
CPUMF_EVENT_ATTR(cf_z16, TX_C_TEND, 0x008c);
CPUMF_EVENT_ATTR(cf_z16, TX_NC_TEND, 0x008d);
CPUMF_EVENT_ATTR(cf_z16, L1C_TLB2_MISSES, 0x008f);
CPUMF_EVENT_ATTR(cf_z16, DCW_REQ, 0x0091);
CPUMF_EVENT_ATTR(cf_z16, DCW_REQ_IV, 0x0092);
CPUMF_EVENT_ATTR(cf_z16, DCW_REQ_CHIP_HIT, 0x0093);
CPUMF_EVENT_ATTR(cf_z16, DCW_REQ_DRAWER_HIT, 0x0094);
CPUMF_EVENT_ATTR(cf_z16, DCW_ON_CHIP, 0x0095);
CPUMF_EVENT_ATTR(cf_z16, DCW_ON_CHIP_IV, 0x0096);
CPUMF_EVENT_ATTR(cf_z16, DCW_ON_CHIP_CHIP_HIT, 0x0097);
CPUMF_EVENT_ATTR(cf_z16, DCW_ON_CHIP_DRAWER_HIT, 0x0098);
CPUMF_EVENT_ATTR(cf_z16, DCW_ON_MODULE, 0x0099);
CPUMF_EVENT_ATTR(cf_z16, DCW_ON_DRAWER, 0x009a);
CPUMF_EVENT_ATTR(cf_z16, DCW_OFF_DRAWER, 0x009b);
CPUMF_EVENT_ATTR(cf_z16, DCW_ON_CHIP_MEMORY, 0x009c);
CPUMF_EVENT_ATTR(cf_z16, DCW_ON_MODULE_MEMORY, 0x009d);
CPUMF_EVENT_ATTR(cf_z16, DCW_ON_DRAWER_MEMORY, 0x009e);
CPUMF_EVENT_ATTR(cf_z16, DCW_OFF_DRAWER_MEMORY, 0x009f);
CPUMF_EVENT_ATTR(cf_z16, IDCW_ON_MODULE_IV, 0x00a0);
CPUMF_EVENT_ATTR(cf_z16, IDCW_ON_MODULE_CHIP_HIT, 0x00a1);
CPUMF_EVENT_ATTR(cf_z16, IDCW_ON_MODULE_DRAWER_HIT, 0x00a2);
CPUMF_EVENT_ATTR(cf_z16, IDCW_ON_DRAWER_IV, 0x00a3);
CPUMF_EVENT_ATTR(cf_z16, IDCW_ON_DRAWER_CHIP_HIT, 0x00a4);
CPUMF_EVENT_ATTR(cf_z16, IDCW_ON_DRAWER_DRAWER_HIT, 0x00a5);
CPUMF_EVENT_ATTR(cf_z16, IDCW_OFF_DRAWER_IV, 0x00a6);
CPUMF_EVENT_ATTR(cf_z16, IDCW_OFF_DRAWER_CHIP_HIT, 0x00a7);
CPUMF_EVENT_ATTR(cf_z16, IDCW_OFF_DRAWER_DRAWER_HIT, 0x00a8);
CPUMF_EVENT_ATTR(cf_z16, ICW_REQ, 0x00a9);
CPUMF_EVENT_ATTR(cf_z16, ICW_REQ_IV, 0x00aa);
CPUMF_EVENT_ATTR(cf_z16, ICW_REQ_CHIP_HIT, 0x00ab);
CPUMF_EVENT_ATTR(cf_z16, ICW_REQ_DRAWER_HIT, 0x00ac);
CPUMF_EVENT_ATTR(cf_z16, ICW_ON_CHIP, 0x00ad);
CPUMF_EVENT_ATTR(cf_z16, ICW_ON_CHIP_IV, 0x00ae);
CPUMF_EVENT_ATTR(cf_z16, ICW_ON_CHIP_CHIP_HIT, 0x00af);
CPUMF_EVENT_ATTR(cf_z16, ICW_ON_CHIP_DRAWER_HIT, 0x00b0);
CPUMF_EVENT_ATTR(cf_z16, ICW_ON_MODULE, 0x00b1);
CPUMF_EVENT_ATTR(cf_z16, ICW_ON_DRAWER, 0x00b2);
CPUMF_EVENT_ATTR(cf_z16, ICW_OFF_DRAWER, 0x00b3);
CPUMF_EVENT_ATTR(cf_z16, ICW_ON_CHIP_MEMORY, 0x00b4);
CPUMF_EVENT_ATTR(cf_z16, ICW_ON_MODULE_MEMORY, 0x00b5);
CPUMF_EVENT_ATTR(cf_z16, ICW_ON_DRAWER_MEMORY, 0x00b6);
CPUMF_EVENT_ATTR(cf_z16, ICW_OFF_DRAWER_MEMORY, 0x00b7);
CPUMF_EVENT_ATTR(cf_z16, BCD_DFP_EXECUTION_SLOTS, 0x00e0);
CPUMF_EVENT_ATTR(cf_z16, VX_BCD_EXECUTION_SLOTS, 0x00e1);
CPUMF_EVENT_ATTR(cf_z16, DECIMAL_INSTRUCTIONS, 0x00e2);
CPUMF_EVENT_ATTR(cf_z16, LAST_HOST_TRANSLATIONS, 0x00e8);
CPUMF_EVENT_ATTR(cf_z16, TX_NC_TABORT, 0x00f4);
CPUMF_EVENT_ATTR(cf_z16, TX_C_TABORT_NO_SPECIAL, 0x00f5);
CPUMF_EVENT_ATTR(cf_z16, TX_C_TABORT_SPECIAL, 0x00f6);
CPUMF_EVENT_ATTR(cf_z16, DFLT_ACCESS, 0x00f8);
CPUMF_EVENT_ATTR(cf_z16, DFLT_CYCLES, 0x00fd);
CPUMF_EVENT_ATTR(cf_z16, SORTL, 0x0100);
CPUMF_EVENT_ATTR(cf_z16, DFLT_CC, 0x0109);
CPUMF_EVENT_ATTR(cf_z16, DFLT_CCFINISH, 0x010a);
CPUMF_EVENT_ATTR(cf_z16, NNPA_INVOCATIONS, 0x010b);
CPUMF_EVENT_ATTR(cf_z16, NNPA_COMPLETIONS, 0x010c);
CPUMF_EVENT_ATTR(cf_z16, NNPA_WAIT_LOCK, 0x010d);
CPUMF_EVENT_ATTR(cf_z16, NNPA_HOLD_LOCK, 0x010e);
CPUMF_EVENT_ATTR(cf_z16, MT_DIAG_CYCLES_ONE_THR_ACTIVE, 0x01c0);
CPUMF_EVENT_ATTR(cf_z16, MT_DIAG_CYCLES_TWO_THR_ACTIVE, 0x01c1);
static struct attribute *cpumcf_fvn1_pmu_event_attr[] __initdata = {
CPUMF_EVENT_PTR(cf_fvn1, CPU_CYCLES),
......@@ -635,6 +705,80 @@ static struct attribute *cpumcf_z15_pmu_event_attr[] __initdata = {
NULL,
};
static struct attribute *cpumcf_z16_pmu_event_attr[] __initdata = {
CPUMF_EVENT_PTR(cf_z16, L1D_RO_EXCL_WRITES),
CPUMF_EVENT_PTR(cf_z16, DTLB2_WRITES),
CPUMF_EVENT_PTR(cf_z16, DTLB2_MISSES),
CPUMF_EVENT_PTR(cf_z16, CRSTE_1MB_WRITES),
CPUMF_EVENT_PTR(cf_z16, DTLB2_GPAGE_WRITES),
CPUMF_EVENT_PTR(cf_z16, ITLB2_WRITES),
CPUMF_EVENT_PTR(cf_z16, ITLB2_MISSES),
CPUMF_EVENT_PTR(cf_z16, TLB2_PTE_WRITES),
CPUMF_EVENT_PTR(cf_z16, TLB2_CRSTE_WRITES),
CPUMF_EVENT_PTR(cf_z16, TLB2_ENGINES_BUSY),
CPUMF_EVENT_PTR(cf_z16, TX_C_TEND),
CPUMF_EVENT_PTR(cf_z16, TX_NC_TEND),
CPUMF_EVENT_PTR(cf_z16, L1C_TLB2_MISSES),
CPUMF_EVENT_PTR(cf_z16, DCW_REQ),
CPUMF_EVENT_PTR(cf_z16, DCW_REQ_IV),
CPUMF_EVENT_PTR(cf_z16, DCW_REQ_CHIP_HIT),
CPUMF_EVENT_PTR(cf_z16, DCW_REQ_DRAWER_HIT),
CPUMF_EVENT_PTR(cf_z16, DCW_ON_CHIP),
CPUMF_EVENT_PTR(cf_z16, DCW_ON_CHIP_IV),
CPUMF_EVENT_PTR(cf_z16, DCW_ON_CHIP_CHIP_HIT),
CPUMF_EVENT_PTR(cf_z16, DCW_ON_CHIP_DRAWER_HIT),
CPUMF_EVENT_PTR(cf_z16, DCW_ON_MODULE),
CPUMF_EVENT_PTR(cf_z16, DCW_ON_DRAWER),
CPUMF_EVENT_PTR(cf_z16, DCW_OFF_DRAWER),
CPUMF_EVENT_PTR(cf_z16, DCW_ON_CHIP_MEMORY),
CPUMF_EVENT_PTR(cf_z16, DCW_ON_MODULE_MEMORY),
CPUMF_EVENT_PTR(cf_z16, DCW_ON_DRAWER_MEMORY),
CPUMF_EVENT_PTR(cf_z16, DCW_OFF_DRAWER_MEMORY),
CPUMF_EVENT_PTR(cf_z16, IDCW_ON_MODULE_IV),
CPUMF_EVENT_PTR(cf_z16, IDCW_ON_MODULE_CHIP_HIT),
CPUMF_EVENT_PTR(cf_z16, IDCW_ON_MODULE_DRAWER_HIT),
CPUMF_EVENT_PTR(cf_z16, IDCW_ON_DRAWER_IV),
CPUMF_EVENT_PTR(cf_z16, IDCW_ON_DRAWER_CHIP_HIT),
CPUMF_EVENT_PTR(cf_z16, IDCW_ON_DRAWER_DRAWER_HIT),
CPUMF_EVENT_PTR(cf_z16, IDCW_OFF_DRAWER_IV),
CPUMF_EVENT_PTR(cf_z16, IDCW_OFF_DRAWER_CHIP_HIT),
CPUMF_EVENT_PTR(cf_z16, IDCW_OFF_DRAWER_DRAWER_HIT),
CPUMF_EVENT_PTR(cf_z16, ICW_REQ),
CPUMF_EVENT_PTR(cf_z16, ICW_REQ_IV),
CPUMF_EVENT_PTR(cf_z16, ICW_REQ_CHIP_HIT),
CPUMF_EVENT_PTR(cf_z16, ICW_REQ_DRAWER_HIT),
CPUMF_EVENT_PTR(cf_z16, ICW_ON_CHIP),
CPUMF_EVENT_PTR(cf_z16, ICW_ON_CHIP_IV),
CPUMF_EVENT_PTR(cf_z16, ICW_ON_CHIP_CHIP_HIT),
CPUMF_EVENT_PTR(cf_z16, ICW_ON_CHIP_DRAWER_HIT),
CPUMF_EVENT_PTR(cf_z16, ICW_ON_MODULE),
CPUMF_EVENT_PTR(cf_z16, ICW_ON_DRAWER),
CPUMF_EVENT_PTR(cf_z16, ICW_OFF_DRAWER),
CPUMF_EVENT_PTR(cf_z16, ICW_ON_CHIP_MEMORY),
CPUMF_EVENT_PTR(cf_z16, ICW_ON_MODULE_MEMORY),
CPUMF_EVENT_PTR(cf_z16, ICW_ON_DRAWER_MEMORY),
CPUMF_EVENT_PTR(cf_z16, ICW_OFF_DRAWER_MEMORY),
CPUMF_EVENT_PTR(cf_z16, BCD_DFP_EXECUTION_SLOTS),
CPUMF_EVENT_PTR(cf_z16, VX_BCD_EXECUTION_SLOTS),
CPUMF_EVENT_PTR(cf_z16, DECIMAL_INSTRUCTIONS),
CPUMF_EVENT_PTR(cf_z16, LAST_HOST_TRANSLATIONS),
CPUMF_EVENT_PTR(cf_z16, TX_NC_TABORT),
CPUMF_EVENT_PTR(cf_z16, TX_C_TABORT_NO_SPECIAL),
CPUMF_EVENT_PTR(cf_z16, TX_C_TABORT_SPECIAL),
CPUMF_EVENT_PTR(cf_z16, DFLT_ACCESS),
CPUMF_EVENT_PTR(cf_z16, DFLT_CYCLES),
CPUMF_EVENT_PTR(cf_z16, SORTL),
CPUMF_EVENT_PTR(cf_z16, DFLT_CC),
CPUMF_EVENT_PTR(cf_z16, DFLT_CCFINISH),
CPUMF_EVENT_PTR(cf_z16, NNPA_INVOCATIONS),
CPUMF_EVENT_PTR(cf_z16, NNPA_COMPLETIONS),
CPUMF_EVENT_PTR(cf_z16, NNPA_WAIT_LOCK),
CPUMF_EVENT_PTR(cf_z16, NNPA_HOLD_LOCK),
CPUMF_EVENT_PTR(cf_z16, MT_DIAG_CYCLES_ONE_THR_ACTIVE),
CPUMF_EVENT_PTR(cf_z16, MT_DIAG_CYCLES_TWO_THR_ACTIVE),
NULL,
};
/* END: CPUM_CF COUNTER DEFINITIONS ===================================== */
static struct attribute_group cpumcf_pmu_events_group = {
......@@ -749,6 +893,10 @@ __init const struct attribute_group **cpumf_cf_event_group(void)
case 0x8562:
model = cpumcf_z15_pmu_event_attr;
break;
case 0x3931:
case 0x3932:
model = cpumcf_z16_pmu_event_attr;
break;
default:
model = none;
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7