perf report: Display CPU Measurement facility counter sets

On s390 the event bc000 (also named CF_DIAG) extracts the CPU Measurement Facility diagnostic counter sets and displays them as counter number and counter value pairs sorted by counter set number.

erf report: Display arch specific diagnostic counter sets, starting with s390

    On s390 the event bc000 (also named CF_DIAG) extracts the CPU
    Measurement Facility diagnostic counter sets and displays them as
    counter number and counter value pairs sorted by counter set number.
    
    Output:
     [root@s35lp76 perf]# ./perf report -D --stdio
    
     [00000000] Counterset:0 Counters:6
       Counter:000 Value:0x000000000085ec36 Counter:001 Value:0x0000000000796c94
       Counter:002 Value:0x0000000000005ada Counter:003 Value:0x0000000000092460
       Counter:004 Value:0x0000000000006073 Counter:005 Value:0x00000000001a9a73
     [0x000038] Counterset:1 Counters:2
       Counter:000 Value:0x000000000007c59f Counter:001 Value:0x000000000002fad6
     [0x000050] Counterset:2 Counters:16
       Counter:000 Value:000000000000000000 Counter:001 Value:000000000000000000
       Counter:002 Value:000000000000000000 Counter:003 Value:000000000000000000
       Counter:004 Value:000000000000000000 Counter:005 Value:000000000000000000
       Counter:006 Value:000000000000000000 Counter:007 Value:000000000000000000
       Counter:008 Value:000000000000000000 Counter:009 Value:000000000000000000
       Counter:010 Value:000000000000000000 Counter:011 Value:000000000000000000
       Counter:012 Value:000000000000000000 Counter:013 Value:000000000000000000
       Counter:014 Value:000000000000000000 Counter:015 Value:000000000000000000
     [0x0000d8] Counterset:3 Counters:128
       Counter:000 Value:0x000000000000020f Counter:001 Value:0x00000000000001d8
       Counter:002 Value:0x000000000000d7fa Counter:003 Value:0x000000000000008b
       ...
    
    The number in brackets is the offset into the raw data field of the
    sample.
    
    New functions trace_event_sample_raw__init() and s390_sample_raw() are
    introduced in the code path to enable interpretation on non s390
    platforms. This event bc000 attached raw data is generated only on s390
    platform. Correct display on other platforms requires correct endianness
    handling.
    
    Committer notes:

    Added a init function that sets up a evlist function pointer to avoid
    repeated tests on evlist->env and calls to perf_env__name() that
    involves normalizing, etc, for each PERF_RECORD_SAMPLE.
    
    Removed needless __maybe_unused from the trace_event_raw()
    prototype in session.h, move it to be an static function in evlist.
    
    Reviewed-by: Hendrik Brueckner <[email protected]>

Quoted 1 line

Quoted 1 line

import perf

On Thu, Jan 17, 2019 at 11:00:53AM -0300, Arnaldo Carvalho de Melo wrote:

SNIP

tools/perf/util/python-ext-sources util/parse-branch-options.c · line 31

Quoted 10 lines

tools/perf/util/python-ext-sources +1 -0

@@ -25,6 +25,7 @@ util/parse-branch-options.c
 util/rblist.c
 util/counts.c
 util/print_binary.c
+util/s390-sample-raw.c
 util/strlist.c
 util/trace-event.c
 ../lib/rbtree.c

hi,
this change breaks the python module:

Quoted 1 line

Quoted 1 line

Quoted 1 line

import perf

Traceback (most recent call last):

    File "<stdin>", line 1, in <module>

ImportError: ./perf.so: undefined symbol: color_fprintf

changelog doesn't say anything about python related change

Quoted 18 lines · Jiri Olsa

On Thu, Jan 17, 2019 at 11:00:53AM -0300, Arnaldo Carvalho de Melo wrote:

SNIP

tools/perf/util/python-ext-sources util/parse-branch-options.c · line 31

Quoted 10 lines

tools/perf/util/python-ext-sources +1 -0

@@ -25,6 +25,7 @@ util/parse-branch-options.c
 util/rblist.c
 util/counts.c
 util/print_binary.c
+util/s390-sample-raw.c
 util/strlist.c
 util/trace-event.c
 ../lib/rbtree.c

hi,
this change breaks the python module:

Quoted 6 lines

Quoted 1 line

Quoted 1 line

Quoted 1 line

import perf

Traceback (most recent call last):

    File "<stdin>", line 1, in <module>

ImportError: ./perf.so: undefined symbol: color_fprintf

changelog doesn't say anything about python related change

I made some chenages and movedthat raw sample code under s390.. which cured the python module, but I haven't tested it on s390.

Could you please check if code in here works for you:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/s390

if it works, I'll post it

thanks,
jirka

Quoted 23 lines · Arnaldo Carvalho de Melo

SNIP

tools/perf/util/python-ext-sources util/parse-branch-options.c · line 31

Quoted 10 lines

tools/perf/util/python-ext-sources +1 -0

@@ -25,6 +25,7 @@ util/parse-branch-options.c
 util/rblist.c
 util/counts.c
 util/print_binary.c
+util/s390-sample-raw.c
 util/strlist.c
 util/trace-event.c
 ../lib/rbtree.c

hi,
this change breaks the python module:

Quoted 1 line

Quoted 1 line

Quoted 1 line

import perf

Traceback (most recent call last):

    File "<stdin>", line 1, in <module>

ImportError: ./perf.so: undefined symbol: color_fprintf

Quoted 1 line

changelog doesn't say anything about python related change

I made some chenages and movedthat raw sample code under s390.. which cured the python module, but I haven't tested it on s390.

Could you please check if code in here works for you:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/s390

if it works, I'll post it

thanks,
jirka

Em Mon, Jan 21, 2019 at 02:13:36PM +0100, Jiri Olsa escreveu:

Quoted 24 lines · Jiri Olsa

Quoted 23 lines · Arnaldo Carvalho de Melo

SNIP

tools/perf/util/python-ext-sources util/parse-branch-options.c · line 31

Quoted 10 lines

tools/perf/util/python-ext-sources +1 -0

@@ -25,6 +25,7 @@ util/parse-branch-options.c
 util/rblist.c
 util/counts.c
 util/print_binary.c
+util/s390-sample-raw.c
 util/strlist.c
 util/trace-event.c
 ../lib/rbtree.c

hi,
this change breaks the python module:

Quoted 1 line

Quoted 1 line

Quoted 1 line

import perf

Traceback (most recent call last):

    File "<stdin>", line 1, in <module>

ImportError: ./perf.so: undefined symbol: color_fprintf

Quoted 5 lines

Quoted 1 line

changelog doesn't say anything about python related change

I made some chenages and movedthat raw sample code under s390.. which cured the python module, but I haven't tested it on s390.

Nope, I explicitely asked him to build that code for all arches, as we want to process s390 perf.data files on a x86 or arm or any other arch.

I stumbled on this as well, I think the way to go is to get the color_fprintf bits in a separate object to avoid dragging more stuff to the perf binding set of objects and then add that to the python binding.

Quoted 8 lines

Could you please check if code in here works for you:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/s390

if it works, I'll post it

thanks,
jirka

Signature · 1 line

- Arnaldo

Quoted 31 lines

Em Mon, Jan 21, 2019 at 02:13:36PM +0100, Jiri Olsa escreveu:

Quoted 29 lines · Jiri Olsa

Quoted 18 lines · Arnaldo Carvalho de Melo

SNIP

tools/perf/util/python-ext-sources util/parse-branch-options.c · line 31

Quoted 10 lines

tools/perf/util/python-ext-sources +1 -0

@@ -25,6 +25,7 @@ util/parse-branch-options.c
 util/rblist.c
 util/counts.c
 util/print_binary.c
+util/s390-sample-raw.c
 util/strlist.c
 util/trace-event.c
 ../lib/rbtree.c

hi,
this change breaks the python module:

Quoted 6 lines

Quoted 1 line

Quoted 1 line

Quoted 1 line

import perf

Traceback (most recent call last):

    File "<stdin>", line 1, in <module>

ImportError: ./perf.so: undefined symbol: color_fprintf

changelog doesn't say anything about python related change

I made some chenages and movedthat raw sample code under s390.. which cured the python module, but I haven't tested it on s390.

Quoted 3 lines

Nope, I explicitely asked him to build that code for all arches, as we want to process s390 perf.data files on a x86 or arm or any other arch.

aah, so this actualy works over the s390 perf archive data on x86 host?

I missed that in the original conversation, sry for noise

jirka

Quoted 16 lines

I stumbled on this as well, I think the way to go is to get the color_fprintf bits in a separate object to avoid dragging more stuff to the perf binding set of objects and then add that to the python binding.

Quoted 8 lines

Could you please check if code in here works for you:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/s390

if it works, I'll post it

thanks,
jirka

Signature · 1 line

- Arnaldo

Em Mon, Jan 21, 2019 at 02:13:36PM +0100, Jiri Olsa escreveu:

Quoted 24 lines · Jiri Olsa

Quoted 23 lines · Arnaldo Carvalho de Melo

SNIP

tools/perf/util/python-ext-sources util/parse-branch-options.c · line 31

Quoted 10 lines

tools/perf/util/python-ext-sources +1 -0

@@ -25,6 +25,7 @@ util/parse-branch-options.c
 util/rblist.c
 util/counts.c
 util/print_binary.c
+util/s390-sample-raw.c
 util/strlist.c
 util/trace-event.c
 ../lib/rbtree.c

hi,
this change breaks the python module:

Quoted 1 line

Quoted 1 line

Quoted 1 line

import perf

Traceback (most recent call last):

    File "<stdin>", line 1, in <module>

ImportError: ./perf.so: undefined symbol: color_fprintf

Quoted 5 lines

Quoted 1 line

changelog doesn't say anything about python related change

I made some chenages and movedthat raw sample code under s390.. which cured the python module, but I haven't tested it on s390.

Nope, I explicitely asked him to build that code for all arches, as we want to process s390 perf.data files on a x86 or arm or any other arch.

I stumbled on this as well, I think the way to go is to get the color_fprintf bits in a separate object to avoid dragging more stuff to the perf binding set of objects and then add that to the python binding.

On s390 the CPU Measurement Facility diagnostic counter sets are displayed by counter number and value. Add the logical counter name in the output (if it is available). Otherwise "unknown" is shown.

Output before:
[root@s35lp76 perf]# ./perf report -D --stdio
[00000000] Counterset:0 Counters:6
Counter:000 Value:0x000000000085ec36 Counter:001 Value:0x0000000000796c94 Counter:002 Value:0x0000000000005ada Counter:003 Value:0x0000000000092460 Counter:004 Value:0x0000000000006073 Counter:005 Value:0x00000000001a9a73
[0x000038] Counterset:1 Counters:2
Counter:000 Value:0x000000000007c59f Counter:001 Value:0x000000000002fad6
[0x000050] Counterset:2 Counters:16
Counter:000 Value:000000000000000000 Counter:001 Value:000000000000000000

Output after:

    [root@s35lp76 perf]# ./perf report -D --stdio

[00000000] Counterset:0 Counters:6

     Counter:000 cpu_cycles Value:0x000000000085ec36
     Counter:001 instructions Value:0x0000000000796c94
     Counter:002 l1i_dir_writes Value:0x0000000000005ada
     Counter:003 l1i_penalty_cycles Value:0x0000000000092460
     Counter:004 l1d_dir_writes Value:0x0000000000006073
     Counter:005 l1d_penalty_cycles Value:0x00000000001a9a73
 [0x000038] Counterset:1 Counters:2
     Counter:000 problem_state_cpu_cycles Value:0x000000000007c59f
     Counter:001 problem_state_instructions Value:0x000000000002fad6
 [0x000050] Counterset:2 Counters:16
     Counter:000 prng_functions Value:000000000000000000

Signed-off-by Thomas Richter <[email protected]>

Reviewed-by Hendrik Brueckner <[email protected]>

---
 tools/perf/util/s390-sample-raw.c | 59 +++++++++++++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 5 deletions(-)

tools/perf/util/s390-sample-raw.c +54 -5

index ae16c38ce296..73797bda919d 100644
@@ -28,6 +28,7 @@
 #include "config.h"
 #include "color.h"
 #include "s390-cpumcf-kernel.h"
+#include "pmu-events/pmu-events.h"
 
 static size_t ctrset_size(struct cf_ctrset_entry *set)
 {

@@ -111,14 +112,61 @@ static void s390_cpumcfdg_dumptrail(const char *color, size_t offset,
 		      te.tod_base, te.mach_type);
 }
 
+/* Return starting number of a counter set */
+static int get_counterset_start(int setnr)
+{
+	switch (setnr) {
+	case CPUMF_CTR_SET_BASIC:		/* Basic counter set */
+		return 0;
+	case CPUMF_CTR_SET_USER:		/* Problem state counter set */
+		return 32;
+	case CPUMF_CTR_SET_CRYPTO:		/* Crypto counter set */
+		return 64;
+	case CPUMF_CTR_SET_EXT:			/* Extended counter set */
+		return 128;
+	case CPUMF_CTR_SET_MT_DIAG:		/* Diagnostic counter set */
+		return 448;
+	default:
+		return -1;
+	}
+}
+
+/* Scan the PMU table and extract the logical name of a counter from the
+ * PMU events table. Input is the counter set and counter number with in the
+ * set. Construct the event number and use this as key. If they match return
+ * the name of this counter.
+ * If no match is found a NULL pointer is returned.
+ */
+static const char *get_counter_name(int set, int nr, struct pmu_events_map *map)
+{
+	int rc, event_nr, wanted = get_counterset_start(set) + nr;
+
+	if (map) {
+		struct pmu_event *evp = map->table;
+
+		for (; evp->name || evp->event || evp->desc; ++evp) {
+			if (evp->name == NULL || evp->event == NULL)
+				continue;
+			rc = sscanf(evp->event, "event=%x", &event_nr);
+			if (rc == 1 && event_nr == wanted)
+				return evp->name;
+		}
+	}
+	return NULL;
+}
+
 static void s390_cpumcfdg_dump(struct perf_sample *sample)
 {
 	size_t i, len = sample->raw_size, offset = 0;
 	unsigned char *buf = sample->raw_data;
 	const char *color = PERF_COLOR_BLUE;
 	struct cf_ctrset_entry *cep, ce;
+	struct pmu_events_map *map;
+	struct perf_pmu pmu;
 	u64 *p;
 
+	memset(&pmu, 0, sizeof(pmu));
+	map = perf_pmu__find_map(&pmu);
 	while (offset < len) {
 		cep = (struct cf_ctrset_entry *)(buf + offset);
 

@@ -135,12 +183,13 @@ static void s390_cpumcfdg_dump(struct perf_sample *sample)
 
 		color_fprintf(stdout, color, "    [%#08zx] Counterset:%d"
 			      " Counters:%d\n", offset, ce.set, ce.ctr);
-		for (i = 0, p = (u64 *)(cep + 1); i < ce.ctr; i += 2, p += 2)
+		for (i = 0, p = (u64 *)(cep + 1); i < ce.ctr; ++i, ++p) {
+			const char *ev_name = get_counter_name(ce.set, i, map);
+
 			color_fprintf(stdout, color,
-				      "\tCounter:%03d Value:%#018lx"
-				      " Counter:%03d Value:%#018lx\n",
-				      i, be64_to_cpu(*p),
-				      i + 1, be64_to_cpu(*(p + 1)));
+				      "\tCounter:%03d %s Value:%#018lx\n", i,
+				      ev_name ?: "<unknown>", be64_to_cpu(*p));
+		}
 		offset += ctrset_size(&ce);
 	}
 }

Signature · 1 line

2.14.3

Add support for the new s390 PMU device cpum_cf_diag to extract the counter set diagnostic data. This data is available as event raw data and can be created with this command:

[root@s35lp76 perf]# ./perf record -R -e '{rbd000,rbc000}' --

                                 ~/mytests/facultaet 2500

[ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.009 MB perf.data ] [root@s35lp76 perf]#

The new event 0xbc000 generated this counter set diagnostic trace data. The data can be extracted using command:

  [root@s35lp76 perf]# ./perf report --stdio --itrace=d
  #
  # Total Lost Samples: 0
  #
  # Samples: 21  of events 'anon group { rbd000, rbc000 }'
  # Event count (approx.): 21
  #
  #         Overhead  Command    Shared Object      Symbol
  # ................  .........  .................  ........................
  #
    80.95%   0.00%  facultaet  facultaet          [.] facultaet
     4.76%   0.00%  facultaet  [kernel.kallsyms]  [k] check_chain_key
     4.76%   0.00%  facultaet  [kernel.kallsyms]  [k] ftrace_likely_update
     4.76%   0.00%  facultaet  [kernel.kallsyms]  [k] lock_release
     4.76%   0.00%  facultaet  libc-2.26.so       [.] _dl_addr
  [root@s35lp76 perf]# ll aux*
  -rw-r--r-- 1 root root 3408 Oct 16 12:40 aux.ctr.02
  -rw-r--r-- 1 root root 4096 Oct 16 12:40 aux.smp.02
  [root@s35lp76 perf]#

The files named aux.ctr.## contain the counter set diagnstic data and the files named aux.smp.## contain the sampling diagnostic data. ## stand for the CPU number the data was taken from.

Signed-off-by Thomas Richter <[email protected]>

Reviewed-by Hendrik Brueckner <[email protected]>

---
 tools/perf/util/s390-cpumsf.c | 77 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 73 insertions(+), 4 deletions(-)

tools/perf/util/s390-cpumsf.c +73 -4

index 68b2570304ec..835249c77f56 100644
@@ -162,6 +162,7 @@
 #include "auxtrace.h"
 #include "s390-cpumsf.h"
 #include "s390-cpumsf-kernel.h"
+#include "s390-cpumcf-kernel.h"
 #include "config.h"
 
 struct s390_cpumsf {

@@ -184,8 +185,58 @@ struct s390_cpumsf_queue {
 	struct auxtrace_buffer	*buffer;
 	int			cpu;
 	FILE			*logfile;
+	FILE			*logfile_ctr;
 };
 
+/* Check if the raw data should be dumped to file. If this is the case and
+ * the file to dump to has not been opened for writing, do so.
+ *
+ * Return 0 on success and greater zero on error so processing continues.
+ */
+static int s390_cpumcf_dumpctr(struct s390_cpumsf *sf,
+			       struct perf_sample *sample)
+{
+	struct s390_cpumsf_queue *sfq;
+	struct auxtrace_queue *q;
+	int rc = 0;
+
+	if (!sf->use_logfile || sf->queues.nr_queues <= sample->cpu)
+		return rc;
+
+	q = &sf->queues.queue_array[sample->cpu];
+	sfq = q->priv;
+	if (!sfq)		/* Queue not yet allocated */
+		return rc;
+
+	if (!sfq->logfile_ctr) {
+		char *name;
+
+		rc = (sf->logdir)
+			? asprintf(&name, "%s/aux.ctr.%02x",
+				 sf->logdir, sample->cpu)
+			: asprintf(&name, "aux.ctr.%02x", sample->cpu);
+		if (rc > 0)
+			sfq->logfile_ctr = fopen(name, "w");
+		if (sfq->logfile_ctr == NULL) {
+			pr_err("Failed to open counter set log file %s, "
+			       "continue...\n", name);
+			rc = 1;
+		}
+		free(name);
+	}
+
+	if (sfq->logfile_ctr) {
+		/* See comment above for -4 */
+		size_t n = fwrite(sample->raw_data, sample->raw_size - 4, 1,
+				  sfq->logfile_ctr);
+		if (n != 1) {
+			pr_err("Failed to write counter set data\n");
+			rc = 1;
+		}
+	}
+	return rc;
+}
+
 /* Display s390 CPU measurement facility basic-sampling data entry */
 static bool s390_cpumsf_basic_show(const char *color, size_t pos,
 				   struct hws_basic_entry *basic)

@@ -792,7 +843,7 @@ static int s390_cpumsf_lost(struct s390_cpumsf *sf, struct perf_sample *sample)
 }
 
 static int
-s390_cpumsf_process_event(struct perf_session *session __maybe_unused,
+s390_cpumsf_process_event(struct perf_session *session,
 			  union perf_event *event,
 			  struct perf_sample *sample,
 			  struct perf_tool *tool)

@@ -801,6 +852,8 @@ s390_cpumsf_process_event(struct perf_session *session __maybe_unused,
 					      struct s390_cpumsf,
 					      auxtrace);
 	u64 timestamp = sample->time;
+	struct perf_evsel *ev_bc000;
+
 	int err = 0;
 
 	if (dump_trace)

@@ -811,6 +864,16 @@ s390_cpumsf_process_event(struct perf_session *session __maybe_unused,
 		return -EINVAL;
 	}
 
+	if (event->header.type == PERF_RECORD_SAMPLE &&
+	    sample->raw_size) {
+		/* Handle event with raw data */
+		ev_bc000 = perf_evlist__event2evsel(session->evlist, event);
+		if (ev_bc000 &&
+		    ev_bc000->attr.config == PERF_EVENT_CPUM_CF_DIAG)
+			err = s390_cpumcf_dumpctr(sf, sample);
+		return err;
+	}
+
 	if (event->header.type == PERF_RECORD_AUX &&
 	    event->aux.flags & PERF_AUX_FLAG_TRUNCATED)
 		return s390_cpumsf_lost(sf, sample);

@@ -891,9 +954,15 @@ static void s390_cpumsf_free_queues(struct perf_session *session)
 		struct s390_cpumsf_queue *sfq = (struct s390_cpumsf_queue *)
 						queues->queue_array[i].priv;
 
-		if (sfq != NULL && sfq->logfile) {
-			fclose(sfq->logfile);
-			sfq->logfile = NULL;
+		if (sfq != NULL) {
+			if (sfq->logfile) {
+				fclose(sfq->logfile);
+				sfq->logfile = NULL;
+			}
+			if (sfq->logfile_ctr) {
+				fclose(sfq->logfile_ctr);
+				sfq->logfile_ctr = NULL;
+			}
 		}
 		zfree(&queues->queue_array[i].priv);
 	}

Signature · 1 line

2.14.3