lkml.org 
[lkml]   [2020]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 037/179] s390/cpum_cf,perf: change DFLT_CCERROR counter name
    Date
    From: Thomas Richter <tmricht@linux.ibm.com>

    commit 3d3af181d370069861a3be94608464e2ff3682e2 upstream.

    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: d68d5d51dc89 ("s390/cpum_cf: Add new extended counters for IBM z15")
    Fixes: e7950166e402 ("perf vendor events s390: Add new deflate counters for IBM z15")
    Cc: stable@vger.kernel.org # v5.7
    Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
    Reviewed-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
    Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/s390/kernel/perf_cpum_cf_events.c | 4 ++--
    tools/perf/pmu-events/arch/s390/cf_z15/extended.json | 2 +-
    2 files changed, 3 insertions(+), 3 deletions(-)

    --- a/arch/s390/kernel/perf_cpum_cf_events.c
    +++ b/arch/s390/kernel/perf_cpum_cf_events.c
    @@ -292,7 +292,7 @@ CPUMF_EVENT_ATTR(cf_z15, TX_C_TABORT_SPE
    CPUMF_EVENT_ATTR(cf_z15, DFLT_ACCESS, 0x00f7);
    CPUMF_EVENT_ATTR(cf_z15, DFLT_CYCLES, 0x00fc);
    CPUMF_EVENT_ATTR(cf_z15, DFLT_CC, 0x00108);
    -CPUMF_EVENT_ATTR(cf_z15, DFLT_CCERROR, 0x00109);
    +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);

    @@ -629,7 +629,7 @@ static struct attribute *cpumcf_z15_pmu_
    CPUMF_EVENT_PTR(cf_z15, DFLT_ACCESS),
    CPUMF_EVENT_PTR(cf_z15, DFLT_CYCLES),
    CPUMF_EVENT_PTR(cf_z15, DFLT_CC),
    - CPUMF_EVENT_PTR(cf_z15, DFLT_CCERROR),
    + CPUMF_EVENT_PTR(cf_z15, DFLT_CCFINISH),
    CPUMF_EVENT_PTR(cf_z15, MT_DIAG_CYCLES_ONE_THR_ACTIVE),
    CPUMF_EVENT_PTR(cf_z15, MT_DIAG_CYCLES_TWO_THR_ACTIVE),
    NULL,
    --- a/tools/perf/pmu-events/arch/s390/cf_z15/extended.json
    +++ b/tools/perf/pmu-events/arch/s390/cf_z15/extended.json
    @@ -380,7 +380,7 @@
    {
    "Unit": "CPU-M-CF",
    "EventCode": "265",
    - "EventName": "DFLT_CCERROR",
    + "EventName": "DFLT_CCFINISH",
    "BriefDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2",
    "PublicDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed that ended in Condition Codes 0, 1 or 2"
    },

    \
     
     \ /
      Last update: 2020-07-27 16:33    [W:3.252 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site