Skip to content

Commit 3d3af18

Browse files
Thomas Richterhcahca
authored andcommitted
s390/cpum_cf,perf: change DFLT_CCERROR counter name
Change the counter name DLFT_CCERROR to DLFT_CCFINISH on IBM z15. This counter counts completed DEFLATE instructions with exit code 0, 1 or 2. Since exit code 0 means success and exit code 1 or 2 indicate errors, change the counter name to avoid confusion. This counter is incremented each time the DEFLATE instruction completed regardless if an error was detected or not. Fixes: d68d5d5 ("s390/cpum_cf: Add new extended counters for IBM z15") Fixes: e795016 ("perf vendor events s390: Add new deflate counters for IBM z15") Cc: [email protected] # v5.7 Signed-off-by: Thomas Richter <[email protected]> Reviewed-by: Sumanth Korikkar <[email protected]> Signed-off-by: Heiko Carstens <[email protected]>
1 parent ba47d84 commit 3d3af18

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

arch/s390/kernel/perf_cpum_cf_events.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ CPUMF_EVENT_ATTR(cf_z15, TX_C_TABORT_SPECIAL, 0x00f5);
292292
CPUMF_EVENT_ATTR(cf_z15, DFLT_ACCESS, 0x00f7);
293293
CPUMF_EVENT_ATTR(cf_z15, DFLT_CYCLES, 0x00fc);
294294
CPUMF_EVENT_ATTR(cf_z15, DFLT_CC, 0x00108);
295-
CPUMF_EVENT_ATTR(cf_z15, DFLT_CCERROR, 0x00109);
295+
CPUMF_EVENT_ATTR(cf_z15, DFLT_CCFINISH, 0x00109);
296296
CPUMF_EVENT_ATTR(cf_z15, MT_DIAG_CYCLES_ONE_THR_ACTIVE, 0x01c0);
297297
CPUMF_EVENT_ATTR(cf_z15, MT_DIAG_CYCLES_TWO_THR_ACTIVE, 0x01c1);
298298

@@ -629,7 +629,7 @@ static struct attribute *cpumcf_z15_pmu_event_attr[] __initdata = {
629629
CPUMF_EVENT_PTR(cf_z15, DFLT_ACCESS),
630630
CPUMF_EVENT_PTR(cf_z15, DFLT_CYCLES),
631631
CPUMF_EVENT_PTR(cf_z15, DFLT_CC),
632-
CPUMF_EVENT_PTR(cf_z15, DFLT_CCERROR),
632+
CPUMF_EVENT_PTR(cf_z15, DFLT_CCFINISH),
633633
CPUMF_EVENT_PTR(cf_z15, MT_DIAG_CYCLES_ONE_THR_ACTIVE),
634634
CPUMF_EVENT_PTR(cf_z15, MT_DIAG_CYCLES_TWO_THR_ACTIVE),
635635
NULL,

tools/perf/pmu-events/arch/s390/cf_z15/extended.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@
380380
{
381381
"Unit": "CPU-M-CF",
382382
"EventCode": "265",
383-
"EventName": "DFLT_CCERROR",
383+
"EventName": "DFLT_CCFINISH",
384384
"BriefDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2",
385385
"PublicDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2"
386386
},

0 commit comments

Comments
 (0)