Commit 113fcb46 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf s390-cpumsf: Implement ->evsel_is_auxtrace() callback 



Implement ->evsel_is_auxtrace() callback.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lore.kernel.org/lkml/20200401101613.6201-7-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a58ab57c

tools/perf/util/s390-cpumcf-kernel.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#define	S390_CPUMCF_DIAG_DEF	0xfeef	/* Counter diagnostic entry ID */

#define	PERF_EVENT_CPUM_CF_DIAG	0xBC000	/* Event: Counter sets */

#define PERF_EVENT_CPUM_SF_DIAG	0xBD000 /* Event: Combined-sampling */



struct cf_ctrset_entry {	/* CPU-M CF counter set entry (8 byte) */

	unsigned int def:16;	/* 0-15  Data Entry Format */

tools/perf/util/s390-cpumsf.c

+9 −0
Original line number Diff line number Diff line
@@ -1047,6 +1047,14 @@ static void s390_cpumsf_free(struct perf_session *session) 
	free(sf);

}



static bool

s390_cpumsf_evsel_is_auxtrace(struct perf_session *session __maybe_unused,

			      struct evsel *evsel)

{

	return evsel->core.attr.type == PERF_TYPE_RAW &&

	       evsel->core.attr.config == PERF_EVENT_CPUM_SF_DIAG;

}



static int s390_cpumsf_get_type(const char *cpuid)

{

	int ret, family = 0;
@@ -1142,6 +1150,7 @@ int s390_cpumsf_process_auxtrace_info(union perf_event *event, 
	sf->auxtrace.flush_events = s390_cpumsf_flush;

	sf->auxtrace.free_events = s390_cpumsf_free_events;

	sf->auxtrace.free = s390_cpumsf_free;

	sf->auxtrace.evsel_is_auxtrace = s390_cpumsf_evsel_is_auxtrace;

	session->auxtrace = &sf->auxtrace;



	if (dump_trace)