Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a8dad04 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

libperf: Add PERF_RECORD_AUXTRACE_INFO 'struct auxtrace_info_event' to perf/event.h 



Move the PERF_RECORD_AUXTRACE_INFO event definition to libperf's
event.h.

In order to keep libperf simple, we switch 'u64/u32/u16/u8' types used
events to their generic '__u*' versions.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190828135717.7245-9-jolsa@kernel.org


[ Fix cs_etm__print_auxtrace_info() arg to be __u64 too to fix the CORESIGHT=1 build ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fecb4100

tools/perf/arch/x86/util/intel-pt.c

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static int intel_pt_info_fill(struct auxtrace_record *itr, 
	unsigned long max_non_turbo_ratio;

	size_t filter_str_len;

	const char *filter;

	u64 *info;

	__u64 *info;

	int err;



	if (priv_size != ptr->priv_size)

tools/perf/lib/include/perf/event.h

+7 −0
Original line number Diff line number Diff line
@@ -201,4 +201,11 @@ struct id_index_event { 
	struct id_index_entry	 entries[0];

};



struct auxtrace_info_event {

	struct perf_event_header header;

	__u32			 type;

	__u32			 reserved__; /* For alignment */

	__u64			 priv[];

};



#endif /* __LIBPERF_EVENT_H */

tools/perf/util/arm-spe.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static const char * const arm_spe_info_fmts[] = { 
	[ARM_SPE_PMU_TYPE]		= "  PMU Type           %"PRId64"\n",

};



static void arm_spe_print_info(u64 *arr)

static void arm_spe_print_info(__u64 *arr)

{

	if (!dump_trace)

		return;

tools/perf/util/cs-etm.c

+1 −1
Original line number Diff line number Diff line
@@ -2370,7 +2370,7 @@ static const char * const cs_etmv4_priv_fmts[] = { 
	[CS_ETMV4_TRCAUTHSTATUS] = "	TRCAUTHSTATUS		       %llx\n",

};



static void cs_etm__print_auxtrace_info(u64 *val, int num)

static void cs_etm__print_auxtrace_info(__u64 *val, int num)

{

	int i, j, cpu = 0;

tools/perf/util/event.h

+0 −7
Original line number Diff line number Diff line
@@ -332,13 +332,6 @@ struct events_stats { 
	u32 nr_proc_map_timeout;

};



struct auxtrace_info_event {

	struct perf_event_header header;

	u32 type;

	u32 reserved__; /* For alignment */

	u64 priv[];

};



struct auxtrace_event {

	struct perf_event_header header;

	u64 size;