perf vendor events s390: Add new deflate counters for IBM z15

Add support for new deflate counters:

- Counter 247: cycles CPU spent obtaining access to Deflate unit
- Counter 252: cycles CPU is using Deflate unit
- Counter 264: Increments by one for every DEFLATE CONVERSION CALL
	    instruction executed.
- Counter 265: Increments by one for every DEFLATE CONVERSION CALL
	    instruction executed that ended in Condition Codes
	    0, 1 or 2.

Also adjust the some crypto counter description to latest documentation.

Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Reviewed-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Link: http://lore.kernel.org/lkml/20200310142937.32045-1-tmricht@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json b/tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json
index 5e36bc2468d0f36a8a2c2ecc8dd375edd0fe5985..c998e4f1d1d23adeb393ec341402bc906a498700 100644 (file)
--- a/tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json
+++ b/tools/perf/pmu-events/arch/s390/cf_z15/crypto6.json
@@ -4,27 +4,27 @@
                "EventCode": "80",
                "EventName": "ECC_FUNCTION_COUNT",
                "BriefDescription": "ECC Function Count",
-               "PublicDescription": "Long ECC function Count"
+               "PublicDescription": "This counter counts the total number of the elliptic-curve cryptography (ECC) functions issued by the CPU."
        },
        {
                "Unit": "CPU-M-CF",
                "EventCode": "81",
                "EventName": "ECC_CYCLES_COUNT",
                "BriefDescription": "ECC Cycles Count",
-               "PublicDescription": "Long ECC Function cycles count"
+               "PublicDescription": "This counter counts the total number of CPU cycles when the ECC coprocessor is busy performing the elliptic-curve cryptography (ECC) functions issued by the CPU."
        },
        {
                "Unit": "CPU-M-CF",
                "EventCode": "82",
                "EventName": "ECC_BLOCKED_FUNCTION_COUNT",
                "BriefDescription": "Ecc Blocked Function Count",
-               "PublicDescription": "Long ECC blocked function count"
+               "PublicDescription": "This counter counts the total number of the elliptic-curve cryptography (ECC) functions that are issued by the CPU and are blocked because the ECC coprocessor is busy performing a function issued by another CPU."
        },
        {
                "Unit": "CPU-M-CF",
                "EventCode": "83",
                "EventName": "ECC_BLOCKED_CYCLES_COUNT",
                "BriefDescription": "ECC Blocked Cycles Count",
-               "PublicDescription": "Long ECC blocked cycles count"
+               "PublicDescription": "This counter counts the total number of CPU cycles blocked for the elliptic-curve cryptography (ECC) functions issued by the CPU because the ECC coprocessor is busy performing a function issued by another CPU."
        },
 ]

diff --git a/tools/perf/pmu-events/arch/s390/cf_z15/extended.json b/tools/perf/pmu-events/arch/s390/cf_z15/extended.json
index 89e070727e1bd388bc057d99c4a998c7dc6a701d..2df2e231e9eed6d2e4b8f708aa556fc18c1ebecd 100644 (file)
--- a/tools/perf/pmu-events/arch/s390/cf_z15/extended.json
+++ b/tools/perf/pmu-events/arch/s390/cf_z15/extended.json
@@ -25,7 +25,7 @@
                "EventCode": "131",
                "EventName": "DTLB2_HPAGE_WRITES",
                "BriefDescription": "DTLB2 One-Megabyte Page Writes",
-               "PublicDescription": "A translation entry was written into the Combined Region and Segment Table Entry array in the Level-2 TLB for a one-megabyte page or a Last Host Translation was done"
+               "PublicDescription": "A translation entry was written into the Combined Region and Segment Table Entry array in the Level-2 TLB for a one-megabyte page"
        },
        {
                "Unit": "CPU-M-CF",
@@ -356,6 +356,34 @@
                "BriefDescription": "Aborted transactions in constrained TX mode using special completion logic",
                "PublicDescription": "A transaction abort has occurred in a constrained transactional-execution mode and the CPU is using special logic to allow the transaction to complete"
        },
+       {
+               "Unit": "CPU-M-CF",
+               "EventCode": "247",
+               "EventName": "DFLT_ACCESS",
+               "BriefDescription": "Cycles CPU spent obtaining access to Deflate unit",
+               "PublicDescription": "Cycles CPU spent obtaining access to Deflate unit"
+       },
+       {
+               "Unit": "CPU-M-CF",
+               "EventCode": "252",
+               "EventName": "DFLT_CYCLES",
+               "BriefDescription": "Cycles CPU is using Deflate unit",
+               "PublicDescription": "Cycles CPU is using Deflate unit"
+       },
+       {
+               "Unit": "CPU-M-CF",
+               "EventCode": "264",
+               "EventName": "DFLT_CC",
+               "BriefDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed",
+               "PublicDescription": "Increments by one for every DEFLATE CONVERSION CALL instruction executed"
+       },
+       {
+               "Unit": "CPU-M-CF",
+               "EventCode": "265",
+               "EventName": "DFLT_CCERROR",
+               "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"
+       },
        {
                "Unit": "CPU-M-CF",
                "EventCode": "448",